[PR PATCH] New package: haskell-language-server-0.8.0

[PR PATCH] New package: haskell-language-server-0.8.0

[waynevanson]

[-- Attachment #1: Type: text/plain, Size: 720 bytes --]

There is a new pull request by waynevanson against master on the void-packages repository

https://github.com/waynevanson/void-packages package/haskell-language-server
https://github.com/void-linux/void-packages/pull/27961

New package: haskell-language-server-0.8.0
Hi Team,

This contains a few executables: haskell-language-server,  haskell-language-server-wrapper, ghcide, ghcide-test-preprocessor, ghcide-bench.

These were all made from running the `stack build` on the `wkrsrc` directory. 
Should these be packages as submodules? All the submodules seem to be requirements of the main module, haskell-laguage-server.

A patch file from https://github.com/void-linux/void-packages/pull/27961.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/haskell-language-server-27961.patch --]
[-- Type: text/x-diff, Size: 1466 bytes --]

From 5c842b79da80cd2028e188d5f8e0a9a0548ef484 Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Sat, 16 Jan 2021 17:12:06 +0000
Subject: [PATCH] New package: haskell-language-server-0.8.0

---
 srcpkgs/haskell-language-server/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/haskell-language-server/template

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
new file mode 100644
index 00000000000..8744fe21bf0
--- /dev/null
+++ b/srcpkgs/haskell-language-server/template
@@ -0,0 +1,22 @@
+# Template file for 'haskell-language-server'
+pkgname=haskell-language-server
+version=0.8.0
+revision=0
+build_style="haskell-stack"
+make_build_args="--stack-yaml stack-8.8.4.yaml"
+makedepends="ncurses-libtinfo-devel icu-devel zlib-devel ncurses-term"
+short_desc="Haskell Language Server: Integration of ghcide and haskell-ide-engine"
+maintainer="Wayne Van Son <waynevanson@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/haskell/haskell-language-server"
+# todo - use GHC version
+distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
+checksum="5ff053f0f4bb26b867fdc0b4071ba25c47eaa6febc9a4ef5b70a5a31c9433671"
+nocross="yes"
+nopie_files="
+/usr/bin/haskell-language-server
+/usr/bin/haskell-language-server-wrapper
+/usr/bin/ghcide-bench
+/usr/bin/ghcide
+/usr/bin/ghcide-test-preprocessor
+"

Re: [PR PATCH] [Updated] New package: haskell-language-server-0.8.0

[waynevanson]

[-- Attachment #1: Type: text/plain, Size: 725 bytes --]

There is an updated pull request by waynevanson against master on the void-packages repository

https://github.com/waynevanson/void-packages package/haskell-language-server
https://github.com/void-linux/void-packages/pull/27961

New package: haskell-language-server-0.8.0
Hi Team,

This contains a few executables: haskell-language-server,  haskell-language-server-wrapper, ghcide, ghcide-test-preprocessor, ghcide-bench.

These were all made from running the `stack build` on the `wkrsrc` directory. 
Should these be packages as submodules? All the submodules seem to be requirements of the main module, haskell-laguage-server.

A patch file from https://github.com/void-linux/void-packages/pull/27961.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/haskell-language-server-27961.patch --]
[-- Type: text/x-diff, Size: 1493 bytes --]

From b80c2fcfccc5a0c3d5368e801ed6726c95de12c6 Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Sat, 16 Jan 2021 17:12:06 +0000
Subject: [PATCH] New package: haskell-language-server-0.8.0

---
 srcpkgs/haskell-language-server/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/haskell-language-server/template

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
new file mode 100644
index 00000000000..83366a27bb5
--- /dev/null
+++ b/srcpkgs/haskell-language-server/template
@@ -0,0 +1,23 @@
+# Template file for 'haskell-language-server'
+pkgname=haskell-language-server
+version=0.8.0
+revision=1
+archs="x86-64"
+build_style="haskell-stack"
+# todo - use GHC version
+make_build_args="--stack-yaml stack-8.8.4.yaml"
+makedepends="ncurses-libtinfo-devel icu-devel zlib-devel ncurses-term"
+short_desc="Haskell Language Server: Integration of ghcide and haskell-ide-engine"
+maintainer="Wayne Van Son <waynevanson@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/haskell/haskell-language-server"
+distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
+checksum="5ff053f0f4bb26b867fdc0b4071ba25c47eaa6febc9a4ef5b70a5a31c9433671"
+nocross="unimplemented"
+nopie_files="
+/usr/bin/haskell-language-server
+/usr/bin/haskell-language-server-wrapper
+/usr/bin/ghcide-bench
+/usr/bin/ghcide
+/usr/bin/ghcide-test-preprocessor
+"

Re: New package: haskell-language-server-0.8.0

[waynevanson]

[-- Attachment #1: Type: text/plain, Size: 2169 bytes --]

New comment by waynevanson on void-packages repository

https://github.com/void-linux/void-packages/pull/27961#issuecomment-761735959

Comment:
So it works for  `x86_64`, but I cannot get it working with any other architectures.

When building for `armv7l`, I get the following error:

```
network                          > configure
network                          > [1 of 2] Compiling Main             ( /tmp/stack-8ee1647aa5b6024f/network-3.1.1.1/Setup.hs, /tmp/stack-8ee1647aa5b6024f/network-3.1.1.1/.stack-work/dist/x86_64-linux/Cabal-3.0.1.0/setup/Main.o )
network                          > [2 of 2] Compiling StackSetupShim   ( /builddir/haskell-language-server-0.8.0/.stack/setup-exe-src/setup-shim-mPHDZzAJ.hs, /tmp/stack-8ee1647aa5b6024f/network-3.1.1.1/.stack-work/dist/x86_64-linux/Cabal-3.0.1.0/setup/StackSetupShim.o )
network                          > Linking /tmp/stack-8ee1647aa5b6024f/network-3.1.1.1/.stack-work/dist/x86_64-linux/Cabal-3.0.1.0/setup/setup ...
network                          > Configuring network-3.1.1.1...
network                          > configure: WARNING: unrecognized options: --with-compiler
network                          > checking build system type... x86_64-pc-linux-gnu
network                          > checking host system type... x86_64-pc-linux-gnu
network                          > checking for gcc... /usr/bin/cc
network                          > checking whether the C compiler works... no
network                          > configure: error: in `/tmp/stack-8ee1647aa5b6024f/network-3.1.1.1/.stack-work/dist/x86_64-linux/Cabal-3.0.1.0/build':
network                          > configure: error: C compiler cannot create executables
network                          > See `config.log' for more details
```

What could be the reason for this? Googling around didn't get me anywhere.

- `configure: WARNING: unrecognized options: --with-compiler`
- `checking whether the C compiler works... no`
- `configure: error: C compiler cannot create executables`

I would like to see this accepted even it works just for `x86_64`, then we can add support for `armv7l` and friends later.

Re: [PR PATCH] [Updated] New package: haskell-language-server-0.8.0

[waynevanson]

[-- Attachment #1: Type: text/plain, Size: 725 bytes --]

There is an updated pull request by waynevanson against master on the void-packages repository

https://github.com/waynevanson/void-packages package/haskell-language-server
https://github.com/void-linux/void-packages/pull/27961

New package: haskell-language-server-0.8.0
Hi Team,

This contains a few executables: haskell-language-server,  haskell-language-server-wrapper, ghcide, ghcide-test-preprocessor, ghcide-bench.

These were all made from running the `stack build` on the `wkrsrc` directory. 
Should these be packages as submodules? All the submodules seem to be requirements of the main module, haskell-laguage-server.

A patch file from https://github.com/void-linux/void-packages/pull/27961.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/haskell-language-server-27961.patch --]
[-- Type: text/x-diff, Size: 1493 bytes --]

From e06f3df8861442baf2c45ba08eb9885f7970eb2a Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Sat, 16 Jan 2021 17:12:06 +0000
Subject: [PATCH] New package: haskell-language-server-0.8.0

---
 srcpkgs/haskell-language-server/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/haskell-language-server/template

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
new file mode 100644
index 00000000000..2886a5ac3c0
--- /dev/null
+++ b/srcpkgs/haskell-language-server/template
@@ -0,0 +1,23 @@
+# Template file for 'haskell-language-server'
+pkgname=haskell-language-server
+version=0.8.0
+revision=1
+archs="x86_64"
+build_style="haskell-stack"
+# todo - use GHC version
+make_build_args="--stack-yaml stack-8.8.4.yaml"
+makedepends="ncurses-libtinfo-devel icu-devel zlib-devel ncurses-term"
+short_desc="Haskell Language Server: Integration of ghcide and haskell-ide-engine"
+maintainer="Wayne Van Son <waynevanson@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/haskell/haskell-language-server"
+distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
+checksum="5ff053f0f4bb26b867fdc0b4071ba25c47eaa6febc9a4ef5b70a5a31c9433671"
+nocross="unimplemented"
+nopie_files="
+/usr/bin/haskell-language-server
+/usr/bin/haskell-language-server-wrapper
+/usr/bin/ghcide-bench
+/usr/bin/ghcide
+/usr/bin/ghcide-test-preprocessor
+"

Re: [PR PATCH] [Updated] New package: haskell-language-server-0.8.0

[waynevanson]

[-- Attachment #1: Type: text/plain, Size: 725 bytes --]

There is an updated pull request by waynevanson against master on the void-packages repository

https://github.com/waynevanson/void-packages package/haskell-language-server
https://github.com/void-linux/void-packages/pull/27961

New package: haskell-language-server-0.8.0
Hi Team,

This contains a few executables: haskell-language-server,  haskell-language-server-wrapper, ghcide, ghcide-test-preprocessor, ghcide-bench.

These were all made from running the `stack build` on the `wkrsrc` directory. 
Should these be packages as submodules? All the submodules seem to be requirements of the main module, haskell-laguage-server.

A patch file from https://github.com/void-linux/void-packages/pull/27961.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/haskell-language-server-27961.patch --]
[-- Type: text/x-diff, Size: 1493 bytes --]

From caf7c0153df720a35b9bbd32077c07959e8cf531 Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Sat, 16 Jan 2021 17:12:06 +0000
Subject: [PATCH] New package: haskell-language-server-0.8.0

---
 srcpkgs/haskell-language-server/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/haskell-language-server/template

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
new file mode 100644
index 00000000000..2886a5ac3c0
--- /dev/null
+++ b/srcpkgs/haskell-language-server/template
@@ -0,0 +1,23 @@
+# Template file for 'haskell-language-server'
+pkgname=haskell-language-server
+version=0.8.0
+revision=1
+archs="x86_64"
+build_style="haskell-stack"
+# todo - use GHC version
+make_build_args="--stack-yaml stack-8.8.4.yaml"
+makedepends="ncurses-libtinfo-devel icu-devel zlib-devel ncurses-term"
+short_desc="Haskell Language Server: Integration of ghcide and haskell-ide-engine"
+maintainer="Wayne Van Son <waynevanson@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/haskell/haskell-language-server"
+distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
+checksum="5ff053f0f4bb26b867fdc0b4071ba25c47eaa6febc9a4ef5b70a5a31c9433671"
+nocross="unimplemented"
+nopie_files="
+/usr/bin/haskell-language-server
+/usr/bin/haskell-language-server-wrapper
+/usr/bin/ghcide-bench
+/usr/bin/ghcide
+/usr/bin/ghcide-test-preprocessor
+"

Re: [PR PATCH] [Updated] New package: haskell-language-server-0.8.0

[waynevanson]

[-- Attachment #1: Type: text/plain, Size: 725 bytes --]

There is an updated pull request by waynevanson against master on the void-packages repository

https://github.com/waynevanson/void-packages package/haskell-language-server
https://github.com/void-linux/void-packages/pull/27961

New package: haskell-language-server-0.8.0
Hi Team,

This contains a few executables: haskell-language-server,  haskell-language-server-wrapper, ghcide, ghcide-test-preprocessor, ghcide-bench.

These were all made from running the `stack build` on the `wkrsrc` directory. 
Should these be packages as submodules? All the submodules seem to be requirements of the main module, haskell-laguage-server.

A patch file from https://github.com/void-linux/void-packages/pull/27961.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/haskell-language-server-27961.patch --]
[-- Type: text/x-diff, Size: 1637 bytes --]

From 45418558f2fe44c16e9350f9f02e4bda0a1db85d Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Sat, 16 Jan 2021 17:12:06 +0000
Subject: [PATCH] New package: haskell-language-server-0.8.0

---
 srcpkgs/haskell-language-server/template | 28 ++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/haskell-language-server/template

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
new file mode 100644
index 00000000000..db8d132b1ea
--- /dev/null
+++ b/srcpkgs/haskell-language-server/template
@@ -0,0 +1,28 @@
+# Template file for 'haskell-language-server'
+pkgname=haskell-language-server
+version=0.8.0
+revision=1
+archs="x86_64"
+build_style="haskell-stack"
+make_build_args="--stack-yaml stack-8.8.4.yaml"
+makedepends="ncurses-libtinfo-devel icu-devel zlib-devel"
+short_desc="Haskell Language Server: Integration of ghcide and haskell-ide-engine"
+maintainer="Wayne Van Son <waynevanson@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/haskell/haskell-language-server"
+distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
+checksum="5ff053f0f4bb26b867fdc0b4071ba25c47eaa6febc9a4ef5b70a5a31c9433671"
+nopie_files="
+/usr/bin/haskell-language-server
+/usr/bin/haskell-language-server-wrapper
+/usr/bin/ghcide-bench
+/usr/bin/ghcide
+/usr/bin/ghcide-test-preprocessor
+"
+
+pre_build() {
+	# fixes /usr/bin/ld: cannot find -lncursesw
+	if [ "$XBPS_TARGET_MACHINE" != "x86_64" ] && [ -f "/lib/libncursesw.so" ]; then
+		ln -sf /lib/libncursesw.so.6.2 /lib/libncursesw.so
+	fi
+}

Re: [PR PATCH] [Updated] New package: haskell-language-server-0.8.0

[waynevanson]

[-- Attachment #1: Type: text/plain, Size: 725 bytes --]

There is an updated pull request by waynevanson against master on the void-packages repository

https://github.com/waynevanson/void-packages package/haskell-language-server
https://github.com/void-linux/void-packages/pull/27961

New package: haskell-language-server-0.8.0
Hi Team,

This contains a few executables: haskell-language-server,  haskell-language-server-wrapper, ghcide, ghcide-test-preprocessor, ghcide-bench.

These were all made from running the `stack build` on the `wkrsrc` directory. 
Should these be packages as submodules? All the submodules seem to be requirements of the main module, haskell-laguage-server.

A patch file from https://github.com/void-linux/void-packages/pull/27961.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/haskell-language-server-27961.patch --]
[-- Type: text/x-diff, Size: 10061684 bytes --]

From da6a09a11f2935823cb3a7bd3da06be70972d29b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 17 Jan 2021 17:01:40 +0700
Subject: [PATCH 0001/3482] libvirt: fix build order

---
 srcpkgs/libvirt/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 39b5b6b6102d..1d504692423c 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -85,6 +85,10 @@ post_install() {
 	fi
 }
 
+pre_build() {
+	ninja -C build src/remote/qemu_protocol.h
+}
+
 libvirt-devel_package() {
 	depends="libvirt>=${version}_${revision}"
 	short_desc+=" - development files"

From c139ca240be6515a2c780c2c2a721af662e59325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 17 Jan 2021 16:55:38 +0700
Subject: [PATCH 0002/3482] kpmcore: update to 20.12.1.

---
 srcpkgs/kpmcore/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kpmcore/template b/srcpkgs/kpmcore/template
index 9566c8b5173f..b463f8b14d44 100644
--- a/srcpkgs/kpmcore/template
+++ b/srcpkgs/kpmcore/template
@@ -1,6 +1,6 @@
 # Template file for 'kpmcore'
 pkgname=kpmcore
-version=4.2.0
+version=20.12.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,8 +13,8 @@ short_desc="Library for managing partitions"
 maintainer="jambonmcyeah <jambonmcyeah@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/system/org.kde.partitionmanager"
-distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=32f5b40aabc566dcdc265c9ae83229ce8acf6ca25a8ba7f1b7b9cab0aa499f9e
+distfiles="${KDE_SITE}/release-service/$version/src/$pkgname-$version.tar.xz"
+checksum=3b109cf4066499e9ab2858528f7634eaf9f5a3f7e7ee6b01b209a6ec64f8d85b
 
 if [ -n "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 458908a25f679ce7784ad5737c83766dcec94d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 17 Jan 2021 17:56:25 +0700
Subject: [PATCH 0003/3482] libvirt: pre-generate another header

---
 srcpkgs/libvirt/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 1d504692423c..1b4f98fce20e 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -68,6 +68,12 @@ post_patch() {
 	fi
 }
 
+pre_build() {
+	ninja -C build \
+		src/remote/qemu_protocol.h \
+		src/remote/remote_protocol.h
+}
+
 post_install() {
 	# runit services
 	vsv libvirtd
@@ -85,10 +91,6 @@ post_install() {
 	fi
 }
 
-pre_build() {
-	ninja -C build src/remote/qemu_protocol.h
-}
-
 libvirt-devel_package() {
 	depends="libvirt>=${version}_${revision}"
 	short_desc+=" - development files"

From eae3e34b855964ba2886f05351ad177843567122 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Fri, 15 Jan 2021 23:08:39 +0100
Subject: [PATCH 0004/3482] radare2: update to 5.0.0.

also switch to meson
---
 common/shlibs                          | 44 +++++++++++++-------------
 srcpkgs/radare2/patches/trust-cc.patch | 13 --------
 srcpkgs/radare2/patches/try.patch      | 20 ++++++++++++
 srcpkgs/radare2/template               |  8 ++---
 4 files changed, 46 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/radare2/patches/trust-cc.patch
 create mode 100644 srcpkgs/radare2/patches/try.patch

diff --git a/common/shlibs b/common/shlibs
index f8d77eb7fefc..468fe3a63fea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3197,28 +3197,28 @@ libkdeconnectinterfaces.so.1 kdeconnect-1.2_1
 libkdeconnectcore.so.1 kdeconnect-1.2_1
 libkpmcore.so.10 kpmcore-4.2.0_1
 libpkcs11-helper.so.1 pkcs11-helper-1.22_1
-libr_core.so radare2-2.2.0_1
-libr_config.so radare2-2.2.0_1
-libr_cons.so radare2-2.2.0_1
-libr_util.so radare2-2.2.0_1
-libr_flag.so radare2-2.2.0_1
-libr_asm.so radare2-2.2.0_1
-libr_bin.so radare2-2.2.0_1
-libr_anal.so radare2-2.2.0_1
-libr_lang.so radare2-2.2.0_1
-libr_debug.so radare2-2.2.0_1
-libr_egg.so radare2-2.2.0_1
-libr_bp.so radare2-2.2.0_1
-libr_search.so radare2-2.2.0_1
-libr_io.so radare2-2.2.0_1
-libr_hash.so radare2-2.2.0_1
-libr_socket.so radare2-2.2.0_1
-libr_parse.so radare2-2.2.0_1
-libr_syscall.so radare2-2.2.0_1
-libr_crypto.so radare2-2.2.0_1
-libr_fs.so radare2-2.2.0_1
-libr_magic.so radare2-2.2.0_1
-libr_reg.so radare2-2.2.0_1
+libr_core.so.5.0.0 radare2-5.0.0_1
+libr_config.so.5.0.0 radare2-5.0.0_1
+libr_cons.so.5.0.0 radare2-5.0.0_1
+libr_util.so.5.0.0 radare2-5.0.0_1
+libr_flag.so.5.0.0 radare2-5.0.0_1
+libr_asm.so.5.0.0 radare2-5.0.0_1
+libr_bin.so.5.0.0 radare2-5.0.0_1
+libr_anal.so.5.0.0 radare2-5.0.0_1
+libr_lang.so.5.0.0 radare2-5.0.0_1
+libr_debug.so.5.0.0 radare2-5.0.0_1
+libr_egg.so.5.0.0 radare2-5.0.0_1
+libr_bp.so.5.0.0 radare2-5.0.0_1
+libr_search.so.5.0.0 radare2-5.0.0_1
+libr_io.so.5.0.0 radare2-5.0.0_1
+libr_hash.so.5.0.0 radare2-5.0.0_1
+libr_socket.so.5.0.0 radare2-5.0.0_1
+libr_parse.so.5.0.0 radare2-5.0.0_1
+libr_syscall.so.5.0.0 radare2-5.0.0_1
+libr_crypto.so.5.0.0 radare2-5.0.0_1
+libr_fs.so.5.0.0 radare2-5.0.0_1
+libr_magic.so.5.0.0 radare2-5.0.0_1
+libr_reg.so.5.0.0 radare2-5.0.0_1
 libykpiv.so.1 libykpiv-1.5.0_1
 libykcs11.so.1 libykcs11-1.5.0_1
 libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1
diff --git a/srcpkgs/radare2/patches/trust-cc.patch b/srcpkgs/radare2/patches/trust-cc.patch
deleted file mode 100644
index fc9c3c6e3559..000000000000
--- a/srcpkgs/radare2/patches/trust-cc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig
-+++ configure
-@@ -330,10 +330,6 @@
- COMPILER=CC
- printf "checking for c compiler... "
- HAVE_LANG_C=1
--if [ "${CROSSBUILD}" = 1 ]; then
-- (command -v ${HOST}-${CC} >/dev/null 2>&1)
-- if [ $? = 0 ]; then CC="${HOST}-${CC}"; fi
--fi
- echo "int main(int argc, char **argv){return 0;}" > test.c
-  (exec ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c >/dev/null 2>&1)
- if [ $? = 0 ]; then echo ${CC}; else
diff --git a/srcpkgs/radare2/patches/try.patch b/srcpkgs/radare2/patches/try.patch
new file mode 100644
index 000000000000..32ecdb33973c
--- /dev/null
+++ b/srcpkgs/radare2/patches/try.patch
@@ -0,0 +1,20 @@
+--- shlr/Makefile	2020-12-21 09:39:46.000000000 +0100
++++ shlr/Makefile	2021-01-04 22:13:43.513442861 +0100
+@@ -122,7 +122,7 @@
+ SDB_LIBA=sdb/src/libsdb.a
+ 
+ $(SDB_HOST):
+-	$(MAKE) sdb-host HOST_CC=$(HOST_CC) CC=$(HOST_CC)
++	$(MAKE) sdb-host HOST_CC=$(HOST_CC) CC=$(HOST_CC) LD=ld
+ 
+ $(SDB_LIBA):
+ 	$(MAKE) sdb-target
+@@ -136,7 +136,7 @@
+ 	@echo ">>>>>>>>"
+ 	@echo
+ 	$(MAKE) -C sdb clean ; rm -f sdb/src/*.o sdb/src/sdb_version.h
+-	$(MAKE) -C sdb/src "CC=${HOST_CC}" LDFLAGS='${HOST_LDFLAGS}' CPPFLAGS='' CFLAGS='${HOST_CFLAGS} ${PIC}' bin
++	$(MAKE) -C sdb/src "CC=${HOST_CC}" "LD=ld" LDFLAGS='${HOST_LDFLAGS}' CPPFLAGS='' CFLAGS='${HOST_CFLAGS} ${PIC}' bin
+ 	cp -f sdb/src/sdb${BUILD_EXT_EXE} sdb/src/.sdb${BUILD_EXT_EXE}
+ 	cp -f sdb/src/sdb${BUILD_EXT_EXE} sdb/sdb$(BUILD_EXT_EXE)
+ 	-file sdb/sdb$(BUILD_EXT_EXE)
diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template
index 3046be71cf53..1f4601b46a27 100644
--- a/srcpkgs/radare2/template
+++ b/srcpkgs/radare2/template
@@ -1,10 +1,10 @@
 # Template file for 'radare2'
 # cutter needs to be bumped when radare2 is updated
 pkgname=radare2
-version=4.5.1
+version=5.0.0
 revision=1
-build_style=gnu-configure
-configure_args="--with-syscapstone"
+build_style=meson
+configure_args="-Duse_sys_capstone=true -Denable_tests=false"
 hostmakedepends="pkg-config"
 makedepends="capstone-devel"
 short_desc="Advanced command line debugger and hexadecimal editor"
@@ -12,7 +12,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="LGPL-3.0-only"
 homepage="http://www.radare.org"
 distfiles="https://github.com/radareorg/radare2/archive/${version}.tar.gz"
-checksum=4e85b35987bd2ca5881ad9585970b970fe7374814bd383bd1cd62e961a0c228b
+checksum=517dd80ebd0569f31498887338eacb92e8cf054bc4625eef8ffe9ea174c1adae
 
 case "$XBPS_TARGET_MACHINE" in
 	mips*) CFLAGS="-Os";;

From 40a7f147046027f0fef670c2d8b1a0789c83e368 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Fri, 15 Jan 2021 23:09:25 +0100
Subject: [PATCH 0005/3482] cutter: rebuild for radare2-5.0.0

---
 srcpkgs/cutter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index f0dadb5d5dda..646d7b64bab0 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,7 +1,7 @@
 # Template file for 'cutter'
 pkgname=cutter
 version=1.12.0
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 configure_args="CUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/RadareOrg/Cutter/plugins"

From 77b840c5f1c26dcb8e61d5a619702560439409d7 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 17 Jan 2021 09:48:48 +0100
Subject: [PATCH 0006/3482] ImageMagick: update to 7.0.10.58

---
 srcpkgs/ImageMagick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 92f99654290e..5764712db610 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 _majorver=7.0.10
-_patchver=54
+_patchver=58
 version="${_majorver}.${_patchver}"
 revision=1
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
@@ -21,7 +21,7 @@ license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=6766bd17330b43f1c7492ac33628368a8b54dc346b9d3113267292a53964b51a
+checksum=0daabb64602164940fbf95cbd6f16709903eef5d3eee7bd329da878f17605df5
 
 subpackages="libmagick libmagick-devel"
 

From 7f8dcdaf847bf02219282e8ad99dcb43b4c9d894 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 17 Jan 2021 09:49:32 +0100
Subject: [PATCH 0007/3482] ImageMagick6: update to 6.9.11.57

---
 srcpkgs/ImageMagick6/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
index 599793146d32..d55964fb7bde 100644
--- a/srcpkgs/ImageMagick6/template
+++ b/srcpkgs/ImageMagick6/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick6'
 pkgname=ImageMagick6
 _majorver=6.9.11
-_patchver=54
+_patchver=57
 version="${_majorver}.${_patchver}"
 revision=1
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
@@ -20,7 +20,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=e29f89b040a8bbf679eb0a508541356d8a30c73359f469bbd19b290bf293f530
+checksum=bfa17b29fad92a859381d5e896ebb95f5212202fa345a534c70ba5150f94f896
 
 keep_libtool_archives=yes
 conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"

From 38d70af9cbfa80501b909916792ee476db776a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 17 Jan 2021 13:14:43 +0100
Subject: [PATCH 0008/3482] rocksndiamonds: update to 4.2.2.1

---
 srcpkgs/rocksndiamonds/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index 5c028fc443b7..bd76648459f8 100644
--- a/srcpkgs/rocksndiamonds/template
+++ b/srcpkgs/rocksndiamonds/template
@@ -1,6 +1,6 @@
 # Template file for 'rocksndiamonds'
 pkgname=rocksndiamonds
-version=4.2.2.0
+version=4.2.2.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-only"
 homepage="http://www.artsoft.org/rocksndiamonds"
 distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=4a990a92fb22ab5e0f77db90a51905e1b2b037b7badab8b3e99553f11dab041b
+checksum=56d3578548cdb439695fad7a8d2339ded9be355969f4fe3e43c89735d9815166
 replaces="rocksndiamonds-data>=0"
 
 do_build() {

From fd5b66f42241f812a17453808861c598e4c4760c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 17 Jan 2021 14:32:40 +0100
Subject: [PATCH 0009/3482] endless-sky-gl21: fix build w/ gcc10

---
 srcpkgs/endless-sky-gl21/patches/fix-std-string.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/endless-sky-gl21/patches/fix-std-string.patch

diff --git a/srcpkgs/endless-sky-gl21/patches/fix-std-string.patch b/srcpkgs/endless-sky-gl21/patches/fix-std-string.patch
new file mode 100644
index 000000000000..cbe1fe44de66
--- /dev/null
+++ b/srcpkgs/endless-sky-gl21/patches/fix-std-string.patch
@@ -0,0 +1,10 @@
+--- source/Panel.h	2021-01-17 14:25:52.952063261 +0100
++++ source/Panel.h	2021-01-17 14:29:26.466536974 +0100
+@@ -15,6 +15,7 @@
+ 
+ #include "Rectangle.h"
+ 
++#include <string>
+ #include <functional>
+ #include <list>
+ 

From 45036753eee62396237af2a27fce48d7f1aa9273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 17 Jan 2021 17:52:45 +0700
Subject: [PATCH 0010/3482] fcitx-libpinyin: rebuilt for libpinyin 2.6.0

---
 .../patches/libpinyin-2.6.0.patch             | 10 +++++++
 srcpkgs/fcitx-libpinyin/template              | 27 +++++++++----------
 2 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/fcitx-libpinyin/patches/libpinyin-2.6.0.patch

diff --git a/srcpkgs/fcitx-libpinyin/patches/libpinyin-2.6.0.patch b/srcpkgs/fcitx-libpinyin/patches/libpinyin-2.6.0.patch
new file mode 100644
index 000000000000..163367025497
--- /dev/null
+++ b/srcpkgs/fcitx-libpinyin/patches/libpinyin-2.6.0.patch
@@ -0,0 +1,10 @@
+--- data/table.conf.orig	2021-01-17 17:32:50.977868321 +0700
++++ data/table.conf	2021-01-17 17:34:32.055849637 +0700
+@@ -3,6 +3,7 @@
+ lambda parameter:0.347121
+ 
+ source table format:pinyin
++database format:BerkeleyDB
+ 
+ default RESERVED NULL NULL NULL NOT_USED
+ default GB_DICTIONARY gb_char.table gb_char.bin gb_char.dbin SYSTEM_FILE
diff --git a/srcpkgs/fcitx-libpinyin/template b/srcpkgs/fcitx-libpinyin/template
index 50e3afa22c8f..8372dbff322f 100644
--- a/srcpkgs/fcitx-libpinyin/template
+++ b/srcpkgs/fcitx-libpinyin/template
@@ -1,9 +1,10 @@
 # Template file for 'fcitx-libpinyin'
 pkgname=fcitx-libpinyin
 version=0.5.3
-revision=1
+revision=2
 build_style=cmake
-hostmakedepends="pkg-config gobject-introspection fcitx"
+configure_args="-DENABLE_QT=OFF"
+hostmakedepends="pkg-config gobject-introspection fcitx libpinyin"
 makedepends="libpinyin-devel fcitx-devel"
 depends="fcitx"
 short_desc="Fcitx wrapper for libpinyin"
@@ -13,22 +14,18 @@ homepage="https://github.com/fcitx/fcitx-libpinyin"
 distfiles="https://download.fcitx-im.org/$pkgname/$pkgname-${version}_dict.tar.xz"
 checksum=fccd408b9fad8becebf7f736e3309e775d045d6383742892385b69be91f89b4c
 
-if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ] &&
-	[ "$XBPS_TARGET_ENDIAN" = "le" ]
+if [ "$XBPS_WORDSIZE$XBPS_TARGET_ENDIAN" = "${XBPS_TARGET_WORDSIZE}le" ]
 then
-	configure_args="-DENABLE_QT=ON"
+	configure_args+=" -DENABLE_QT=ON"
 	hostmakedepends+=" qt5-devel"
 	makedepends+=" libfcitx-qt5-devel qt5-webengine-devel
 	 qt5-declarative-devel qt5-webchannel-devel qt5-location-devel"
-else
-	configure_args="-DENABLE_QT=OFF"
-	subpackages=" "
-fi
 
-fcitx-libpinyin-qt5_package() {
-	short_desc+=" - Qt5 IM module"
-	depends="fcitx-libpinyin-${version}_${revision}"
-	pkg_install() {
-		vmove usr/lib/fcitx/qt
+	fcitx-libpinyin-qt5_package() {
+		short_desc+=" - Qt5 IM module"
+		depends="fcitx-libpinyin-${version}_${revision}"
+		pkg_install() {
+			vmove usr/lib/fcitx/qt
+		}
 	}
-}
+fi

From 3d0f4d8ef75f1880aa66d13c40f78aed79469328 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 17 Jan 2021 16:25:51 +0100
Subject: [PATCH 0011/3482] python3-pipx: update to 0.16.0.0.

---
 srcpkgs/python3-pipx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index b013b164d2ba..6ae1acdb9add 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.15.6.0
+version=0.16.0.0
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pipxproject.github.io/pipx/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=0d20e295a236b60e5601cb4e3d0c4fad202b9027ca1b2b8c88b322e66bf42b1f
+checksum=ec9d63753f34eb2dde5597ecdfe23df61749104485eead42937abec4dc4f4598
 
 post_install() {
 	vlicense LICENSE

From 11149408134f5d3684c7ba964177aaa177337f4f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 17 Jan 2021 16:29:26 +0100
Subject: [PATCH 0012/3482] linux5.10: update to 5.10.8.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 1bad20376bd3..7c97b77eec96 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.7
+version=5.10.8
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=4cbf6e09f90f2ae7160432c884d5a2aeb9d33a07ca7f50eb7d80f427706ffabe
+checksum=5cfc829425165d699059a398f5c24cad6e40e8899f2076ecd301c3d551e503ed
 python_version=3
 patch_args="-Np1"
 

From e12bdf57430cd5afbded761ed0cdff77ba37f9ff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 17 Jan 2021 16:29:29 +0100
Subject: [PATCH 0013/3482] linux: update to 5.10.

---
 srcpkgs/linux/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 8aac3eec5272..4c21d6561c37 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,7 +1,7 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.9
-revision=2
+version=5.10
+revision=1
 build_style=meta
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 45418558f2fe44c16e9350f9f02e4bda0a1db85d Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Sat, 16 Jan 2021 17:12:06 +0000
Subject: [PATCH 0014/3482] New package: haskell-language-server-0.8.0

---
 srcpkgs/haskell-language-server/template | 28 ++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/haskell-language-server/template

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
new file mode 100644
index 000000000000..db8d132b1ea1
--- /dev/null
+++ b/srcpkgs/haskell-language-server/template
@@ -0,0 +1,28 @@
+# Template file for 'haskell-language-server'
+pkgname=haskell-language-server
+version=0.8.0
+revision=1
+archs="x86_64"
+build_style="haskell-stack"
+make_build_args="--stack-yaml stack-8.8.4.yaml"
+makedepends="ncurses-libtinfo-devel icu-devel zlib-devel"
+short_desc="Haskell Language Server: Integration of ghcide and haskell-ide-engine"
+maintainer="Wayne Van Son <waynevanson@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/haskell/haskell-language-server"
+distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
+checksum="5ff053f0f4bb26b867fdc0b4071ba25c47eaa6febc9a4ef5b70a5a31c9433671"
+nopie_files="
+/usr/bin/haskell-language-server
+/usr/bin/haskell-language-server-wrapper
+/usr/bin/ghcide-bench
+/usr/bin/ghcide
+/usr/bin/ghcide-test-preprocessor
+"
+
+pre_build() {
+	# fixes /usr/bin/ld: cannot find -lncursesw
+	if [ "$XBPS_TARGET_MACHINE" != "x86_64" ] && [ -f "/lib/libncursesw.so" ]; then
+		ln -sf /lib/libncursesw.so.6.2 /lib/libncursesw.so
+	fi
+}

From 186d2261e8d15ab7d28ca22d3ed2e5b73f0ad85c Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 9 Jan 2021 23:11:42 +0100
Subject: [PATCH 0015/3482] python3-numpy: Use OpenBLAS on supported platforms.

Closes: #27797 [via git-merge-pr]
---
 srcpkgs/python3-numpy/template | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 619040f2892f..c4e97ae9172d 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,11 +1,12 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
 version=1.19.5
-revision=1
+revision=2
 wrksrc="numpy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython gcc-fortran"
-makedepends="python3-devel lapack-devel cblas-devel"
+makedepends="python3-devel
+ $(vopt_if openblas 'openblas-devel' 'lapack-devel cblas-devel')"
 depends="python3-setuptools"
 short_desc="Fast and sophisticated array facility to Python3"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
@@ -15,6 +16,17 @@ distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
 checksum=43fe3bcdf27a2eb27196a1d140385aeece71c8b1a6eda18d2c6365239e50c60f
 alternatives="numpy:f2py:/usr/bin/f2py3"
 
+build_options="openblas"
+desc_option_openblas="Enable support for openblas accelerated linear algebra"
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|aarch64*|armv[67]*|ppc64*)
+		# Prefer accelerated routines where available
+		build_options_default="openblas"
+		;;
+	*) ;;
+esac
+
 post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 		armv5tel-musl)
@@ -22,10 +34,27 @@ post_patch() {
 			patch -Np0 -i "${FILESDIR}/fenv-constants.patch"
 			;;
 	esac
+
+	if [ "$XBPS_TARGET_LIBC" = musl ] ; then
+		vsed -i 's|"backtrace",||' numpy/core/setup_common.py
+	fi
 }
 
 pre_build() {
+	# Build numpy in parallel
 	make_build_args+=" ${makejobs}"
+
+	# Find the right linear algebra subroutines on the target arch
+	: > site.cfg
+	for _blaslib in $(vopt_if openblas openblas "lapack blas"); do
+		cat >> site.cfg <<-EOF
+		[$_blaslib]
+		libraries = ${_blaslib}
+		include_dirs = ${XBPS_CROSS_BASE}/usr/include
+		library_dirs = ${XBPS_CROSS_BASE}/usr/lib
+		runtime_library_dirs = ${XBPS_CROSS_BASE}/usr/lib
+		EOF
+	done
 }
 
 do_check() {

From fdbec388e882f7be45bc6db689f428d4e6a4e509 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 17 Jan 2021 11:13:17 +0100
Subject: [PATCH 0016/3482] cmus: update to 2.9.0

Closes: #27975 [via git-merge-pr]
---
 .../cmus/patches/fix-ub-narrowing-cast.patch  | 132 ------------------
 srcpkgs/cmus/template                         |   6 +-
 2 files changed, 3 insertions(+), 135 deletions(-)
 delete mode 100644 srcpkgs/cmus/patches/fix-ub-narrowing-cast.patch

diff --git a/srcpkgs/cmus/patches/fix-ub-narrowing-cast.patch b/srcpkgs/cmus/patches/fix-ub-narrowing-cast.patch
deleted file mode 100644
index a3dfe8039d42..000000000000
--- a/srcpkgs/cmus/patches/fix-ub-narrowing-cast.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-This is technically undefined behavior and may result in bad
-codegen in other cases as well. @q66
-
-https://github.com/cmus/cmus/pull/941
-
-From 55cbb02c414fb5c41373e022974fc417e493a5ab Mon Sep 17 00:00:00 2001
-From: Chris Grahn <grahn@posteo.net>
-Date: Sun, 17 Nov 2019 23:42:16 -0600
-Subject: [PATCH] Fix bug on ppc64 caused by narrowing cast
-
-diff --git a/format_print.c b/format_print.c
-index 0fee984..c7c0ef7 100644
---- format_print.c
-+++ format_print.c
-@@ -216,7 +216,8 @@ static void print_str(const char *src)
- 
- 		}
- 	} else {
--		int s = 0, d = 0;
-+		int s = 0;
-+		size_t d = 0;
- 		uchar u;
- 
- 		while (1) {
-@@ -471,7 +472,7 @@ static void format_parse(int str_width, const char *format, const struct format_
- 		u = u_get_char(format, &s);
- 		if (u != '%') {
- 			gbuf_grow(str, 4);
--			u_set_char(str->buffer, (int *)&str->len, u);
-+			u_set_char(str->buffer, &str->len, u);
- 			(*len) += u_char_width(u);
- 			continue;
- 		}
-@@ -594,7 +595,7 @@ static void format_write(char *buf, int str_width)
- 		strcpy(buf + pos + ws_len, r_str.buffer);
- 	} else {
- 		int l_space = str_width - str_len.rlen;
--		int pos = 0;
-+		size_t pos = 0;
- 		int idx = 0;
- 
- 		if (l_space > 0)
-diff --git a/id3.c b/id3.c
-index d505ba9..d5947b9 100644
---- id3.c
-+++ id3.c
-@@ -287,10 +287,10 @@ static int utf16_is_special(uchar uch)
- 	return utf16_is_hsurrogate(uch) || utf16_is_lsurrogate(uch) || utf16_is_bom(uch);
- }
- 
--static char *utf16_to_utf8(const unsigned char *buf, int buf_size)
-+static char *utf16_to_utf8(const unsigned char *buf, size_t buf_size)
- {
- 	char *out;
--	int i, idx;
-+	size_t i, idx;
- 	int little_endian = 0;
- 
- 	if (buf_size < 2)
-diff --git a/uchar.c b/uchar.c
-index 7b8691a..36509d7 100644
---- uchar.c
-+++ uchar.c
-@@ -428,7 +428,7 @@ void u_set_char_raw(char *str, int *idx, uchar uch)
-  * Printing functions, these lose information
-  */
- 
--void u_set_char(char *str, int *idx, uchar uch)
-+void u_set_char(char *str, size_t *idx, uchar uch)
- {
- 	int i = *idx;
- 
-@@ -476,10 +476,11 @@ invalid:
- 	}
- }
- 
--int u_copy_chars(char *dst, const char *src, int *width)
-+size_t u_copy_chars(char *dst, const char *src, int *width)
- {
- 	int w = *width;
--	int si = 0, di = 0;
-+	int si = 0;
-+	size_t di = 0;
- 	int cw;
- 	uchar u;
- 
-diff --git a/uchar.h b/uchar.h
-index 237cd55..8e03162 100644
---- uchar.h
-+++ uchar.h
-@@ -137,7 +137,7 @@ uchar u_get_char(const char *str, int *idx);
-  * @uch  unicode character
-  */
- void u_set_char_raw(char *str, int *idx, uchar uch);
--void u_set_char(char *str, int *idx, uchar uch);
-+void u_set_char(char *str, size_t *idx, uchar uch);
- 
- /*
-  * @dst    destination buffer
-@@ -150,7 +150,7 @@ void u_set_char(char *str, int *idx, uchar uch);
-  *
-  * Returns number of _bytes_ copied.
-  */
--int u_copy_chars(char *dst, const char *src, int *width);
-+size_t u_copy_chars(char *dst, const char *src, int *width);
- 
- /*
-  * @dst    destination buffer
-diff --git a/ui_curses.c b/ui_curses.c
-index 564b205..9621d94 100644
---- ui_curses.c
-+++ ui_curses.c
-@@ -467,7 +467,8 @@ static void dump_print_buffer(int row, int col)
-  */
- static int format_str(char *buf, const char *str, int width)
- {
--	int s = 0, d = 0, ellipsis_pos = 0, cut_double_width = 0;
-+	int s = 0, ellipsis_pos = 0, cut_double_width = 0;
-+	size_t d = 0;
- 
- 	while (1) {
- 		uchar u;
-@@ -1237,7 +1238,8 @@ static void dump_buffer(const char *buffer)
- static void do_update_commandline(void)
- {
- 	char *str;
--	int w, idx;
-+	int w;
-+	size_t idx;
- 	char ch;
- 
- 	move(LINES - 1, 0);
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 9f6a1d9a6ee8..22052fc3d5d9 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -1,7 +1,7 @@
 # Template file for 'cmus'
 pkgname=cmus
-version=2.8.0
-revision=4
+version=2.9.0
+revision=1
 build_style=configure
 configure_args="prefix=/usr LD=$CC"
 hostmakedepends="pkg-config"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
-checksum=756ce2c6241b2104dc19097488225de559ac1802a175be0233cfb6fbc02f3bd2
+checksum=e7ea7f5ec52b991cf378a9caf19e479be16a165a5b26adca058de711e72ad2a0
 build_options="elogind"
 build_options_default="elogind"
 desc_option_elogind="Support MPRIS interface via elogind"

From 10825dde09d969e194c08479f3ea48bf4122fc6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 14 Jan 2021 03:43:50 -0300
Subject: [PATCH 0017/3482] New package: can-utils-2020.12.0.

---
 srcpkgs/can-utils/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/can-utils/template

diff --git a/srcpkgs/can-utils/template b/srcpkgs/can-utils/template
new file mode 100644
index 000000000000..de92b7fe919f
--- /dev/null
+++ b/srcpkgs/can-utils/template
@@ -0,0 +1,11 @@
+# Template file for 'can-utils'
+pkgname=can-utils
+version=2020.12.0
+revision=1
+build_style=gnu-makefile
+short_desc="Linux-CAN / SocketCAN user space applications "
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/linux-can/can-utils"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=c5c22a00ce2ea7578d7617ac0affef8f47a349be58e708780d703b979f324a2b

From 0e05ee88cbb2adc1fb24e9beb4141184e8f69b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 15 Jan 2021 20:12:33 -0300
Subject: [PATCH 0018/3482] sudo: update to 1.9.5p1, set permissions during
 do_install.

- fixes a bunch of CVEs.

- the chmod 4111 in INSTALL changed sudo from 4755 to 4111. It was
always suid, it just stopped being world readable for some reason (with
a window of time where it could still be read, since INSTALL isn't run
immediately after unpacking). Furthermore, chmod'ing sudoedit doesn't
change anything in the final package, since it's a symlink to sudo.

- clean up outdated patches.
---
 srcpkgs/sudo/INSTALL                          |  1 -
 ...en-configured-using-without-sendmail.patch | 48 -------------------
 srcpkgs/sudo/patches/fix-musl-test.patch      | 15 ------
 srcpkgs/sudo/patches/musl.patch               | 13 -----
 srcpkgs/sudo/template                         |  4 +-
 5 files changed, 2 insertions(+), 79 deletions(-)
 delete mode 100644 srcpkgs/sudo/patches/0001-Fix-build-when-configured-using-without-sendmail.patch
 delete mode 100644 srcpkgs/sudo/patches/fix-musl-test.patch
 delete mode 100644 srcpkgs/sudo/patches/musl.patch

diff --git a/srcpkgs/sudo/INSTALL b/srcpkgs/sudo/INSTALL
index d7162122f5cf..6150aed7d14b 100644
--- a/srcpkgs/sudo/INSTALL
+++ b/srcpkgs/sudo/INSTALL
@@ -7,7 +7,6 @@ post)
 		echo "Setting up permissions to /etc/sudoers..."
 		chmod 0440 etc/sudoers
 	fi
-	chmod 4111 usr/bin/sudo usr/bin/sudoedit
 	[ ! -d etc/sudoers.d ] && install -d etc/sudoers.d
 	[ ! -d var/db/sudo ] && install -dm750 var/db/sudo
 	;;
diff --git a/srcpkgs/sudo/patches/0001-Fix-build-when-configured-using-without-sendmail.patch b/srcpkgs/sudo/patches/0001-Fix-build-when-configured-using-without-sendmail.patch
deleted file mode 100644
index bcc80136b312..000000000000
--- a/srcpkgs/sudo/patches/0001-Fix-build-when-configured-using-without-sendmail.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From e22817e3abfee6fee779ab0b2d312d48323abb56 Mon Sep 17 00:00:00 2001
-From: "Todd C. Miller" <Todd.Miller@sudo.ws>
-Date: Mon, 30 Nov 2020 13:18:12 -0700
-Subject: [PATCH] Fix build when configured using --without-sendmail Bug #947
-
----
- lib/eventlog/eventlog.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git lib/eventlog/eventlog.c lib/eventlog/eventlog.c
-index 8b190b7ce..ae97fdea9 100644
---- lib/eventlog/eventlog.c
-+++ lib/eventlog/eventlog.c
-@@ -78,7 +78,7 @@
- static FILE *eventlog_stub_open_log(int type, const char *logfile);
- static void eventlog_stub_close_log(int type, FILE *fp);
- 
--/* Eventlog config settings */
-+/* Eventlog config settings (default values). */
- static struct eventlog_config evl_conf = {
-     EVLOG_NONE,			/* type */
-     EVLOG_SUDO,			/* format */
-@@ -91,7 +91,11 @@ static struct eventlog_config evl_conf = {
-     false,			/* omit_hostname */
-     _PATH_SUDO_LOGFILE,		/* logpath */
-     "%h %e %T",			/* time_fmt */
-+#ifdef _PATH_SUDO_SENDMAIL
-     _PATH_SUDO_SENDMAIL,	/* mailerpath */
-+#else
-+    NULL,			/* mailerpath (disabled) */
-+#endif
-     "-t",			/* mailerflags */
-     NULL,			/* mailfrom */
-     MAILTO,			/* mailto */
-@@ -1436,8 +1440,10 @@ eventlog_setconf(struct eventlog_config *conf)
- 	evl_conf.logpath = _PATH_SUDO_LOGFILE;
-     if (evl_conf.time_fmt == NULL)
- 	evl_conf.time_fmt = "%h %e %T";
-+#ifdef _PATH_SUDO_SENDMAIL
-     if (evl_conf.mailerpath == NULL)
- 	evl_conf.mailerpath = _PATH_SUDO_SENDMAIL;
-+#endif
-     if (evl_conf.mailerflags == NULL)
- 	evl_conf.mailerflags = "-t";
-     if (evl_conf.mailto == NULL)
--- 
-2.29.2
-
diff --git a/srcpkgs/sudo/patches/fix-musl-test.patch b/srcpkgs/sudo/patches/fix-musl-test.patch
deleted file mode 100644
index cfd14e211345..000000000000
--- a/srcpkgs/sudo/patches/fix-musl-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-sys/stat.h is required for mode_t
-
-Fixes
-error: unknown type name 'mode_t'
-
---- plugins/sudoers/regress/env_match/check_env_pattern.c
-+++ plugins/sudoers/regress/env_match/check_env_pattern.c
-@@ -17,6 +17,7 @@
- #include <config.h>
- 
- #include <stdio.h>
-+#include <sys/stat.h>
- #include <stdlib.h>
- #ifdef HAVE_STRING_H
- # include <string.h>
diff --git a/srcpkgs/sudo/patches/musl.patch b/srcpkgs/sudo/patches/musl.patch
deleted file mode 100644
index c48d84522e6e..000000000000
--- a/srcpkgs/sudo/patches/musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/sudo_util.h.orig	2015-07-17 07:49:35.184634311 +0200
-+++ include/sudo_util.h	2015-07-17 07:50:05.018046508 +0200
-@@ -23,6 +23,10 @@
- # include "compat/stdbool.h"
- #endif /* HAVE_STDBOOL_H */
- 
-+#ifdef HAVE_SYS_TYPES_H
-+# include <sys/types.h>	/* id_t */
-+#endif
-+
- /*
-  * Macros for operating on struct timeval.
-  */
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index d1286b8727bc..54b3a5a2f65a 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,6 +1,6 @@
 # Template file for 'sudo'
 pkgname=sudo
-version=1.9.4
+version=1.9.5p1
 revision=1
 build_style=gnu-configure
 configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://www.sudo.ws/"
 changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS"
 distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz"
-checksum=8b91bd2cc73af18a06a01406e38d154b837107be759f72e89cefeaa94e1103f0
+checksum=4dddf37c22653defada299e5681e0daef54bb6f5fc950f63997bb8eb966b7882
 conf_files="/etc/pam.d/sudo /etc/sudoers"
 lib32disabled=yes
 

From e49be9fb2d3b08128db3d93a96ef69331f15ba31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 15 Jan 2021 19:44:36 -0300
Subject: [PATCH 0019/3482] opendoas: set permissions during do_install.

- setting permissions in a INSTALL script makes the program unusable
between it being unpacked and the INSTALL script actually being run; for
users with other long running post-install steps, e.g. DKMS modules,
this can be a long time where an administrative tool can't be used.

- furthermore, any interruption of the post-install steps or a power
failure will have a much higher probability of leaving the user with a
non suid executable than if it had been set at install time.

- making the binary permissions 4111 isn't necessary; the binary can be
retrieved in multiple manners, so this doesn't offer any protection (and
the binary would be "unprotected" anyway while INSTALL hasn't run yet).
opendoas's makefile can chmod the executable, so we just stop removing the
chmod line from its makefile.

- also xlintify.
---
 srcpkgs/opendoas/INSTALL  | 8 --------
 srcpkgs/opendoas/template | 8 +++-----
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/opendoas/INSTALL

diff --git a/srcpkgs/opendoas/INSTALL b/srcpkgs/opendoas/INSTALL
deleted file mode 100644
index 352dcde82cde..000000000000
--- a/srcpkgs/opendoas/INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This script sets up correct perms for usr/bin/doas.
-#
-case "${ACTION}" in
-post)
-	chmod 4111 usr/bin/doas
-	;;
-esac
diff --git a/srcpkgs/opendoas/template b/srcpkgs/opendoas/template
index f2084305d1e5..fb68b70ddebd 100644
--- a/srcpkgs/opendoas/template
+++ b/srcpkgs/opendoas/template
@@ -1,7 +1,7 @@
 # Template file for 'opendoas'
 pkgname=opendoas
 version=6.8
-revision=1
+revision=2
 wrksrc="OpenDoas-$version"
 build_style=configure
 configure_args="--prefix=/usr $(vopt_with 'pam') $(vopt_with 'timestamp')"
@@ -10,7 +10,7 @@ hostmakedepends="bison"
 makedepends="$(vopt_if 'pam' 'pam-devel')"
 short_desc="Portable OpenBSD doas to execute commands as another user"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="ISC, BSD-3-clause"
+license="ISC, BSD-3-Clause"
 homepage="https://github.com/Duncaen/OpenDoas"
 distfiles="https://github.com/Duncaen/OpenDoas/archive/v${version}.tar.gz"
 checksum=c53edc59a576cfe8ec8737230e7d0398842a5a8c925e25065463ab632a7eaba9
@@ -19,12 +19,10 @@ build_options="pam timestamp"
 build_options_default="pam timestamp"
 desc_option_timestamp="enable persistent auth using timestamps"
 
-
 pre_configure() {
 	cp ${FILESDIR}/doas.pam pam.d__doas__linux
 	vsed -i GNUmakefile \
-		-e '/chown ${BINOWN}:${BINGRP}/d' \
-		-e '/chmod ${BINMODE}/d'
+		-e '/chown ${BINOWN}:${BINGRP}/d'
 }
 
 post_install() {

From 058e8402a9f583a38442672721d5bb09987ac3b0 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 16 Jan 2021 11:30:51 +0100
Subject: [PATCH 0020/3482] viu: update to 1.3.0

---
 srcpkgs/viu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/viu/template b/srcpkgs/viu/template
index 095675733224..71a2291d9a3d 100644
--- a/srcpkgs/viu/template
+++ b/srcpkgs/viu/template
@@ -1,6 +1,6 @@
 # Template file for 'viu'
 pkgname=viu
-version=1.2
+version=1.3.0
 revision=1
 build_style=cargo
 short_desc="CLI app to view images in the terminal"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/atanunq/viu"
 distfiles="https://github.com/atanunq/viu/archive/v${version}.tar.gz"
-checksum=9c91941492289e01fffe15e881ca32b511b337b310bc6fc382126d92ebb51d70
+checksum=ee049c065945a528699799f18de4d82355d5b2f5509d2435b9f5332c8dd520c5
 
 post_install() {
 	vlicense LICENSE-MIT

From facae1547dbc72d8ba3195d7d41890322c5272d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 07:24:40 +0700
Subject: [PATCH 0021/3482] lightdm-gtk3-greeter: update to 2.0.8.

---
 srcpkgs/lightdm-gtk3-greeter/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/lightdm-gtk3-greeter/template b/srcpkgs/lightdm-gtk3-greeter/template
index 0143b00d129a..8e8da8c6920f 100644
--- a/srcpkgs/lightdm-gtk3-greeter/template
+++ b/srcpkgs/lightdm-gtk3-greeter/template
@@ -1,18 +1,19 @@
 # Template file for 'lightdm-gtk3-greeter'
 pkgname=lightdm-gtk3-greeter
-version=2.0.7
+version=2.0.8
 revision=1
 wrksrc="${pkgname/3/}-${version}"
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool exo-devel"
+configure_args="--disable-static --disable-maintainer-mode"
+hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel lightdm-devel libxklavier-devel"
 depends="lightdm hicolor-icon-theme"
 conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
 short_desc="Light Display Manager GTK+ Greeter (GTK+ 3.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://launchpad.net/lightdm-gtk-greeter"
+homepage="https://github.com/Xubuntu/lightdm-gtk-greeter"
 distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname/3/}-${version}.tar.gz"
-checksum=bae293f21286e93113ee7965a3a8734bbee6b94f3c74d8723dcae13dda60fcbc
+distfiles="https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-$version/lightdm-gtk-greeter-$version.tar.gz"
+checksum=befbb300c7b34ff21865fdbc881201f730fc7c560e9e01d17e899e9477150613
 conflicts="lightdm-gtk-greeter>=0"

From aa58a914beb4e76dbd164a3e98516feb116ebf85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 07:33:45 +0700
Subject: [PATCH 0022/3482] nemo: fix gir path

Also remove gnome-common
---
 srcpkgs/nemo/patches/fix-gir-path.patch | 11 +++++++++++
 srcpkgs/nemo/template                   |  9 +--------
 2 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/nemo/patches/fix-gir-path.patch

diff --git a/srcpkgs/nemo/patches/fix-gir-path.patch b/srcpkgs/nemo/patches/fix-gir-path.patch
new file mode 100644
index 000000000000..317b031af15f
--- /dev/null
+++ b/srcpkgs/nemo/patches/fix-gir-path.patch
@@ -0,0 +1,11 @@
+--- libnemo-extension/meson.build
++++ libnemo-extension/meson.build
+@@ -61,7 +61,7 @@
+   dependencies: nemo_extension_deps,
+ )
+ 
+-typelibdir = go_intr.get_pkgconfig_variable('typelibdir', define_variable: ['libdir', get_option('libdir')])
++typelibdir = go_intr.get_pkgconfig_variable('typelibdir')
+ 
+ gnome.generate_gir(nemo_extension_lib,
+   sources: nemo_extension_sources + nemo_extension_headers,
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b01069a16318..ef869db4d31a 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -5,8 +5,7 @@ revision=1
 build_style=meson
 build_helper=gir
 pycompile_dirs="/usr/share/nemo/actions/myaction.py"
-hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
- gobject-introspection"
+hostmakedepends="gettext-devel glib-devel intltool pkg-config"
 makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
  libexif-devel libnotify-devel tracker-devel xapps-devel"
 depends="cinnamon-translations dconf gvfs"
@@ -30,12 +29,6 @@ pre_configure() {
 	sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
 }
 
-post_install() {
-	if [ -d "$DESTDIR"/lib/girepository-1.0 ]; then
-		mv ${DESTDIR}/lib/girepository-1.0 ${DESTDIR}/usr/lib/
-	fi
-}
-
 libnemo_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {

From 6bb4e4faf90a2dabbbe8523306cfb3f303439cf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 07:32:41 +0700
Subject: [PATCH 0023/3482] boomerang: include stdint.h for int8_t

---
 srcpkgs/boomerang/patches/include-stdint.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/boomerang/patches/include-stdint.patch

diff --git a/srcpkgs/boomerang/patches/include-stdint.patch b/srcpkgs/boomerang/patches/include-stdint.patch
new file mode 100644
index 000000000000..025d00c5dea1
--- /dev/null
+++ b/srcpkgs/boomerang/patches/include-stdint.patch
@@ -0,0 +1,11 @@
+--- src/boomerang-plugins/codegen/c/ControlFlowAnalyzer.h
++++ src/boomerang-plugins/codegen/c/ControlFlowAnalyzer.h
+@@ -9,7 +9,7 @@
+ #pragma endregion License
+ #pragma once
+ 
+-
++#include <stdint.h>
+ #include <unordered_map>
+ #include <vector>
+ 

From b358a8c9b9c1df183ba4fdb2e85d61edace5b740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 07:52:49 +0700
Subject: [PATCH 0024/3482] lightdm-gtk3-greeter: remove old distfiles

---
 srcpkgs/lightdm-gtk3-greeter/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/lightdm-gtk3-greeter/template b/srcpkgs/lightdm-gtk3-greeter/template
index 8e8da8c6920f..c514dfa5563a 100644
--- a/srcpkgs/lightdm-gtk3-greeter/template
+++ b/srcpkgs/lightdm-gtk3-greeter/template
@@ -13,7 +13,6 @@ short_desc="Light Display Manager GTK+ Greeter (GTK+ 3.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Xubuntu/lightdm-gtk-greeter"
-distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname/3/}-${version}.tar.gz"
 distfiles="https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-$version/lightdm-gtk-greeter-$version.tar.gz"
 checksum=befbb300c7b34ff21865fdbc881201f730fc7c560e9e01d17e899e9477150613
 conflicts="lightdm-gtk-greeter>=0"

From 597174314788beeb318eaf97b9fea6ae19bcff97 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 16 Jan 2021 22:19:07 -0800
Subject: [PATCH 0025/3482] linux5.10: add PL330 support to arm64-dotconfig

This DMA driver is necessary on rk3399 and rk3328 boards
(and perhaps others).
---
 srcpkgs/linux5.10/files/arm64-dotconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index 75101a22dbd4..f0fcc43b536b 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -8564,7 +8564,7 @@ CONFIG_MXS_DMA=y
 CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
 CONFIG_OWL_DMA=m
-# CONFIG_PL330_DMA is not set
+CONFIG_PL330_DMA=m
 CONFIG_PLX_DMA=m
 CONFIG_SPRD_DMA=m
 # CONFIG_TEGRA20_APB_DMA is not set

From fdfebfc81c7fdf39017cd5e11ceb67d247fc5742 Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Wed, 13 Jan 2021 14:19:21 +0100
Subject: [PATCH 0026/3482] geckodriver: update to 0.28.0.

---
 srcpkgs/geckodriver/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/geckodriver/template b/srcpkgs/geckodriver/template
index 23d734ff0fcc..055a3454f82f 100644
--- a/srcpkgs/geckodriver/template
+++ b/srcpkgs/geckodriver/template
@@ -1,23 +1,23 @@
 # Template file for 'geckodriver'
 pkgname=geckodriver
-version=0.26.0
+version=0.28.0
 revision=1
-_hg_commit="e9783a644016aa9b317887076618425586730d73"
+_hg_commit="c00d2b6acd3fb1b197b25662fba0a96c11669b66"
 create_wrksrc=yes
 build_wrksrc=${pkgname}
 build_style=cargo
 short_desc="WebDriver for Firefox"
-maintainer="m3tav3rse <n6maa10816@tuta.io>"
+maintainer="m3tav3rse <mtvrs@tuta.io>"
 license="MPL-2.0"
 homepage="https://github.com/mozilla/geckodriver"
 distfiles="https://hg.mozilla.org/mozilla-central/archive/${_hg_commit}.zip/testing/geckodriver/>geckodriver.zip
  https://hg.mozilla.org/mozilla-central/archive/${_hg_commit}.zip/testing/webdriver/>webdriver.zip
  https://hg.mozilla.org/mozilla-central/archive/${_hg_commit}.zip/testing/mozbase/rust/>mozbase-rust.zip
  https://hg.mozilla.org/mozilla-central/raw-file/${_hg_commit}/Cargo.lock"
-checksum="c5854000621938de2aac0bdc853da62539e694adcba98b61851adcbb9ce54dd3
- d84d6b84d4b37bb4fadda639026eca63dc61dd289bbeb3961eef1257be49266b
- a838ae82753aaed38eff52bd2076e47a418858be39c7dc5d833070c6ee2f7beb
- 107aaf145d4840a389c2d4586660e95e3fa336a42bb9f94524f9a72c89c21d09"
+checksum="278b0f57b4659c82a22be260e754a38d0e61fc28cb76bf8a4b672020456c2f08
+ eddf228980cd00a357f549435e5225a7d291305583c1d5010b0930039f6ddfb7
+ 1049fa9f18ffc7bb03da0523d782c6f52f12bdee8b5ee3d705ee618a1e95011e
+ e2b6ba6af118d2fde12cdc05dfd0feca0d1d583f8bd083255dd48544fd416ca9"
 skip_extraction="Cargo.lock"
 
 post_extract() {

From 35cac24b71e98a83138a7447faedfcf5fab946b8 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 18 Jan 2021 10:16:38 +0100
Subject: [PATCH 0027/3482] geckodriver: fix concurrent builds

---
 srcpkgs/geckodriver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/geckodriver/template b/srcpkgs/geckodriver/template
index 055a3454f82f..685bfc35cdbe 100644
--- a/srcpkgs/geckodriver/template
+++ b/srcpkgs/geckodriver/template
@@ -1,7 +1,7 @@
 # Template file for 'geckodriver'
 pkgname=geckodriver
 version=0.28.0
-revision=1
+revision=2
 _hg_commit="c00d2b6acd3fb1b197b25662fba0a96c11669b66"
 create_wrksrc=yes
 build_wrksrc=${pkgname}
@@ -23,7 +23,7 @@ skip_extraction="Cargo.lock"
 post_extract() {
 	mv ${wrksrc}/mozilla-central-${_hg_commit}/testing/* ${wrksrc}
 	rm -r ${wrksrc}/mozilla-central-${_hg_commit}
-	mv ${XBPS_SRCDISTDIR}/${pkgname}-${version}/Cargo.lock ${build_wrksrc}
+	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/Cargo.lock ${build_wrksrc}
 }
 
 case $XBPS_TARGET_MACHINE in

From 6444245fcacf6cf20a13f963224faa1febee5e73 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 18 Jan 2021 10:32:57 +0100
Subject: [PATCH 0028/3482] fntsample: don't move distfile

---
 srcpkgs/fntsample/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fntsample/template b/srcpkgs/fntsample/template
index 4c8488eed1dd..7abc88b2aa9f 100644
--- a/srcpkgs/fntsample/template
+++ b/srcpkgs/fntsample/template
@@ -3,6 +3,7 @@ pkgname=fntsample
 version=5.3
 revision=1
 build_style=cmake
+wrksrc="fntsample-release-${version}"
 configure_args="-DUNICODE_BLOCKS=../Blocks.txt"
 hostmakedepends="gettext pkg-config"
 makedepends="cairo-devel fontconfig-devel freetype-devel glib-devel pango-devel"
@@ -21,8 +22,7 @@ skip_extraction="Blocks.txt
  terms_of_use.html"
 
 post_extract() {
-	mv "${XBPS_BUILDDIR}/fntsample-release-${version}" "${wrksrc}"
-	mv "${XBPS_SRCDISTDIR}/fntsample-${version}/Blocks.txt" "${wrksrc}/"
+	cp "${XBPS_SRCDISTDIR}/fntsample-${version}/Blocks.txt" "${wrksrc}/"
 }
 
 post_install() {

From 9a31d0c8f4042a519ae63988b844e9cfdc8bf75f Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 18 Jan 2021 10:43:04 +0100
Subject: [PATCH 0029/3482] stremio-shell: don't move distfiles

---
 srcpkgs/stremio-shell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 88b2153da306..100543c5f4f4 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -53,6 +53,6 @@ post_install() {
 	echo "cd /usr/lib/stremio && exec node server.js" >> stremio-server
 	vbin stremio-server
 
-	mv ${XBPS_SRCDISTDIR}/${pkgname}-${version}/server.js ${DESTDIR}/usr/lib/stremio
-	mv ${XBPS_SRCDISTDIR}/${pkgname}-${version}/stremio.asar ${DESTDIR}/usr/lib/stremio
+	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/server.js ${DESTDIR}/usr/lib/stremio
+	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/stremio.asar ${DESTDIR}/usr/lib/stremio
 }

From 9c707db8a3ffbd12f94bfb59b261db55f67433e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 07:18:51 +0700
Subject: [PATCH 0030/3482] libpinyin: enable libzhuyin

---
 srcpkgs/libpinyin/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libpinyin/template b/srcpkgs/libpinyin/template
index 363ee5f0fe27..7d141b6a086b 100644
--- a/srcpkgs/libpinyin/template
+++ b/srcpkgs/libpinyin/template
@@ -1,19 +1,26 @@
 # Template file for 'libpinyin'
 pkgname=libpinyin
 version=2.6.0
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="intltool libtool pkg-config autoconf-archive autoconf automake
- wget gnome-common"
+configure_args="--enable-libzhuyin"
+hostmakedepends="intltool libtool pkg-config autoconf-archive autoconf automake"
 makedepends="db-devel libglib-devel"
 short_desc="Support library for PinYin and ZhuYin (Bopofomo)"
 maintainer="Ben Sung Hsu <pobetiger+github@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/libpinyin/libpinyin"
 changelog="https://raw.githubusercontent.com/libpinyin/libpinyin/${version}/ChangeLog"
-distfiles="https://github.com/libpinyin/libpinyin/archive/${version}.tar.gz"
-checksum=2b52f617a99567a8ace478ee82ccc62d1761e3d1db2f1e05ba05b416708c35d2
+distfiles="https://github.com/libpinyin/libpinyin/archive/${version}.tar.gz
+ http://downloads.sourceforge.net/libpinyin/models/model19.text.tar.gz"
+checksum="2b52f617a99567a8ace478ee82ccc62d1761e3d1db2f1e05ba05b416708c35d2
+ 56422a4ee5966c2c809dd065692590ee8def934e52edbbe249b8488daaa1f50b"
 nocross="Requires data generators compiled against target system"
+skip_extraction="model19.text.tar.gz"
+
+post_extract() {
+	bsdtar -C data -xf $XBPS_SRCDISTDIR/$pkgname-$version/model19.text.tar.gz
+}
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh

From 68ebeb045ac10151f8275505d335bad606361773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 07:56:04 +0700
Subject: [PATCH 0031/3482] cinnamon-control-center:
 hostmakedepends-=gnome-common

---
 srcpkgs/cinnamon-control-center/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 9da17ca74f32..d818e4223c4a 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
-hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
+hostmakedepends="autoconf-archive gettext-devel glib-devel automake
  gobject-introspection intltool libtool pkg-config libxslt"
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel

From f0263666aa740bfb70a71417d6b5b1c531e4c068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 08:00:07 +0700
Subject: [PATCH 0032/3482] cinnamon-menus: hostmakedepends-=gnome-common

---
 srcpkgs/cinnamon-menus/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index 7b2451c7ee90..4611ddd3ca04 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -4,8 +4,7 @@ version=4.6.1
 revision=2
 build_style=meson
 build_helper=gir
-hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
- pkg-config"
+hostmakedepends="glib-devel gobject-introspection intltool libtool pkg-config"
 makedepends="libglib-devel gobject-introspection"
 short_desc="Cinnamon menu specifications"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2757f0ebe7fb434be4bcf846f22ea4df55937b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 08:07:26 +0700
Subject: [PATCH 0033/3482] cinnamon-screensaver: hostmakedepends-=gnome-common

---
 srcpkgs/cinnamon-screensaver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 76df8da77bfc..e45409aae8a6 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -4,7 +4,7 @@ version=4.6.0
 revision=2
 build_style=meson
 build_helper=gir
-hostmakedepends="gettext-devel glib-devel gnome-common gobject-introspection
+hostmakedepends="gettext-devel glib-devel gobject-introspection
  intltool libtool pkg-config python3-devel"
 makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel
  libgnomekbd-devel pam-devel python3-devel webkit2gtk-devel"

From f7cddbfa4beebc949f495ccc54715b7ac1de38f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 08:14:50 +0700
Subject: [PATCH 0034/3482] cinnamon-settings-daemon:
 hostmakedepends-=gnome-common

---
 srcpkgs/cinnamon-settings-daemon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 70f76130dd2a..a41b897347f7 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --disable-schemas-compile"
-hostmakedepends="dbus-glib-devel gettext-devel glib-devel gnome-common
+hostmakedepends="dbus-glib-devel gettext-devel glib-devel automake
  gobject-introspection intltool libtool pkg-config"
 makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
  libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel

From 07c47668a029194a7f9bbf09f6e80998e3d55f20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 08:40:52 +0700
Subject: [PATCH 0035/3482] gnome-online-accounts:
 hostmakedepends-=gnome-common

---
 srcpkgs/gnome-online-accounts/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index d44450e043f2..6c95c1530c3d 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -10,7 +10,7 @@ configure_args="$(vopt_enable gir introspection)
  --enable-facebook --disable-static --enable-exchange  --enable-imap-smtp
  --enable-owncloud --enable-windows-live --enable-pocket
  --enable-lastfm --enable-media-server"
-hostmakedepends="docbook-xsl gettext-devel glib-devel gnome-common
+hostmakedepends="docbook-xsl gettext-devel glib-devel
  libxslt pkg-config $(vopt_if gir vala)"
 makedepends="gcr-devel gtk+3-devel json-glib-devel libnotify-devel libsecret-devel
  libsoup-devel mit-krb5-devel rest-devel telepathy-glib-devel webkit2gtk-devel"

From 970ad4f3f4ff255ca06c4b0a8152787cd1c5e336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 18:41:09 +0700
Subject: [PATCH 0036/3482] refind: build with
 -fno-tree-loop-distribute-patterns

Fix build for gcc-10
---
 .../0001-Fix-GCC-10-compile-problem.patch     | 25 +++++++++++++++++++
 srcpkgs/refind/template                       |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/refind/patches/0001-Fix-GCC-10-compile-problem.patch

diff --git a/srcpkgs/refind/patches/0001-Fix-GCC-10-compile-problem.patch b/srcpkgs/refind/patches/0001-Fix-GCC-10-compile-problem.patch
new file mode 100644
index 000000000000..d93f719b78a0
--- /dev/null
+++ b/srcpkgs/refind/patches/0001-Fix-GCC-10-compile-problem.patch
@@ -0,0 +1,25 @@
+From e34a16301f425f273a67ed3abbc45840bc82d892 Mon Sep 17 00:00:00 2001
+From: srs5694 <srs5694@users.sourceforge.net>
+Date: Fri, 15 May 2020 12:34:14 -0400
+Subject: [PATCH] Fix GCC 10 compile problem
+
+---
+ Make.common | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git Make.common Make.common
+index 3f0b919..95a3a97 100644
+--- Make.common
++++ Make.common
+@@ -60,7 +60,7 @@ endif
+ #
+ 
+ # ...for both GNU-EFI and TianoCore....
+-OPTIMFLAGS      = -Os -fno-strict-aliasing
++OPTIMFLAGS      = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns
+ CFLAGS          = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall
+ 
+ # ...for GNU-EFI....
+-- 
+2.30.0
+
diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template
index d7f8f2fba1ca..85742b0385ab 100644
--- a/srcpkgs/refind/template
+++ b/srcpkgs/refind/template
@@ -1,7 +1,7 @@
 # Template file for 'refind'
 pkgname=refind
 version=0.12.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64*"
 makedepends="gnu-efi-libs"
 depends="bash dosfstools efibootmgr"

From beea74e3bd231b3741bafcac3dda044b2b267fc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 14 Jan 2021 20:46:35 +0700
Subject: [PATCH 0037/3482] reminiscence: remove package

- The last GPLv3 version was 0.2.1 or so (Debian has this version)
- Our current version doesn't have any license, only Copyright notice,
  let's not play the politic game.
---
 srcpkgs/reminiscence/template     | 24 ------------------------
 srcpkgs/removed-packages/template |  3 ++-
 2 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/reminiscence/template

diff --git a/srcpkgs/reminiscence/template b/srcpkgs/reminiscence/template
deleted file mode 100644
index 33a2d85e8287..000000000000
--- a/srcpkgs/reminiscence/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'reminiscence'
-pkgname=reminiscence
-version=0.4.6
-revision=1
-wrksrc="REminiscence-${version}"
-build_style=gnu-makefile
-make_use_env=yes
-makedepends="zlib-devel libmodplug-devel SDL2-devel"
-short_desc="Rewrite of the engine used in the game Flashback from Delphine Software"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
-homepage="http://cyxdown.free.fr/reminiscence/"
-distfiles="http://cyxdown.free.fr/reminiscence/REminiscence-${version}.tar.bz2"
-checksum=a1738ca7df64cd34e75a0ada3110e70ed495260fda813bc9d8722b521fc6fee0
-
-pre_build() {
-	vsed -e 's,-DUSE_TREMOR,,' -i Makefile
-	vsed -e '/LIBS =/s/$(TREMOR_LIBS)//' -i Makefile
-}
-
-do_install() {
-	vbin rs ${pkgname}
-	vdoc README.txt
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index bf072b83c9bf..3afdfe988051 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=10
+revision=11
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -65,6 +65,7 @@ replaces="
  python-pytest-relaxed<=1.1.2_2
  qimageblitz<=0.0.6_4
  r2-bindings<=1.0.1_2
+ reminiscence<=0.4.6_1
  seriespl<=2.3.5_2
  simple-obfs<=0.0.5_2
  skypetab-ng<=20150201_3

From e5cd09ec87e86cc9aee63dace7af92438b8b49bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 18:57:52 +0700
Subject: [PATCH 0038/3482] XyGrib: fix build with openjpeg 2.4

---
 srcpkgs/XyGrib/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/XyGrib/template b/srcpkgs/XyGrib/template
index 203d0fc9f58c..e4aa3a2e0265 100644
--- a/srcpkgs/XyGrib/template
+++ b/srcpkgs/XyGrib/template
@@ -17,6 +17,11 @@ if [ "$CROSS_BUILD" ]; then
 	make_build_args="LINK=${XBPS_CROSS_TRIPLET}-c++"
 fi
 
+post_patch() {
+	vsed -i -e '\!/usr/include/openjpeg-2.3!i /usr/include/openjpeg-2.4' \
+		CMakeLists.txt
+}
+
 post_install() {
 	vbin ${FILESDIR}/XyGrib
 

From 99543601985e5bba37ab54effa9d9c7e5f1bfa37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 19:13:42 +0700
Subject: [PATCH 0039/3482] Terminal: fix build with gcc-10

---
 srcpkgs/Terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/Terminal/template b/srcpkgs/Terminal/template
index adef5edb6cc3..c52cbeb59d2a 100644
--- a/srcpkgs/Terminal/template
+++ b/srcpkgs/Terminal/template
@@ -4,7 +4,8 @@ version=0.9.9
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
-hostmakedepends="gnustep-make gcc-objc"
+make_build_args="OBJCFLAGS=-fcommon messages=yes"
+hostmakedepends="gnustep-make gcc-objc which"
 makedepends="gnustep-base-devel gnustep-gui-devel"
 depends="gnustep-base gnustep-gui gnustep-back"
 short_desc="Terminal emulator for GNUstep"

From fbd095287695aef7ff81bd7121567fd8e77e52a5 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 26 Oct 2019 00:56:58 +0200
Subject: [PATCH 0040/3482] .github: add pull request template

---
 .github/pull_request_template.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000000..212d2ef3f78e
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,28 @@
+<!-- Mark items with [x] where applicable -->
+
+#### General
+- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
+
+#### Have the results of the proposed changes been tested?
+- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
+- [ ] I generally don't use the affected packages but briefly tested this PR
+
+<!--
+If GitHub CI cannot be used to validate the build result (for example, if the
+build is likely to take several hours), make sure to include "[ci skip]' in
+either the PR title or this description. When skipping CI, uncomment and complete
+the following section.
+Note: for builds that are likely to complete in less than 2 hours, it is not
+acceptable to skip CI.
+-->
+<!-- 
+#### Does it build and run successfully? 
+(Please choose at least one native build and, if supported, at least one cross build. More are better.)
+- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
+- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
+  - [ ] aarch64-musl
+  - [ ] armv7l
+  - [ ] armv6l-musl
+
+[ci skip]
+-->

From c28e6520bad63ba1d866aeff06461c4067bdcdf7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 18 Jan 2021 10:33:23 +0100
Subject: [PATCH 0041/3482] nncp: update to 5.6.0.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index db039facdae9..3f7d0bedea0b 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=5.5.1
+version=5.6.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=e7deed7ad3ba696cf64359c0dc0a93ad109950c56660d0285fd7bb57120c9cf7
+checksum=1dc83f05f14a3c3b95820046c60b170eb8c8936f142a5b9a1e943e6f4cefbde3
 
 do_build() {
 	make

From 89bbae679f8d062c0cff63b54f59063dd8cdbf13 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 18 Jan 2021 10:34:11 +0100
Subject: [PATCH 0042/3482] python3-userpath: update to 1.4.2.

---
 srcpkgs/python3-userpath/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-userpath/template b/srcpkgs/python3-userpath/template
index 67e62bb719fe..117866eb9b8b 100644
--- a/srcpkgs/python3-userpath/template
+++ b/srcpkgs/python3-userpath/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-userpath'
 pkgname=python3-userpath
-version=1.4.1
-revision=2
+version=1.4.2
+revision=1
 wrksrc="userpath-${version}"
 build_style=python3-module
 pycompile_module="userpath"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/ofek/userpath"
 distfiles="${PYPI_SITE}/u/userpath/userpath-${version}.tar.gz"
-checksum=211544ea02d8715fdc06f429cf66cd18c9877a31751d966d6de11b24faaed255
+checksum=dd4b5496e4ef2c1a3bbb103ffefa7738fa4ba15f23580918bb9f949dcd61a8a7
 
 post_install() {
 	vlicense LICENSE-MIT

From c474e2d3a95416c20b91547a5f4e93aa24715c78 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 18 Jan 2021 14:01:24 +0100
Subject: [PATCH 0043/3482] .github: add notice to delete the [ci skip] block

if the commented block is left in the PR text, CI won't run
---
 .github/pull_request_template.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 212d2ef3f78e..1fdf9e94ea93 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -9,9 +9,9 @@
 
 <!--
 If GitHub CI cannot be used to validate the build result (for example, if the
-build is likely to take several hours), make sure to include "[ci skip]' in
-either the PR title or this description. When skipping CI, uncomment and complete
-the following section.
+build is likely to take several hours), make sure to
+[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
+When skipping CI, uncomment and fill out the following section.
 Note: for builds that are likely to complete in less than 2 hours, it is not
 acceptable to skip CI.
 -->
@@ -23,6 +23,4 @@ acceptable to skip CI.
   - [ ] aarch64-musl
   - [ ] armv7l
   - [ ] armv6l-musl
-
-[ci skip]
 -->

From 326fbe95b0b6c4a65b8e1ae9e54233bb849eb15d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 14 Jan 2021 07:40:30 +0700
Subject: [PATCH 0044/3482] libfprint: update to 1.90.7.

---
 common/shlibs                |  2 +-
 srcpkgs/libfprint-udev-rules |  1 +
 srcpkgs/libfprint/template   | 29 ++++++++++++++++++-----------
 srcpkgs/libfprint/update     |  2 --
 4 files changed, 20 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libfprint-udev-rules
 delete mode 100644 srcpkgs/libfprint/update

diff --git a/common/shlibs b/common/shlibs
index 468fe3a63fea..c55d6c02ac8f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1571,7 +1571,7 @@ libtcmalloc.so.4 gperftools-2.1_1
 libaio.so.1 libaio-0.3.109_1
 libofx.so.7 libofx-0.9.11_1
 libsigsegv.so.2 libsigsegv-2.10_2
-libfprint.so.0 libfprint-0.5.1_1
+libfprint-2.so.2 libfprint-1.90.7_1
 libwx_baseu_xml-3.0.so.0 wxWidgets-common-3.0.4_1
 libwx_baseu-3.0.so.0 wxWidgets-common-3.0.4_1
 libwx_gtk2_adv-3.0.so.0 wxWidgets-3.0.0_1
diff --git a/srcpkgs/libfprint-udev-rules b/srcpkgs/libfprint-udev-rules
new file mode 120000
index 000000000000..739ca683efab
--- /dev/null
+++ b/srcpkgs/libfprint-udev-rules
@@ -0,0 +1 @@
+libfprint
\ No newline at end of file
diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template
index ae22b871f3db..9f32d0bea086 100644
--- a/srcpkgs/libfprint/template
+++ b/srcpkgs/libfprint/template
@@ -1,24 +1,22 @@
 # Template file for 'libfprint'
 pkgname=libfprint
-version=1.0
+version=1.90.7
 revision=1
-wrksrc="libfprint-V_${version//./_}"
+wrksrc=libfprint-v$version
 build_style=meson
+build_helper=gir
 configure_args="-Dudev_rules=false -Dx11-examples=false -Dgtk-examples=false -Ddoc=false"
-hostmakedepends="pkg-config"
-makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel"
+hostmakedepends="pkg-config glib-devel"
+makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel
+ libgusb-devel libglib-devel"
+depends="libfprint-udev-rules>=${version}_${revision}"
 short_desc="Support for consumer fingerprint reader devices"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.freedesktop.org/wiki/Software/fprint/"
 changelog="https://gitlab.freedesktop.org/libfprint/libfprint/raw/master/NEWS"
-distfiles="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/V_${version//./_}/libfprint-V_${version//./_}.tar.bz2"
-checksum=22777a1d202ef912395b94842ae6b531338c8d48a8a813616e846b1bc96c5ad9
-
-post_install() {
-	vmkdir usr/lib/udev/rules.d
-	vinstall $FILESDIR/60-fprint-autosuspend.rules 644 usr/lib/udev/rules.d
-}
+distfiles="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v$version/libfprint-v$version.tar.bz2"
+checksum=d11acf183820812fd6a8cd808d58bbf197554bcc0f9119d4c873092ecd94ee29
 
 libfprint-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -29,3 +27,12 @@ libfprint-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+libfprint-udev-rules_package() {
+	short_desc+=" - udev rules"
+	conflicts="libfprint<=1.0_1"
+	pkg_install() {
+		vmkdir usr/lib/udev/rules.d
+		vinstall $FILESDIR/60-fprint-autosuspend.rules 644 usr/lib/udev/rules.d
+	}
+}
diff --git a/srcpkgs/libfprint/update b/srcpkgs/libfprint/update
deleted file mode 100644
index 1f57940e9389..000000000000
--- a/srcpkgs/libfprint/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?_\K[\d\._]+(?=\.tar\.gz")'
-ignore='*.99.*'

From 26e23d4f390887d5ddc9847ecdc0ed1661b9bc31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 14 Jan 2021 07:41:57 +0700
Subject: [PATCH 0045/3482] New package: libfprint0-1.0

---
 common/shlibs                                 |  1 +
 srcpkgs/libfprint0-devel                      |  1 +
 .../patches/fix-stderr-redefinition.patch     | 12 +++++++
 srcpkgs/libfprint0/template                   | 33 +++++++++++++++++++
 srcpkgs/libfprint0/update                     |  2 ++
 5 files changed, 49 insertions(+)
 create mode 120000 srcpkgs/libfprint0-devel
 create mode 100644 srcpkgs/libfprint0/patches/fix-stderr-redefinition.patch
 create mode 100644 srcpkgs/libfprint0/template
 create mode 100644 srcpkgs/libfprint0/update

diff --git a/common/shlibs b/common/shlibs
index c55d6c02ac8f..04c50017e314 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1571,6 +1571,7 @@ libtcmalloc.so.4 gperftools-2.1_1
 libaio.so.1 libaio-0.3.109_1
 libofx.so.7 libofx-0.9.11_1
 libsigsegv.so.2 libsigsegv-2.10_2
+libfprint.so.0 libfprint0-1.0_1
 libfprint-2.so.2 libfprint-1.90.7_1
 libwx_baseu_xml-3.0.so.0 wxWidgets-common-3.0.4_1
 libwx_baseu-3.0.so.0 wxWidgets-common-3.0.4_1
diff --git a/srcpkgs/libfprint0-devel b/srcpkgs/libfprint0-devel
new file mode 120000
index 000000000000..f5b92a78c253
--- /dev/null
+++ b/srcpkgs/libfprint0-devel
@@ -0,0 +1 @@
+libfprint0
\ No newline at end of file
diff --git a/srcpkgs/libfprint0/patches/fix-stderr-redefinition.patch b/srcpkgs/libfprint0/patches/fix-stderr-redefinition.patch
new file mode 100644
index 000000000000..3784ccba869a
--- /dev/null
+++ b/srcpkgs/libfprint0/patches/fix-stderr-redefinition.patch
@@ -0,0 +1,12 @@
+--- libfprint/nbis/include/bozorth.h.orig	2019-08-11 15:17:26.878344708 +0200
++++ libfprint/nbis/include/bozorth.h	2019-08-11 15:17:10.303132150 +0200
+@@ -218,7 +218,9 @@ struct xytq_struct {
+ /* Globals supporting command line options */
+ extern int verbose_threshold;
+ /* Global supporting error reporting */
++#ifdef __GLIBC__
+ extern FILE *stderr;
++#endif
+ 
+ /**************************************************************************/
+ /* In: BZ_GBLS.C */
diff --git a/srcpkgs/libfprint0/template b/srcpkgs/libfprint0/template
new file mode 100644
index 000000000000..2d31deb97f4b
--- /dev/null
+++ b/srcpkgs/libfprint0/template
@@ -0,0 +1,33 @@
+# Template file for 'libfprint0'
+pkgname=libfprint0
+version=1.0
+revision=2
+wrksrc="libfprint-V_${version//./_}"
+build_style=meson
+configure_args="-Dudev_rules=false -Dx11-examples=false -Dgtk-examples=false -Ddoc=false"
+hostmakedepends="pkg-config"
+makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel"
+depends="libfprint-udev-rules"
+short_desc="Support for consumer fingerprint reader devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="http://www.freedesktop.org/wiki/Software/fprint/"
+changelog="https://gitlab.freedesktop.org/libfprint/libfprint/raw/master/NEWS"
+distfiles="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/V_${version//./_}/libfprint-V_${version//./_}.tar.bz2"
+checksum=22777a1d202ef912395b94842ae6b531338c8d48a8a813616e846b1bc96c5ad9
+provides="libfprint-${version}_${revision}"
+replaces="libfprint<=${version}_1"
+
+post_install() {
+	vmkdir usr/lib/udev/rules.d
+}
+
+libfprint0-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libfprint0/update b/srcpkgs/libfprint0/update
new file mode 100644
index 000000000000..bebe6bef5f30
--- /dev/null
+++ b/srcpkgs/libfprint0/update
@@ -0,0 +1,2 @@
+pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?_\K[\d\._]+(?=\.tar\.gz")'
+ignore='*.99.* 1.9* [2-9].*'

From 3930d4ed5f958998f45b32ec5f8ee7cec78e14b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 13 Jan 2021 22:33:19 +0700
Subject: [PATCH 0046/3482] fprint_demo: rebuild with libfprint0

---
 srcpkgs/fprint_demo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fprint_demo/template b/srcpkgs/fprint_demo/template
index a801b480bbf7..723fa68f3f7d 100644
--- a/srcpkgs/fprint_demo/template
+++ b/srcpkgs/fprint_demo/template
@@ -1,15 +1,15 @@
 # Template file for 'fprint_demo'
 pkgname=fprint_demo
 version=0.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libfprint-devel"
+makedepends="gtk+-devel libfprint0-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Demonstrates libfprint's capabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.freedesktop.org/wiki/Software/fprint/fprint_demo/"
-license="GPL-2"
 distfiles="https://github.com/dsd/${pkgname}/archive/v${version}.tar.gz"
 checksum=6f54f43e0a015cd83504a2c726a59154c5aee83e229e8494d54e592624ee3ad5
 

From ab4192200eabe882c1f571f55b44eeff51bb78bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 13 Jan 2021 22:33:41 +0700
Subject: [PATCH 0047/3482] fingerprint-gui: rebuild with fprint0

---
 srcpkgs/fingerprint-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fingerprint-gui/template b/srcpkgs/fingerprint-gui/template
index f030ab573aad..a17832fe13f9 100644
--- a/srcpkgs/fingerprint-gui/template
+++ b/srcpkgs/fingerprint-gui/template
@@ -1,11 +1,11 @@
 # Template file for 'fingerprint-gui'
 pkgname=fingerprint-gui
 version=1.09
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-qt5"
 build_style=qmake
 hostmakedepends="qt5-host-tools qt5-qmake"
-makedepends="qt5-devel qca-qt5-devel libfprint-devel libfakekey-devel
+makedepends="qt5-devel qca-qt5-devel libfprint0-devel libfakekey-devel
  polkit-qt5-devel pam-devel qt5-x11extras-devel"
 depends="desktop-file-utils"
 short_desc="Fingerprint management GUI and PAM module"

From 2d1e6ccf85be3ef826d68f5773e54116124e752c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 10 Sep 2020 22:56:15 +0700
Subject: [PATCH 0048/3482] New package: pam_wrapper-1.1.3

---
 common/shlibs                |  1 +
 srcpkgs/pam_wrapper/template | 24 ++++++++++++++++++++++++
 srcpkgs/python3-pypamtest    |  1 +
 3 files changed, 26 insertions(+)
 create mode 100644 srcpkgs/pam_wrapper/template
 create mode 120000 srcpkgs/python3-pypamtest

diff --git a/common/shlibs b/common/shlibs
index 04c50017e314..5bd95138da00 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4045,3 +4045,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.3_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
 libsixel.so.1 libsixel-1.8.6_1
+libpamtest.so.0 pam_wrapper-1.1.3_1
diff --git a/srcpkgs/pam_wrapper/template b/srcpkgs/pam_wrapper/template
new file mode 100644
index 000000000000..ff5d9df688e8
--- /dev/null
+++ b/srcpkgs/pam_wrapper/template
@@ -0,0 +1,24 @@
+# Template file for 'pam_wrapper'
+pkgname=pam_wrapper
+version=1.1.3
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=None -DUNIT_TESTING=ON"
+hostmakedepends="cmake python3"
+makedepends="python3-devel pam-devel cmocka-devel"
+short_desc="Tool to test PAM applications and modules"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://cwrap.org/pam_wrapper.html"
+distfiles="https://www.samba.org/ftp/cwrap/pam_wrapper-${version}.tar.gz"
+checksum=4feedd788c6fa36516f6d6060482cd86455998d72849eb5f539de48915bdc5f3
+lib32disabled=yes
+
+python3-pypamtest_package() {
+	lib32disabled=yes
+	short_desc+=" - Python 3 bindings"
+	depends="${sourcepkg}>=${version}_${revision} python3"
+	pkg_install() {
+		vmove usr/lib/python*
+	}
+}
diff --git a/srcpkgs/python3-pypamtest b/srcpkgs/python3-pypamtest
new file mode 120000
index 000000000000..3ea00f9d1ad3
--- /dev/null
+++ b/srcpkgs/python3-pypamtest
@@ -0,0 +1 @@
+pam_wrapper
\ No newline at end of file

From 3ad28fb416ebea878b77b60b728058961494a500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 10 Sep 2020 20:54:57 +0700
Subject: [PATCH 0049/3482] fprintd: update to 1.90.1.

---
 srcpkgs/fprintd/template | 41 +++++++++++++---------------------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/srcpkgs/fprintd/template b/srcpkgs/fprintd/template
index 11e0922ea43e..8e40d243de27 100644
--- a/srcpkgs/fprintd/template
+++ b/srcpkgs/fprintd/template
@@ -1,36 +1,21 @@
 # Template file for 'fprintd'
 pkgname=fprintd
-version=0.9.0
-revision=3
-wrksrc="fprintd-V_${version//./_}"
-build_style=gnu-configure
-configure_args="--sysconfdir=/etc/${pkgname} --disable-static --without-systemdsystemunitdir"
+version=1.90.9
+revision=1
+wrksrc=fprintd-v$version
+build_style=meson
+configure_args="--sysconfdir=/etc/fprintd -Dman=true -Dgtk_doc=false
+ -Dsystemd=false -Dpam_modules_dir=/usr/lib/security"
 conf_files="/etc/fprintd/fprintd.conf"
-hostmakedepends="autoconf automake dbus-glib-devel gettext-devel glib-devel gtk-doc intltool libtool m4 pkg-config"
-makedepends="dbus-devel dbus-glib-devel gettext-devel glib-devel libfprint-devel pam-devel polkit-devel"
+hostmakedepends="meson dbus-glib-devel gettext-devel glib-devel intltool
+ pkg-config perl python3-cairo python3-pypamtest python3-dbus
+ python3-dbusmock libxslt libfprint polkit"
+makedepends="dbus-devel dbus-glib-devel gettext-devel glib-devel pam-devel
+ libfprint-devel polkit-devel cairo-devel elogind-devel pam_wrapper"
 short_desc="Daemon that provides fingerprint scanning functionality"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/fprint/"
-distfiles="https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/V_${version//./_}/fprintd-V_${version//./_}.tar.bz2"
-checksum=3bfbf870a3c333a0a1f08287b2b8501c34fd347faac8c1d52bd0d64ab3474d8e
+distfiles="https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v$version/fprintd-v$version.tar.bz2"
+checksum=9c9dcef205be0dfc669e2c892b28224dcd517674214aba745697e7341e3aef6f
 lib32disabled=yes
-
-CFLAGS="-fcommon"
-
-pre_configure() {
-	glib-gettextize -c -f
-	gtkdocize --copy
-	intltoolize -c -f
-	libtoolize -c
-	aclocal
-	autoconf
-	autoheader
-	automake -a -c
-}
-
-post_install() {
-	mv $DESTDIR/etc/$pkgname/dbus-1 $DESTDIR/usr/share/dbus-1
-	vmkdir usr/share/dbus-1/system.d
-	mv $DESTDIR/usr/share/dbus-1/dbus-1/system.d/net.reactivated.Fprint.conf $DESTDIR/usr/share/dbus-1/system.d/
-}

From b68a299f86b446d886da9674226e301da4fcdb7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 20:51:30 +0700
Subject: [PATCH 0050/3482] liquid-dsp: fix build

---
 srcpkgs/liquid-dsp/template | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template
index b1cff261bc10..d03535ae6605 100644
--- a/srcpkgs/liquid-dsp/template
+++ b/srcpkgs/liquid-dsp/template
@@ -3,6 +3,7 @@ pkgname=liquid-dsp
 version=1.3.1
 revision=1
 build_style=gnu-configure
+configure_args="--exec-prefix="
 hostmakedepends="automake"
 makedepends="fftw-devel"
 short_desc="Signal processing library for software-defined radios (SDR)"
@@ -12,10 +13,6 @@ homepage="http://liquidsdr.org/"
 distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz"
 checksum=e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73
 
-case "$XBPS_TARGET_MACHINE" in
-	i686) configure_args+=" --exec-prefix=" ;;
-esac
-
 pre_configure() {
 	autoreconf -fi
 }

From 7dd6038bad9b566c4a150d3e24a60808e7889968 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 18 Jan 2021 09:47:06 +0100
Subject: [PATCH 0051/3482] volta: update to 1.0.1

volta dropped 686 architecture support
---
 srcpkgs/volta/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 49e2aba57189..4f59d1542354 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,8 +1,8 @@
 # Template file for 'volta'
 pkgname=volta
-version=1.0.0
+version=1.0.1
 revision=1
-archs="x86_64 i686" # Due to volta pulling pre-built binaries later. Evil.
+archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
 makedepends="libressl-devel"
@@ -11,7 +11,7 @@ maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"
 homepage="https://volta.sh/"
 distfiles="https://github.com/volta-cli/volta/archive/v${version}.tar.gz"
-checksum=55d4e245b81baa540d4f56f5e2cb93f0a62047a7a40423536305b38231e38d96
+checksum=8d12a9f8754a982dfcfdb21cef29fa6d087e7e1022d0d3fe66f04b90f081a98a
 
 post_install() {
 	vlicense LICENSE

From 4f3680ba6031a54da28ad8fc6cddcab2e80966ea Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 18 Jan 2021 13:02:58 +0600
Subject: [PATCH 0052/3482] opera: update to 73.0.3856.344.

---
 srcpkgs/opera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 2d19dfb78220..136b504e8147 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=73.0.3856.329
+version=73.0.3856.344
 revision=1
 archs="x86_64"
 depends="ffmpeg desktop-file-utils hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb"
-checksum=ff03c0f8f969038521b82b2f3c47dddf52921266adcc9ccb0860f4e8e38ce048
+checksum=70cd10eb8fc4a2930571692aec9dcd2a8d52b23599a9c90b39578827e7df31f9
 repository="nonfree"
 nostrip=yes
 

From 1c4e5746f34228b90086585930f46d63bc540d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 18 Jan 2021 19:35:07 +0100
Subject: [PATCH 0053/3482] lollypop: update to 1.4.12

---
 srcpkgs/lollypop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 6cb8881ddd58..7cffd5a42a1b 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,6 +1,6 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.4.9
+version=1.4.12
 revision=1
 build_style=meson
 hostmakedepends="cmake git glib-devel gobject-introspection intltool itstool pkg-config"
@@ -13,4 +13,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/${pkgname}-${version}.tar.xz"
-checksum=9423a6e474480b0a27153cdcf7f994c7f7ce4dbeb5a05809b1f40e3e9776f4ba
+checksum=c089f89ad53a8d8743265ee12bd19a1b8907d6ff20f498ab1bff9cb4c83ec218

From 524253bd00e1f07e66b3393f3bb7c4a1b0b2ad8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 18 Jan 2021 19:38:00 +0100
Subject: [PATCH 0054/3482] sysexer-ng: fix build w/ gcc10

---
 srcpkgs/sysexxer-ng/patches/fix-std_string.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/sysexxer-ng/patches/fix-std_string.patch

diff --git a/srcpkgs/sysexxer-ng/patches/fix-std_string.patch b/srcpkgs/sysexxer-ng/patches/fix-std_string.patch
new file mode 100644
index 000000000000..d6e7a5796425
--- /dev/null
+++ b/srcpkgs/sysexxer-ng/patches/fix-std_string.patch
@@ -0,0 +1,10 @@
+--- sources/utility.h	2019-03-14 19:21:37.000000000 +0100
++++ sources/utility.h	2021-01-18 19:36:38.116292685 +0100
+@@ -5,6 +5,7 @@
+ 
+ #include <memory>
+ #include <type_traits>
++#include <string>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <stdarg.h>

From 9de6a9e7fb56c7d7ab9980d56c13efb38c4b03f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 20:43:00 +0700
Subject: [PATCH 0055/3482] stk: fix ftbfs, reconfigure libexecdir

We installed those files into /usr/libexec/stk for a long time.
---
 srcpkgs/stk/patches/lib-include-dir.patch | 21 +++++++++++++++++++++
 srcpkgs/stk/template                      | 12 +++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/stk/patches/lib-include-dir.patch

diff --git a/srcpkgs/stk/patches/lib-include-dir.patch b/srcpkgs/stk/patches/lib-include-dir.patch
new file mode 100644
index 000000000000..50fb53a77ccd
--- /dev/null
+++ b/srcpkgs/stk/patches/lib-include-dir.patch
@@ -0,0 +1,21 @@
+--- src/Makefile.in.orig	2021-01-18 20:34:19.338872822 +0700
++++ src/Makefile.in	2021-01-18 20:35:11.314028147 +0700
+@@ -93,13 +93,13 @@
+ 	$(LN) -s @sharedname@ $(SHAREDLIB)
+ 
+ install-headers:
+-	install -d $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk
+-	cp -R ../include/*.h $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk
++	install -d $(DESTDIR)$(INCLUDEDIR)/stk
++	cp -R ../include/*.h $(DESTDIR)$(INCLUDEDIR)/stk
+ 
+ install: $(SHAREDLIB) install-headers
+-	install -d $(DESTDIR)$(PREFIX)$(LIBDIR)
+-	install -m 644 @sharedname@ $(DESTDIR)$(PREFIX)$(LIBDIR)
+-	ln -sf @sharedname@ $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB)
++	install -d $(DESTDIR)$(LIBDIR)
++	install -m 644 @sharedname@ $(DESTDIR)$(LIBDIR)
++	ln -sf @sharedname@ $(DESTDIR)$(LIBDIR)/$(SHAREDLIB)
+ 
+ 
+ $(OBJECTS) : Stk.h
diff --git a/srcpkgs/stk/template b/srcpkgs/stk/template
index f726e3a53409..3ef3e444a38b 100644
--- a/srcpkgs/stk/template
+++ b/srcpkgs/stk/template
@@ -1,9 +1,12 @@
 # Template file for 'stk'
 pkgname=stk
 version=4.6.1
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--with-alsa --with-jack RAWWAVE_PATH=/usr/share/stk/rawwaves/"
+configure_args="--with-alsa
+ --libexecdir=/usr/libexec/stk
+ --with-jack RAWWAVE_PATH=/usr/share/stk/rawwaves/"
+make_install_args="prefix=/usr"
 hostmakedepends="automake libtool pkg-config"
 makedepends="alsa-lib-devel jack-devel"
 depends="libstk-${version}_${revision} stk-data-${version}_${revision}"
@@ -19,11 +22,6 @@ pre_configure() {
 }
 
 post_install() {
-	# Fix wrong 32 bit library install path
-	if [ -f "${DESTDIR}"/usr/usr/lib32/libstk.so ]; then
-		mv -v "${DESTDIR}"/usr/usr/lib32/* "${DESTDIR}"/usr/lib
-	fi
-
 	# Create a pkg-config file
 	vmkdir usr/lib/pkgconfig
 	sed ${FILESDIR}/stk.pc \

From b9790eff2c015d6dcd7b1cce945284594e193fad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 18 Jan 2021 19:44:30 +0100
Subject: [PATCH 0056/3482] exiftool: update to 12.15.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 08daf214fcc6..f2baecc24850 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.14
+version=12.15
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=c1682bd467b0cfb3a385cfe17e413e33a15070d4fe55b82f0302ca47f42341a4
+checksum=02e07fae4070c6bf7cdeb91075f783fea17c766b7caa23e6834e8bba424551b9

From d7ff592cbc714f3349b39f5c2f79d3f4f505293f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 13 Jan 2021 11:45:12 -0300
Subject: [PATCH 0057/3482] caribou: add fix for crash observed in
 cinammon-screensaver.

https://github.com/linuxmint/cinnamon-screensaver/issues/354

Also clean wrong and repeated entry from shlibs.
---
 common/shlibs                           |  1 -
 srcpkgs/caribou/patches/fix-crash.patch | 46 +++++++++++++++++++++++++
 srcpkgs/caribou/patches/fix-vala.patch  | 16 +++++++++
 srcpkgs/caribou/template                |  4 +--
 4 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/caribou/patches/fix-crash.patch
 create mode 100644 srcpkgs/caribou/patches/fix-vala.patch

diff --git a/common/shlibs b/common/shlibs
index 5bd95138da00..e0601851d650 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -896,7 +896,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
 libgrlnet-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/caribou/patches/fix-crash.patch b/srcpkgs/caribou/patches/fix-crash.patch
new file mode 100644
index 000000000000..a6fa3d7cd378
--- /dev/null
+++ b/srcpkgs/caribou/patches/fix-crash.patch
@@ -0,0 +1,46 @@
+From d41c8e44b12222a290eaca16703406b113a630c6 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Tue, 12 Jan 2021 18:01:47 +0000
+Subject: [PATCH] xadapter.vala: Remove XkbKeyTypesMask and fields from
+ XKbChangeMap call.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This was originally a workaround for xFree86 4.3 - see:
+https://bugzilla.gnome.org/show_bug.cgi?id=673547
+​
+As of https://gitlab.freedesktop.org/xorg/xserver/-/commit/87c64fc5b0 this
+causes a BadLength error when attempting to use shifted characters.
+​
+Ref:
+https://www.x.org/releases/X11R7.7/doc/libX11/XKB/xkblib.html#Changing_Map_Components_in_the_Server
+---
+ libcaribou/xadapter.vala | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/libcaribou/xadapter.vala b/libcaribou/xadapter.vala
+index 22858b7..1da5a78 100644
+--- a/libcaribou/xadapter.vala
++++ b/libcaribou/xadapter.vala
+@@ -195,15 +195,10 @@ namespace Caribou {
+ 
+             Xkb.MapChanges changes = Xkb.MapChanges ();
+ 
+-            // We don't touch key types here but include the
+-            // information in XkbSetMap request to the server, because
+-            // some X servers need the information to check the sanity
+-            // of the keysyms change.
+-            changes.changed = (ushort) (Xkb.KeySymsMask | Xkb.KeyTypesMask);
++            changes.changed = (ushort) Xkb.KeySymsMask;
+             changes.first_key_sym = (char) this.reserved_keycode;
+             changes.num_key_syms = this.xkbdesc.map.key_sym_map[this.reserved_keycode].width;
+-            changes.first_type = 0;
+-            changes.num_types = this.xkbdesc.map.num_types;
++
+             Xkb.change_map (this.xdisplay, this.xkbdesc, changes);
+ 
+             this.xdisplay.flush ();
+-- 
+GitLab
+
diff --git a/srcpkgs/caribou/patches/fix-vala.patch b/srcpkgs/caribou/patches/fix-vala.patch
new file mode 100644
index 000000000000..9fae15bc231f
--- /dev/null
+++ b/srcpkgs/caribou/patches/fix-vala.patch
@@ -0,0 +1,16 @@
+Patch from
+https://github.com/archlinux/svntogit-packages/blob/bf8285526628664f46c1b790238c6e3555e51499/trunk/unicode_to_keyval-symbol-check.patch
+
+diff --git a/libcaribou/key-model.vala b/libcaribou/key-model.vala
+index 89015bc..e88342e 100644
+--- a/libcaribou/key-model.vala
++++ b/libcaribou/key-model.vala
+@@ -101,7 +101,7 @@ namespace Caribou {
+                     unichar uc;
+                     while (text.get_next_char (ref index, out uc)) {
+                         uint keyval = Gdk.unicode_to_keyval (uc);
+-                        if (keyval != uc | 0x01000000)
++                        if (keyval != (uc | 0x01000000))
+                             _keyvals += keyval;
+                     }
+                 } else {
diff --git a/srcpkgs/caribou/template b/srcpkgs/caribou/template
index 6ac08ee5e22b..bf135b75f8b0 100644
--- a/srcpkgs/caribou/template
+++ b/srcpkgs/caribou/template
@@ -1,12 +1,12 @@
 # Template file for 'caribou'
 pkgname=caribou
 version=0.4.21
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-static --disable-gtk2-module
  PYTHON=/usr/bin/python3"
-hostmakedepends="pkg-config intltool python3-gobject-devel libxslt"
+hostmakedepends="pkg-config intltool python3-gobject-devel libxslt vala"
 makedepends="vala-devel libxklavier-devel libgee08-devel python3-gobject-devel
  clutter-devel gtk+3-devel libXtst-devel gir-freedesktop"
 depends="python3-gobject python3-atspi python3-dbus gir-freedesktop at-spi2-atk

From fd5aeae95d637b0c9984192c4b63006f5aa1d8c2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 23:21:31 +0200
Subject: [PATCH 0058/3482] kblocks: update to 20.12.1.

---
 srcpkgs/kblocks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kblocks/template b/srcpkgs/kblocks/template
index dfccb77171af..66f93edd49f7 100644
--- a/srcpkgs/kblocks/template
+++ b/srcpkgs/kblocks/template
@@ -1,6 +1,6 @@
 # Template file for 'kblocks'
 pkgname=kblocks
-version=20.08.1
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -13,4 +13,4 @@ maintainer="toluschr <toluschr@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kblocks"
 distfiles="${KDE_SITE}/release-service/${version}/src/kblocks-${version}.tar.xz"
-checksum=e2b6e5b0727ca45d6b0f0e8b9f0aa029a0acb9bdebeac5bfd849455e560977ed
+checksum=9a601c46ffcf2b90f6fb45fcbb8accd6b6b006a3263c9b52468099261eee2d09

From b7999b20815473b5eb1520e0e9365ae78d997f13 Mon Sep 17 00:00:00 2001
From: Alex <60660439+AlexDltg@users.noreply.github.com>
Date: Tue, 12 Jan 2021 11:55:26 +0100
Subject: [PATCH 0059/3482] pycharm-community: update to 2020.3.2

---
 srcpkgs/pycharm-community/files/pycharm.desktop |  5 +++--
 srcpkgs/pycharm-community/template              | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pycharm-community/files/pycharm.desktop b/srcpkgs/pycharm-community/files/pycharm.desktop
index d86ec782f8e0..aa51d673e772 100644
--- a/srcpkgs/pycharm-community/files/pycharm.desktop
+++ b/srcpkgs/pycharm-community/files/pycharm.desktop
@@ -1,7 +1,8 @@
 [Desktop Entry]
-Name=PyCharm
+Name=PyCharm Community
+Comment=The Python IDE for Professional Developers
 Exec=pycharm %f
 Terminal=false
 Type=Application
-Icon=/usr/lib/pycharm/bin/pycharm.png
+Icon=pycharm
 Categories=Development;
diff --git a/srcpkgs/pycharm-community/template b/srcpkgs/pycharm-community/template
index 6b1494d60a40..77f5a358d8a4 100644
--- a/srcpkgs/pycharm-community/template
+++ b/srcpkgs/pycharm-community/template
@@ -1,15 +1,15 @@
 # Template file for 'pycharm-community'
 pkgname=pycharm-community
-version=2020.2.3
+version=2020.3.2
 revision=1
 archs="x86_64"
-depends="virtual?java-environment giflib libXtst"
+depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
 short_desc="Python integrated development environment"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/pycharm/"
 distfiles="https://download-cf.jetbrains.com/python/${pkgname}-${version}.tar.gz"
-checksum=870071ba911d41052e3b94ad97116940b79b411b4ad0aaccebb83b319e621073
+checksum=33e19dfaa434f637506b6fa35dcf94c908f9b471aadc9f616eae0c0395327cfc
 repository=nonfree
 nopie=yes
 python_version=3
@@ -18,7 +18,11 @@ do_install() {
 	vmkdir usr/bin
 	vmkdir usr/share/doc/pycharm
 	vmkdir usr/lib/pycharm
+	vmkdir usr/share/pixmaps
+	vmkdir usr/share/icons/hicolor/scalable/apps
 
+	local launcher_path="bin/pycharm.sh"
+	sed -i '1 s/$/\nPYCHARM_JDK=${PYCHARM_JDK:-${IDEA_JDK}}/' "${launcher_path}"
 	mv -v bin lib plugins ${DESTDIR}/usr/lib/pycharm
 	mv -v license ${DESTDIR}/usr/share/doc/pycharm
 	rm -vf ${DESTDIR}/usr/lib/pycharm/bin/fsnotifier-arm
@@ -31,7 +35,11 @@ do_install() {
 	rm -vf ${DESTDIR}/usr/lib/pycharm/plugins/python-ce/helpers/pydev/third_party/wrapped_for_pydev/ctypes/_ctypes.dll
 
 	rm -vf ${DESTDIR}/usr/lib/pycharm/lib/pty4j-native/linux/ppc64le/libpty.so
+	rm -vf ${DESTDIR}/usr/lib/pycharm/lib/pty4j-native/linux/mips64el/libpty.so
+	rm -vf ${DESTDIR}/usr/lib/pycharm/lib/pty4j-native/linux/aarch64/libpty.so
 	rmdir -v ${DESTDIR}/usr/lib/pycharm/lib/pty4j-native/linux/ppc64le
+	rmdir -v ${DESTDIR}/usr/lib/pycharm/lib/pty4j-native/linux/mips64el
+	rmdir -v ${DESTDIR}/usr/lib/pycharm/lib/pty4j-native/linux/aarch64
 
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		rm -vf ${DESTDIR}/usr/lib/pycharm/bin/fsnotifier
@@ -46,5 +54,7 @@ do_install() {
 	fi
 
 	ln -sf /usr/lib/pycharm/bin/pycharm.sh ${DESTDIR}/usr/bin/pycharm
+	ln -sf /usr/lib/pycharm/bin/pycharm.png ${DESTDIR}/usr/share/pixmaps
+	ln -sf /usr/lib/pycharm/bin/pycharm.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps
 	vinstall ${FILESDIR}/pycharm.desktop 644 usr/share/applications
 }

From c16497fb406584e642b595a66b86bd505c69652e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 18 Jan 2021 21:25:55 +0100
Subject: [PATCH 0060/3482] Aegisub: fix build w/ ffms2-2.40; reduce warnings

---
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  | 87 +++++++++++++++++++
 .../Aegisub/patches/fix-no-narrowing.patch    | 12 +++
 srcpkgs/Aegisub/template                      |  2 +-
 3 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 create mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch

diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
new file mode 100644
index 000000000000..bec020031307
--- /dev/null
+++ b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
@@ -0,0 +1,87 @@
+Source: @pullmoll
+Upstream: no
+Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
+
+--- src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
++++ src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
+@@ -98,7 +98,6 @@
+ 			ps->SetProgress(Current, Total);
+ 			return ps->IsCancelled();
+ 		};
+-		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
+-			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
++		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
+ 	});
+ 
+--- src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
++++ src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
+@@ -42,6 +42,7 @@
+ 
+ #include <libaegisub/fs.h>
+ #include <libaegisub/make_unique.h>
++#include <libavutil/pixfmt.h>
+ 
+ namespace {
+ /// @class FFmpegSourceVideoProvider
+@@ -78,7 +79,7 @@
+ 		if (matrix == RealColorSpace)
+ 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
+ 		else if (matrix == "TV.601")
+-			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
++			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
+ 		else
+ 			return;
+ 		ColorSpace = matrix;
+@@ -103,16 +104,16 @@
+ 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
+ 
+ 	switch (cs) {
+-		case FFMS_CS_RGB:
++		case AVCOL_SPC_RGB:
+ 			return "None";
+-		case FFMS_CS_BT709:
++		case AVCOL_SPC_BT709:
+ 			return str + ".709";
+-		case FFMS_CS_FCC:
++		case AVCOL_SPC_FCC:
+ 			return str + ".FCC";
+-		case FFMS_CS_BT470BG:
+-		case FFMS_CS_SMPTE170M:
++		case AVCOL_SPC_BT470BG:
++		case AVCOL_SPC_SMPTE170M:
+ 			return str + ".601";
+-		case FFMS_CS_SMPTE240M:
++		case AVCOL_SPC_SMPTE240M:
+ 			return str + ".240M";
+ 		default:
+ 			throw VideoOpenError("Unknown video color space");
+@@ -208,8 +209,6 @@
+ 
+ 	// set thread count
+ 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
+-	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
+-		Threads = 1;
+ 
+ 	// set seekmode
+ 	// TODO: give this its own option?
+@@ -240,15 +239,15 @@
+ 	CS = TempFrame->ColorSpace;
+ 	CR = TempFrame->ColorRange;
+ 
+-	if (CS == FFMS_CS_UNSPECIFIED)
+-		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
++	if (CS == AVCOL_SPC_UNSPECIFIED)
++		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
+ 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
+ 
+ #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
+-	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
+-		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
++	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
++		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
+ 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
+-		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
++		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
+ 	}
+ #endif
+ 
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
new file mode 100644
index 000000000000..ecccc927abec
--- /dev/null
+++ b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
@@ -0,0 +1,12 @@
+--- configure.ac	2021-01-18 20:39:16.546501531 +0100
++++ configure.ac	2021-01-18 20:57:43.667587518 +0100
+@@ -142,7 +142,8 @@
+   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
+   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
+   AC_CXX_FLAG([-std=c++11])
+-  AC_CXX_FLAG([-Wno-c++11-narrowing])
++  AC_CXX_FLAG([-Wno-narrowing])
++  AC_CXX_FLAG([-Wno-deprecated-copy])
+   AC_C_FLAG([-Wno-unused-local-typedefs])
+   AC_CXX_FLAG([-Wno-unused-local-typedefs])
+ 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index cc8107525638..9f38b0e37c0f 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)

From 0e0750c92b5ef76f9dab6dcc5909e194ee7684eb Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 7 Jan 2021 00:36:39 +0200
Subject: [PATCH 0061/3482] rssguard: update to 3.8.4.

---
 srcpkgs/rssguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index 0595883e72f9..2b4b7ed36f83 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,6 +1,6 @@
 # Template file for 'rssguard'
 pkgname=rssguard
-version=3.8.3
+version=3.8.4
 revision=1
 build_style=qmake
 configure_args="CONFIG+=release LRELEASE_EXECUTABLE=lrelease-qt5 USE_WEBENGINE=false"
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/martinrotter/rssguard"
 distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz"
-checksum=27ad2eff79e111fa916bb5bd896393d88caf14b7c1920ce8bfc6f0801c10adc7
+checksum=4acfcb482c5f1f065b4e299ab4500c69146ddd398536ccb0799912290805b262
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel kdeclarative-devel"

From c610faede5b367ee2b9ab887d8f3eda761da5e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 18 Jan 2021 21:47:38 +0100
Subject: [PATCH 0062/3482] Aegisub: cross is broken

---
 srcpkgs/Aegisub/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 9f38b0e37c0f..580dde47a0df 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -32,9 +32,15 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	configure_args+=" --with-libatomic"
 fi
 
+if [ "$CROSS_BUILD" ]; then
+	# When cross building the detection of iconv const parameters is wrong
+	configure_args+=" agi_cv_with_iconv_const=no"
+	# and cross is broken because of boost::icu_regex_trais anyway ...
+	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	*musl) broken="segfaults on startup";;
-	armv7l*|armv6l*) broken="error: invalid conversion from 'const char**' to 'char**' [-fpermissive]"
 esac
 
 post_extract() {

From 7267f169ec05e3746025014e576bcbf8729993fb Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 12 Jan 2021 06:52:49 +0100
Subject: [PATCH 0063/3482] perl-Role-Tiny: update to 2.002003

---
 srcpkgs/perl-Role-Tiny/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Role-Tiny/template b/srcpkgs/perl-Role-Tiny/template
index 95e9691edfe8..f0754d4ab5b2 100644
--- a/srcpkgs/perl-Role-Tiny/template
+++ b/srcpkgs/perl-Role-Tiny/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Role-Tiny'
 pkgname=perl-Role-Tiny
-version=2.001004
-revision=2
+version=2.002003
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Role-Tiny"
 distfiles="${CPAN_SITE}/lib/HAARG/Role-Tiny-${version}.tar.gz"
-checksum=92ba5712850a74102c93c942eb6e7f62f7a4f8f483734ed289d08b324c281687
+checksum=6981e5f2d0beded157840199d678da462b22a9a3753333cab322ab6efb0fbb89

From ff0018bcc143d444d555a0294bc8c36cc493df7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20M=C3=BChlinghaus?= <jazzman@alphabreed.com>
Date: Mon, 18 Jan 2021 20:31:50 +0100
Subject: [PATCH 0064/3482] spotify: updated licence checksum

---
 srcpkgs/spotify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index bd35e859c295..d73147bf6b0f 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,7 +1,7 @@
 # Template file for 'spotify'
 pkgname=spotify
 version=1.1.42
-revision=2
+revision=3
 _ver="${version}.622.gbd112320-37_amd64"
 _filename="spotify-client_${_ver}.deb"
 archs="x86_64"
@@ -15,7 +15,7 @@ license="custom:Proprietary"
 homepage="https://www.spotify.com"
 distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/${_filename}"
 checksum=101a3699197659b8bc60a4fd8b579e63cc494e7abd089c45306559329af4a868
-_license_checksum=4a66993926096dd60fb03d7d82bd806f2f4b2d6ab2970aa0462e669f51f076a0
+_license_checksum=3c073aa5bd7ffaba3df5283cdd2d3b36a415bd824234693844548fc3e16027a5
 repository=nonfree
 restricted=yes
 nostrip=yes

From ef1e7df4b39788e1691463bca4ce2a897c54cab5 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 4 Jan 2021 20:42:38 +1100
Subject: [PATCH 0065/3482] foomatic-db: update to 20210104.

---
 srcpkgs/foomatic-db/template | 25 +++++++++++++------------
 srcpkgs/foomatic-db/update   |  4 +++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/foomatic-db/template b/srcpkgs/foomatic-db/template
index 58d267a42d69..0a4862431788 100644
--- a/srcpkgs/foomatic-db/template
+++ b/srcpkgs/foomatic-db/template
@@ -1,23 +1,24 @@
 # Template file for 'foomatic-db'
-# Note: update the version=<date> regularly like once/month.
+# Update when there is a new commit at https://github.com/OpenPrinting/foomatic-db.
 pkgname=foomatic-db
-version=20201129
+version=20210104
 revision=1
-create_wrksrc=yes
+_commit=28466ef2f9f931f49816ed70c499001d1783f5cb
+wrksrc="${pkgname}-${_commit}"
 build_style=gnu-configure
-hostmakedepends="xmlstarlet tar"
+hostmakedepends="xmlstarlet tar automake"
 short_desc="OpenPrinting printer support - database"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MIT"
 homepage="https://wiki.linuxfoundation.org/openprinting/database/foomatic"
+distfiles="https://github.com/OpenPrinting/foomatic-db/archive/${_commit}.tar.gz"
+checksum=eb412f7967300ae49bd22a886ecd478767828eff5da4d1e875c3409898265866
 
-do_fetch() {
-	$XBPS_FETCH_CMD https://www.openprinting.org/download/foomatic/${pkgname}-4.0-current.tar.gz
-}
-
-do_extract() {
-	bsdtar -xf ${XBPS_BUILDDIR}/${pkgname}-4.0-current.tar.gz \
-		--strip-components=1 -C ${wrksrc}
+pre_configure() {
+	# Taken from make_configure
+	aclocal
+	autoconf
+	sed -i "s=\#include \<xmlversion.h\>=\#include \<libxml/xmlversion.h\>=g" configure
 }
 
 post_install() {
@@ -28,4 +29,4 @@ post_install() {
 			vlicense "LICENSE-$(basename $i .xml).txt"
 		fi
 	done
- }
+}
diff --git a/srcpkgs/foomatic-db/update b/srcpkgs/foomatic-db/update
index 632ae769a2d5..187d2fc18407 100644
--- a/srcpkgs/foomatic-db/update
+++ b/srcpkgs/foomatic-db/update
@@ -1 +1,3 @@
-pattern=$pkgname'-[\d.]+-\K[\d]+'
+site="https://github.com/OpenPrinting/foomatic-db"
+version="${version:0:4}.${version:4:2}.${version:6:2}"
+pattern="relative-time datetime=\"\K\d{4}-\d{2}-\d{2}"

From 079afcc5bf9d0cc8245e0a02f3b0021a08b0309b Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 4 Jan 2021 20:42:51 +1100
Subject: [PATCH 0066/3482] foomatic-db-nonfree: update to 20210104.

---
 srcpkgs/foomatic-db-nonfree/template | 23 ++++++++++++-----------
 srcpkgs/foomatic-db-nonfree/update   |  3 +++
 2 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/foomatic-db-nonfree/update

diff --git a/srcpkgs/foomatic-db-nonfree/template b/srcpkgs/foomatic-db-nonfree/template
index d6773c5443b0..bc4ef4c5a0fb 100644
--- a/srcpkgs/foomatic-db-nonfree/template
+++ b/srcpkgs/foomatic-db-nonfree/template
@@ -1,24 +1,25 @@
 # Template file for 'foomatic-db-nonfree'
-# Note: update the version=<date> regularly like once/month.
+# Update when there is a new commit at https://github.com/OpenPrinting/foomatic-db-nonfree.
 pkgname=foomatic-db-nonfree
-version=20201129
+version=20210104
 revision=1
-create_wrksrc=yes
+_commit=6ddae02ac89240c019f8b5026cfe70e30fd2b3db
+wrksrc="${pkgname}-${_commit}"
 build_style=gnu-configure
-hostmakedepends="tar xmlstarlet"
+hostmakedepends="tar xmlstarlet automake"
 short_desc="OpenPrinting printer support - nonfree database"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="custom:Various Nonfree"
 homepage="https://wiki.linuxfoundation.org/openprinting/database/foomatic"
+distfiles="https://github.com/OpenPrinting/foomatic-db-nonfree/archive/${_commit}.tar.gz"
+checksum=958c1067a24c37cb753ee2b4aeb9e8325629f4363ce9e108f1f6d0f828e5b7c5
 repository="nonfree"
 
-do_fetch() {
-	$XBPS_FETCH_CMD https://www.openprinting.org/download/foomatic/${pkgname}-current.tar.gz
-}
-
-do_extract() {
-	bsdtar -xf ${XBPS_BUILDDIR}/${pkgname}-current.tar.gz \
-		--strip-components=1 -C ${wrksrc}
+pre_configure() {
+	# From make_configure
+	aclocal
+	autoconf
+	sed -i "s=\#include \<xmlversion.h\>=\#include \<libxml/xmlversion.h\>=g" configure
 }
 
 post_install() {
diff --git a/srcpkgs/foomatic-db-nonfree/update b/srcpkgs/foomatic-db-nonfree/update
new file mode 100644
index 000000000000..751988f2c000
--- /dev/null
+++ b/srcpkgs/foomatic-db-nonfree/update
@@ -0,0 +1,3 @@
+site="https://github.com/OpenPrinting/foomatic-db-nonfree"
+version="${version:0:4}.${version:4:2}.${version:6:2}"
+pattern="relative-time datetime=\"\K\d{4}-\d{2}-\d{2}"

From 769fa0b6c8b328a19545fcfc5384c8e23f59a192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 18 Jan 2021 22:42:22 +0100
Subject: [PATCH 0067/3482] lwipv6: fix build w/ kernel headers 5.10.4

---
 srcpkgs/lwipv6/patches/linux-headers-5.10.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/lwipv6/patches/linux-headers-5.10.patch

diff --git a/srcpkgs/lwipv6/patches/linux-headers-5.10.patch b/srcpkgs/lwipv6/patches/linux-headers-5.10.patch
new file mode 100644
index 000000000000..93213d101264
--- /dev/null
+++ b/srcpkgs/lwipv6/patches/linux-headers-5.10.patch
@@ -0,0 +1,10 @@
+--- lwip-v6/src/include/lwip/sockets.h
++++ lwip-v6/src/include/lwip/sockets.h
+@@ -58,6 +58,7 @@
+ #include <netinet/in.h>
+ #include <sys/ioctl.h>
+ #include <net/if_arp.h>
++#include <linux/sockios.h>
+ 
+ #include "lwip/ip_addr.h"
+ #if 0

From 6dbab21fdba29da1f523ba1bfdbbdb75e8eaa98c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 18 Jan 2021 23:20:52 +0100
Subject: [PATCH 0068/3482] chromium: boop

rebuild with time64 syscalls allowed in seccomp, so that i686
can work after glibc 2.32 update is done - rebuild ahead of time
so we have less to do later
---
 srcpkgs/chromium/patches/time64.patch | 51 +++++++++++++++++++++++++++
 srcpkgs/chromium/template             |  2 +-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/chromium/patches/time64.patch

diff --git a/srcpkgs/chromium/patches/time64.patch b/srcpkgs/chromium/patches/time64.patch
new file mode 100644
index 000000000000..b1ad93590033
--- /dev/null
+++ b/srcpkgs/chromium/patches/time64.patch
@@ -0,0 +1,51 @@
+Description: allow sandboxed code to call gettime64
+ Add __NR_clock_gettime64 and __NR_clock_nanosleep_time64 to syscall whitelist
+ and clock selection parameter filtering code.
+
+ Add __NR_utimensat_time64 to syscall whitelist
+
+ Conditionalise additions on the new calls existing, because they do not exist
+ on 64-bit architectures.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+===================================================================
+--- sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -148,7 +148,11 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return Allow();
+ #endif
+ 
++#ifdef __NR_clock_gettime64
++  if (sysno == __NR_clock_gettime || sysno == __NR_clock_gettime64 || sysno == __NR_clock_nanosleep || sysno == __NR_clock_nanosleep_time64) {
++#else
+   if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) {
++#endif
+     return RestrictClockID();
+   }
+ 
+Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+===================================================================
+--- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -38,6 +38,10 @@ bool SyscallSets::IsAllowedGettime(int s
+     case __NR_clock_getres:     // Allowed only on Android with parameters
+                                 // filtered by RestrictClokID().
+     case __NR_clock_gettime:    // Parameters filtered by RestrictClockID().
++#ifdef __NR_clock_gettime64
++    case __NR_clock_gettime64:    // Parameters filtered by RestrictClockID().
++    case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
++#endif
+     case __NR_clock_nanosleep:  // Parameters filtered by RestrictClockID().
+     case __NR_clock_settime:    // Privileged.
+ #if defined(__i386__) || \
+@@ -159,6 +163,9 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
++#ifdef __NR_utimensat_time64
++    case __NR_utimensat_time64:
++#endif
+       return true;
+     default:
+       return false;
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 5e4d8129e5da..6a8ec3827dd9 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -2,7 +2,7 @@
 pkgname=chromium
 # See http://www.chromium.org/developers/calendar for the latest version
 version=87.0.4280.141
-revision=1
+revision=2
 archs="i686* x86_64* aarch64* armv7l* ppc64le*"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 9b7f5593d7849ce9e2d2b7bb7d2959e4d2842c85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 19 Jan 2021 01:03:58 +0100
Subject: [PATCH 0069/3482] imagescan: fix build

---
 srcpkgs/imagescan/patches/fix-iostream.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/imagescan/patches/fix-iostream.patch

diff --git a/srcpkgs/imagescan/patches/fix-iostream.patch b/srcpkgs/imagescan/patches/fix-iostream.patch
new file mode 100644
index 000000000000..b05f5f70bd63
--- /dev/null
+++ b/srcpkgs/imagescan/patches/fix-iostream.patch
@@ -0,0 +1,20 @@
+--- utsushi/string.hpp	2019-04-02 02:01:37.000000000 +0200
++++ utsushi/string.hpp	2021-01-19 00:58:03.102000070 +0100
+@@ -23,6 +23,7 @@
+ 
+ #include <iosfwd>
++#include <iostream>
+ #include <string>
+ 
+ #include <boost/operators.hpp>
+ 
+--- utsushi/toggle.hpp	2019-04-02 02:01:36.000000000 +0200
++++ utsushi/toggle.hpp	2021-01-19 01:00:34.884821885 +0100
+@@ -22,6 +22,7 @@
+ #define utsushi_toggle_hpp_
+ 
+ #include <iosfwd>
++#include <iostream>
+ #include <boost/operators.hpp>
+ 
+ namespace utsushi {

From c1fa4b434d2cd22351ef77aac7dfce9f2994e042 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Mon, 11 Jan 2021 17:40:16 -0600
Subject: [PATCH 0070/3482] linux5.10: enable SATA link power management

---
 srcpkgs/linux5.10/files/i386-dotconfig    | 2 +-
 srcpkgs/linux5.10/files/ppc64-dotconfig   | 2 +-
 srcpkgs/linux5.10/files/ppc64le-dotconfig | 2 +-
 srcpkgs/linux5.10/files/x86_64-dotconfig  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index b04c4328e372..abe232b5ccad 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -2523,7 +2523,7 @@ CONFIG_SATA_PMP=y
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_MOBILE_LPM_POLICY=3
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_ACARD_AHCI=m
diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig
index 3aa41f8121a0..0a5ee22c5398 100644
--- a/srcpkgs/linux5.10/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64-dotconfig
@@ -2529,7 +2529,7 @@ CONFIG_SATA_PMP=y
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_MOBILE_LPM_POLICY=3
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_QORIQ=m
diff --git a/srcpkgs/linux5.10/files/ppc64le-dotconfig b/srcpkgs/linux5.10/files/ppc64le-dotconfig
index 7514a38b0cbc..1397fe1b7763 100644
--- a/srcpkgs/linux5.10/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64le-dotconfig
@@ -2424,7 +2424,7 @@ CONFIG_SATA_PMP=y
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_MOBILE_LPM_POLICY=3
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_QORIQ=m
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index eaa3378c6415..cb83e9152281 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -2585,7 +2585,7 @@ CONFIG_SATA_PMP=y
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_MOBILE_LPM_POLICY=3
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_ACARD_AHCI=m

From efff4abe82da3145100ba4f2983217c49ac18099 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Mon, 11 Jan 2021 17:40:17 -0600
Subject: [PATCH 0071/3482] linux5.4: enable SATA Link power management

---
 srcpkgs/linux5.4/files/i386-dotconfig    | 2 +-
 srcpkgs/linux5.4/files/ppc64-dotconfig   | 2 +-
 srcpkgs/linux5.4/files/ppc64le-dotconfig | 2 +-
 srcpkgs/linux5.4/files/x86_64-dotconfig  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.4/files/i386-dotconfig b/srcpkgs/linux5.4/files/i386-dotconfig
index 9a9eb45517ad..f27f8a8177f9 100644
--- a/srcpkgs/linux5.4/files/i386-dotconfig
+++ b/srcpkgs/linux5.4/files/i386-dotconfig
@@ -2463,7 +2463,7 @@ CONFIG_SATA_PMP=y
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_MOBILE_LPM_POLICY=3
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_ACARD_AHCI=m
diff --git a/srcpkgs/linux5.4/files/ppc64-dotconfig b/srcpkgs/linux5.4/files/ppc64-dotconfig
index b70e72966ccd..1da6642caee8 100644
--- a/srcpkgs/linux5.4/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc64-dotconfig
@@ -2468,7 +2468,7 @@ CONFIG_SATA_PMP=y
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_MOBILE_LPM_POLICY=3
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_QORIQ=m
diff --git a/srcpkgs/linux5.4/files/ppc64le-dotconfig b/srcpkgs/linux5.4/files/ppc64le-dotconfig
index 0e52fd5c5b1c..97d31795f388 100644
--- a/srcpkgs/linux5.4/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc64le-dotconfig
@@ -2366,7 +2366,7 @@ CONFIG_SATA_PMP=y
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_MOBILE_LPM_POLICY=3
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_QORIQ=m
diff --git a/srcpkgs/linux5.4/files/x86_64-dotconfig b/srcpkgs/linux5.4/files/x86_64-dotconfig
index a7a13f3f5714..388d37462b44 100644
--- a/srcpkgs/linux5.4/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.4/files/x86_64-dotconfig
@@ -2524,7 +2524,7 @@ CONFIG_SATA_PMP=y
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_MOBILE_LPM_POLICY=3
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_ACARD_AHCI=m

From 628abe5541650e7948da26f08d5f72f65f155e6c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Mon, 11 Jan 2021 17:40:17 -0600
Subject: [PATCH 0072/3482] linux4.19: enable SATA Link power management

---
 srcpkgs/linux4.19/files/i386-dotconfig    | 2 +-
 srcpkgs/linux4.19/files/ppc64-dotconfig   | 2 +-
 srcpkgs/linux4.19/files/ppc64le-dotconfig | 2 +-
 srcpkgs/linux4.19/files/x86_64-dotconfig  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux4.19/files/i386-dotconfig b/srcpkgs/linux4.19/files/i386-dotconfig
index a2d2aeda971f..cf8aedad932a 100644
--- a/srcpkgs/linux4.19/files/i386-dotconfig
+++ b/srcpkgs/linux4.19/files/i386-dotconfig
@@ -2302,7 +2302,7 @@ CONFIG_SATA_PMP=y
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_MOBILE_LPM_POLICY=3
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_ACARD_AHCI=m
diff --git a/srcpkgs/linux4.19/files/ppc64-dotconfig b/srcpkgs/linux4.19/files/ppc64-dotconfig
index 9f0935511005..e127c7a2fe02 100644
--- a/srcpkgs/linux4.19/files/ppc64-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc64-dotconfig
@@ -2317,7 +2317,7 @@ CONFIG_SATA_PMP=y
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_MOBILE_LPM_POLICY=3
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_QORIQ=m
diff --git a/srcpkgs/linux4.19/files/ppc64le-dotconfig b/srcpkgs/linux4.19/files/ppc64le-dotconfig
index 07cd1962d4a4..684e0980c4a2 100644
--- a/srcpkgs/linux4.19/files/ppc64le-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc64le-dotconfig
@@ -2223,7 +2223,7 @@ CONFIG_SATA_PMP=y
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_MOBILE_LPM_POLICY=3
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_QORIQ=m
diff --git a/srcpkgs/linux4.19/files/x86_64-dotconfig b/srcpkgs/linux4.19/files/x86_64-dotconfig
index fc9b08cceb38..3705b028eb58 100644
--- a/srcpkgs/linux4.19/files/x86_64-dotconfig
+++ b/srcpkgs/linux4.19/files/x86_64-dotconfig
@@ -2359,7 +2359,7 @@ CONFIG_SATA_PMP=y
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_MOBILE_LPM_POLICY=3
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_ACARD_AHCI=m

From 196a3bba255bd37f47cb736548ea25b65f4954cb Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 14 Jan 2021 20:35:12 -0600
Subject: [PATCH 0073/3482] linux5.10: enable ASPM for PCIe

---
 srcpkgs/linux5.10/files/i386-dotconfig   | 4 ++--
 srcpkgs/linux5.10/files/x86_64-dotconfig | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index abe232b5ccad..996cf947ea4a 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -1928,10 +1928,10 @@ CONFIG_PCIEAER=y
 CONFIG_PCIEAER_INJECT=m
 # CONFIG_PCIE_ECRC is not set
 CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEFAULT is not set
+CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-CONFIG_PCIEASPM_PERFORMANCE=y
+# CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index cb83e9152281..bbd136a1b1e3 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -1985,10 +1985,10 @@ CONFIG_PCIEAER=y
 CONFIG_PCIEAER_INJECT=m
 # CONFIG_PCIE_ECRC is not set
 CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEFAULT is not set
+CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-CONFIG_PCIEASPM_PERFORMANCE=y
+# CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set

From 03f786c8786e13985ddbd36896a2ed11776d184b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 14 Jan 2021 20:35:20 -0600
Subject: [PATCH 0074/3482] linux4.9: enable ASPM for PCIe

---
 srcpkgs/linux4.9/files/i386-dotconfig   | 4 ++--
 srcpkgs/linux4.9/files/x86_64-dotconfig | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux4.9/files/i386-dotconfig b/srcpkgs/linux4.9/files/i386-dotconfig
index ba7448d2e767..d04e07d1afe7 100644
--- a/srcpkgs/linux4.9/files/i386-dotconfig
+++ b/srcpkgs/linux4.9/files/i386-dotconfig
@@ -746,9 +746,9 @@ CONFIG_PCIEAER=y
 CONFIG_PCIEAER_INJECT=m
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
-# CONFIG_PCIEASPM_DEFAULT is not set
+CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
-CONFIG_PCIEASPM_PERFORMANCE=y
+# CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set
diff --git a/srcpkgs/linux4.9/files/x86_64-dotconfig b/srcpkgs/linux4.9/files/x86_64-dotconfig
index f82bfbac3cc9..3ac7fb403d7d 100644
--- a/srcpkgs/linux4.9/files/x86_64-dotconfig
+++ b/srcpkgs/linux4.9/files/x86_64-dotconfig
@@ -762,9 +762,9 @@ CONFIG_PCIEAER=y
 CONFIG_PCIEAER_INJECT=m
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
-# CONFIG_PCIEASPM_DEFAULT is not set
+CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
-CONFIG_PCIEASPM_PERFORMANCE=y
+# CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set

From cec079e14aaadcd4a916623697aee0f8118d92a9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 14 Jan 2021 20:35:29 -0600
Subject: [PATCH 0075/3482] linux4.14: enable ASPM for PCIe

---
 srcpkgs/linux4.14/files/i386-dotconfig   | 4 ++--
 srcpkgs/linux4.14/files/x86_64-dotconfig | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux4.14/files/i386-dotconfig b/srcpkgs/linux4.14/files/i386-dotconfig
index 7e8b77072726..9fcc0839e9da 100644
--- a/srcpkgs/linux4.14/files/i386-dotconfig
+++ b/srcpkgs/linux4.14/files/i386-dotconfig
@@ -794,10 +794,10 @@ CONFIG_PCIEAER=y
 CONFIG_PCIEAER_INJECT=m
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
-# CONFIG_PCIEASPM_DEFAULT is not set
+CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-CONFIG_PCIEASPM_PERFORMANCE=y
+# CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set
diff --git a/srcpkgs/linux4.14/files/x86_64-dotconfig b/srcpkgs/linux4.14/files/x86_64-dotconfig
index f2198cadf0ce..d0a943589a64 100644
--- a/srcpkgs/linux4.14/files/x86_64-dotconfig
+++ b/srcpkgs/linux4.14/files/x86_64-dotconfig
@@ -821,10 +821,10 @@ CONFIG_PCIEAER=y
 CONFIG_PCIEAER_INJECT=m
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
-# CONFIG_PCIEASPM_DEFAULT is not set
+CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-CONFIG_PCIEASPM_PERFORMANCE=y
+# CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set

From 5bf180b6c18ba53d0d1b451c319dd16a6ca38393 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 14 Jan 2021 20:35:50 -0600
Subject: [PATCH 0076/3482] linux5.4: enable ASPM for PCIe

---
 srcpkgs/linux5.4/files/i386-dotconfig   | 4 ++--
 srcpkgs/linux5.4/files/x86_64-dotconfig | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.4/files/i386-dotconfig b/srcpkgs/linux5.4/files/i386-dotconfig
index f27f8a8177f9..51445aa49688 100644
--- a/srcpkgs/linux5.4/files/i386-dotconfig
+++ b/srcpkgs/linux5.4/files/i386-dotconfig
@@ -1862,10 +1862,10 @@ CONFIG_PCIEAER_INJECT=m
 # CONFIG_PCIE_ECRC is not set
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
-# CONFIG_PCIEASPM_DEFAULT is not set
+CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-CONFIG_PCIEASPM_PERFORMANCE=y
+# CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set
diff --git a/srcpkgs/linux5.4/files/x86_64-dotconfig b/srcpkgs/linux5.4/files/x86_64-dotconfig
index 388d37462b44..5b30546a8d62 100644
--- a/srcpkgs/linux5.4/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.4/files/x86_64-dotconfig
@@ -1913,10 +1913,10 @@ CONFIG_PCIEAER_INJECT=m
 # CONFIG_PCIE_ECRC is not set
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
-# CONFIG_PCIEASPM_DEFAULT is not set
+CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-CONFIG_PCIEASPM_PERFORMANCE=y
+# CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set

From d3367e6f66fee4c9e3640990b0e3b1cb1a1f745c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 14 Jan 2021 20:35:57 -0600
Subject: [PATCH 0077/3482] linux4.4: enable ASPM for PCIe

---
 srcpkgs/linux4.4/files/i386-dotconfig   | 4 ++--
 srcpkgs/linux4.4/files/x86_64-dotconfig | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux4.4/files/i386-dotconfig b/srcpkgs/linux4.4/files/i386-dotconfig
index ee1aa07f4914..e76c4d02c59a 100644
--- a/srcpkgs/linux4.4/files/i386-dotconfig
+++ b/srcpkgs/linux4.4/files/i386-dotconfig
@@ -695,9 +695,9 @@ CONFIG_PCIEAER=y
 CONFIG_PCIEAER_INJECT=m
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
-# CONFIG_PCIEASPM_DEFAULT is not set
+CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
-CONFIG_PCIEASPM_PERFORMANCE=y
+# CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
diff --git a/srcpkgs/linux4.4/files/x86_64-dotconfig b/srcpkgs/linux4.4/files/x86_64-dotconfig
index 894788a3f974..3c64f6463b28 100644
--- a/srcpkgs/linux4.4/files/x86_64-dotconfig
+++ b/srcpkgs/linux4.4/files/x86_64-dotconfig
@@ -709,9 +709,9 @@ CONFIG_PCIEAER=y
 CONFIG_PCIEAER_INJECT=m
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
-# CONFIG_PCIEASPM_DEFAULT is not set
+CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
-CONFIG_PCIEASPM_PERFORMANCE=y
+# CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y

From cee91f6180faefc81afab620ac29c92cc9fe7f85 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 14 Jan 2021 20:36:06 -0600
Subject: [PATCH 0078/3482] linux4.19: enable ASPM for PCIe

---
 srcpkgs/linux4.19/files/i386-dotconfig   | 4 ++--
 srcpkgs/linux4.19/files/x86_64-dotconfig | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux4.19/files/i386-dotconfig b/srcpkgs/linux4.19/files/i386-dotconfig
index cf8aedad932a..728539f4419d 100644
--- a/srcpkgs/linux4.19/files/i386-dotconfig
+++ b/srcpkgs/linux4.19/files/i386-dotconfig
@@ -579,10 +579,10 @@ CONFIG_PCIEAER_INJECT=m
 # CONFIG_PCIE_ECRC is not set
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
-# CONFIG_PCIEASPM_DEFAULT is not set
+CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-CONFIG_PCIEASPM_PERFORMANCE=y
+# CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set
diff --git a/srcpkgs/linux4.19/files/x86_64-dotconfig b/srcpkgs/linux4.19/files/x86_64-dotconfig
index 3705b028eb58..bfe6e2ef45b1 100644
--- a/srcpkgs/linux4.19/files/x86_64-dotconfig
+++ b/srcpkgs/linux4.19/files/x86_64-dotconfig
@@ -587,9 +587,9 @@ CONFIG_PCIEAER_INJECT=m
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 # CONFIG_PCIEASPM_DEFAULT is not set
-# CONFIG_PCIEASPM_POWERSAVE is not set
+CONFIG_PCIEASPM_POWERSAVE=y
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-CONFIG_PCIEASPM_PERFORMANCE=y
+# CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set

From 4d6216abc2e6985f2fbe92574f653f750c099e7d Mon Sep 17 00:00:00 2001
From: Anshul Sirur <anshul@vixus0.dev>
Date: Mon, 18 Jan 2021 14:24:52 +0100
Subject: [PATCH 0079/3482] github-cli: fix setting build version and date

---
 srcpkgs/github-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index e65f708957ea..59500d045881 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,12 +1,12 @@
 # Template file for 'github-cli'
 pkgname=github-cli
 version=1.4.0
-revision=1
+revision=2
 wrksrc="cli-${version}"
 build_style=go
 build_helper=qemu
 go_import_path="github.com/cli/cli/cmd/gh"
-go_ldflags="-X github.com/cli/cli/command.Version=v${version}"
+go_ldflags="-X github.com/cli/cli/internal/build.Version=v${version}"
 short_desc="GitHub CLI tool"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
@@ -19,7 +19,7 @@ pre_build() {
 	local _date
 	if [ "$SOURCE_DATE_EPOCH" ]; then
 		_date="$(date --utc --date "@$SOURCE_DATE_EPOCH" "+%Y-%m-%d")"
-		go_ldflags="$go_ldflags -X github.com/cli/cli/command.BuildDate=${_date}"
+		go_ldflags="$go_ldflags -X github.com/cli/cli/internal/build.Date=${_date}"
 	fi
 }
 

From 465c515ab1a3f7d1c6d60940b3e6f9f8d463fa9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 19:26:10 +0700
Subject: [PATCH 0080/3482] gosu: fix build with gcc-10

---
 srcpkgs/gosu/patches/stdexcept.patch | 120 +++++++++++++++++++++++++++
 1 file changed, 120 insertions(+)
 create mode 100644 srcpkgs/gosu/patches/stdexcept.patch

diff --git a/srcpkgs/gosu/patches/stdexcept.patch b/srcpkgs/gosu/patches/stdexcept.patch
new file mode 100644
index 000000000000..f865b18de154
--- /dev/null
+++ b/srcpkgs/gosu/patches/stdexcept.patch
@@ -0,0 +1,120 @@
+diff --git src/DrawOpQueue.hpp src/DrawOpQueue.hpp
+index 3a463ce..b06515f 100644
+--- src/DrawOpQueue.hpp
++++ src/DrawOpQueue.hpp
+@@ -10,6 +10,7 @@
+ #include <functional>
+ #include <map>
+ #include <vector>
++#include <stdexcept>
+ 
+ class Gosu::DrawOpQueue
+ {
+diff --git src/Font.cpp src/Font.cpp
+index b2c0152..5bcacad 100644
+--- src/Font.cpp
++++ src/Font.cpp
+@@ -10,6 +10,7 @@
+ #include <array>
+ #include <cassert>
+ #include <map>
++#include <stdexcept>
+ using namespace std;
+ 
+ static const int FONT_RENDER_SCALE = 2;
+diff --git src/Graphics.cpp src/Graphics.cpp
+index 0028269..db03fb2 100644
+--- src/Graphics.cpp
++++ src/Graphics.cpp
+@@ -13,6 +13,7 @@
+ #include <algorithm>
+ #include <functional>
+ #include <memory>
++#include <stdexcept>
+ using namespace std;
+ 
+ namespace Gosu
+diff --git src/LargeImageData.cpp src/LargeImageData.cpp
+index c0cbe0d..568a126 100644
+--- src/LargeImageData.cpp
++++ src/LargeImageData.cpp
+@@ -3,6 +3,7 @@
+ #include <Gosu/Graphics.hpp>
+ #include <Gosu/Math.hpp>
+ #include <cmath>
++#include <stdexcept>
+ using namespace std;
+ 
+ Gosu::LargeImageData::LargeImageData(const Bitmap& source, int tile_width, int tile_height,
+diff --git src/OffScreenTarget.cpp src/OffScreenTarget.cpp
+index 7044777..0ec7625 100644
+--- src/OffScreenTarget.cpp
++++ src/OffScreenTarget.cpp
+@@ -5,6 +5,7 @@
+ #ifndef GOSU_IS_IPHONE
+ #include <SDL.h>
+ #endif
++#include <stdexcept>
+ using namespace std;
+ 
+ #ifdef GOSU_IS_OPENGLES
+diff --git src/RubyGosu.cxx src/RubyGosu.cxx
+index 1825875..ae66a71 100644
+--- src/RubyGosu.cxx
++++ src/RubyGosu.cxx
+@@ -17,6 +17,7 @@
+ 
+ 
+ #ifdef __cplusplus
++#include <stdexcept>
+ /* SwigValueWrapper is described in swig.swg */
+ template<typename T> class SwigValueWrapper {
+   struct SwigMovePointer {
+diff --git src/SndFile.hpp src/SndFile.hpp
+index 11e06c1..df17785 100644
+--- src/SndFile.hpp
++++ src/SndFile.hpp
+@@ -9,6 +9,7 @@
+ #define NOMINMAX
+ #include <windows.h>
+ #endif
++#include <stdexcept>
+ 
+ namespace Gosu
+ {
+diff --git src/Text.cpp src/Text.cpp
+index 3641fad..f874b03 100644
+--- src/Text.cpp
++++ src/Text.cpp
+@@ -7,6 +7,7 @@
+ #include <cmath>
+ #include <algorithm>
+ #include <vector>
++#include <stdexcept>
+ using namespace std;
+ 
+ double Gosu::text_width(const u32string& text,
+diff --git src/TrueTypeFont.cpp src/TrueTypeFont.cpp
+index e891015..40ed6b6 100644
+--- src/TrueTypeFont.cpp
++++ src/TrueTypeFont.cpp
+@@ -17,6 +17,7 @@
+ 
+ #include <algorithm>
+ #include <map>
++#include <stdexcept>
+ using namespace std;
+ 
+ struct Gosu::TrueTypeFont::Impl
+diff --git src/WindowUIKit.cpp src/WindowUIKit.cpp
+index fc5060c..14ea73f 100644
+--- src/WindowUIKit.cpp
++++ src/WindowUIKit.cpp
+@@ -3,6 +3,7 @@
+ 
+ #include "GosuViewController.hpp"
+ #include <Gosu/Gosu.hpp>
++#include <stdexcept>
+ 
+ using namespace std;
+ 

From da7eaa8865c4763aacf3beb5d4d7edf32d255b50 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 19 Jan 2021 15:24:46 +0100
Subject: [PATCH 0081/3482] rpi-kernel: update to 5.4.83.

* install correct set of dtb, thanks to @ahesford
* adopt, as suggested by former maintainer @pbui
---
 srcpkgs/rpi-kernel/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 7bce019015fa..f9f170aedc05 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -5,19 +5,19 @@
 #
 #   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="e82816db535e0489ffd1c31cd9b7e4969fce4171"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.4.68
+version=5.4.83
 revision=1
 wrksrc="linux-${_githash}"
-maintainer="Peter Bui <pbui@github.bx612.space>"
+maintainer="Piraty <piraty1@inbox.ru>"
 homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="The Linux kernel for Raspberry Pi (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=e0dc98befadb4c8c66aa0e73d9d79f10b20e29fb758ab870a0c6c708e3a0abb7
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=2
 
 _kernver="${version}_${revision}"
@@ -128,10 +128,10 @@ do_install() {
 	# Install device tree blobs
 	make ${makejobs} ARCH=${_arch} INSTALL_DTBS_PATH=${DESTDIR}/boot dtbs_install
 
-	#move rpi3's dtb that ended up in /boot/broadcom
+	# move dtb that ended up in /boot/broadcom
 	case "$XBPS_TARGET_MACHINE" in
 	aarch64*)
-		mv ${DESTDIR}/boot/broadcom/bcm2710-rpi-3-b.dtb ${DESTDIR}/boot
+		mv ${DESTDIR}/boot/broadcom/bcm{2710,2837}-*.dtb ${DESTDIR}/boot
 		;;
 	esac
 

From 985d6c9475bf6baef46867314aae6ae252d396b9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Jan 2021 14:40:13 +0100
Subject: [PATCH 0082/3482] janet: update to 1.14.1.

---
 common/shlibs          | 2 +-
 srcpkgs/janet/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e0601851d650..a6b5cedc84ed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3928,7 +3928,7 @@ libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.8 libcbor-0.8.0_1
 libfido2.so.1 libfido2-1.3.0_1
-libjanet.so.1.13 janet-1.13.1_1
+libjanet.so.1.14 janet-1.14.1_1
 libOpenImageDenoise.so.0 openimagedenoise-1.2.0_1
 libcbang0.so cbang-1.3.3_1
 libblosc.so.1 c-blosc-1.17.1_1
diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 1a8601b7ddc6..abc45fde9bde 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.13.1
+version=1.14.1
 revision=1
 build_style=meson
 short_desc="Dynamic Lisp dialect and bytecode VM"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://janet-lang.org/"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=7d369b72a1fc649f7e5c254e2b746eb36885970504f6d9d3441507ca2d716644
+checksum=fcdb12c4ca414af346f390f81ea6e2417da182656c1c36377237df57b92cfd34
 
 post_install() {
 	vlicense LICENSE

From f313585d59beae84e33b316504110c3751ed030b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Jan 2021 14:40:38 +0100
Subject: [PATCH 0083/3482] python3-pyinfra: update to 1.3.3.

---
 srcpkgs/python3-pyinfra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index ef65f2057b5c..da7abbf01fcb 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.3.1
+version=1.3.3
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=0ada84e57f2e86be94f0fc259e2d09640dad8c24361cba8de39de18c39564248
+checksum=f6a7575f0f5ad337f988916296ee5b756f2be4ac24d047b5a6130d71b2acc8c1
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 1892f402522c114ea20c8f5b72961c6bba9d85ae Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Jan 2021 14:52:30 +0100
Subject: [PATCH 0084/3482] xaos: update to 4.2.1.

---
 srcpkgs/xaos/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xaos/template b/srcpkgs/xaos/template
index ca17fcc29897..1b4c9dfd8310 100644
--- a/srcpkgs/xaos/template
+++ b/srcpkgs/xaos/template
@@ -1,6 +1,6 @@
 # Template file for 'xaos'
 pkgname=xaos
-version=4.2
+version=4.2.1
 revision=1
 wrksrc="XaoS-release-${version}"
 build_style=qmake
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://xaos-project.github.io/"
 distfiles="https://github.com/xaos-project/XaoS/archive/release-${version}.tar.gz"
-checksum=7910e5f935d5d9db7947f4339087de88ca057428490e5ce5540d271f81cbc09c
+checksum=bf21d3f50d7c1626c5c96da475f84ea24d24a164ec6cc2bbc4ee229bc4a65967
 
 pre_configure() {
 	vsed -i i18n/i18n.pri -e'/updateqm.commands/ s;lrelease;lrelease-qt5;'

From d9482e8453328f5683ec3837d440dad0860f2b54 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Jan 2021 14:55:47 +0100
Subject: [PATCH 0085/3482] angle-grinder: update to 0.16.

---
 srcpkgs/angle-grinder/template | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/angle-grinder/template b/srcpkgs/angle-grinder/template
index 3b5df7155615..3ee788491d97 100644
--- a/srcpkgs/angle-grinder/template
+++ b/srcpkgs/angle-grinder/template
@@ -1,23 +1,15 @@
 # Template file for 'angle-grinder'
 pkgname=angle-grinder
-version=0.15.0
-revision=2
+version=0.16
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
 short_desc="Slice and dice logs on the command line"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/rcoh/angle-grinder"
 distfiles="https://github.com/rcoh/angle-grinder/archive/v${version}.tar.gz"
-checksum=5359d6e241eca2bc3bdb7ddf9344b4ef8315cbe7629775c09e0ab7ed70310c8d
-#nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/26343/steps/shell_3/logs/stdio"
-
-post_extract() {
-	# get rid of rustls and therefore ring dependency
-	# https://github.com/rcoh/angle-grinder/issues/124
-	vsed -i '/self_update/s/"rustls"/"default"/' Cargo.toml
-}
+checksum=575e5398cfcddc78152f76ade632f7be2aa6b54b4adaaf1776344529fb9c0561
 
 post_install() {
 	vlicense LICENSE

From ec3d2e3389638d15ce5e9c0af38a8a301f96d779 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Jan 2021 15:12:18 +0100
Subject: [PATCH 0086/3482] erlang: update to 23.2.2.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index b241ddd8aa46..756bc760effb 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=23.2.1
+version=23.2.2
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=e7034e2cfe50d7570ac8f70ea7ba69ea013f10863043e25132f0a5d3d0d8d3a7
+checksum=04994a2dffee0170554797b3d258b4f4727e54c772e721202e9fb22d6827e4de
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 80e6aa02bf4f71cf8dfb83a611f3ece0d0cae182 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 19 Jan 2021 19:05:08 +0100
Subject: [PATCH 0087/3482] qt5-webengine: boop

just like with chromium, add a time64 patch from debian
to fix sandbox with glibc 2.32
---
 .../qt5-webengine/patches/0114-time64.patch   | 89 +++++++++++++++++++
 srcpkgs/qt5-webengine/template                |  2 +-
 2 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/qt5-webengine/patches/0114-time64.patch

diff --git a/srcpkgs/qt5-webengine/patches/0114-time64.patch b/srcpkgs/qt5-webengine/patches/0114-time64.patch
new file mode 100644
index 000000000000..6a98dd4e480e
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0114-time64.patch
@@ -0,0 +1,89 @@
+Description: fix seccomp-bpf failures in syscalls 0403, 0407
+ glibc ≥ 2.31 uses these syscalls on 32-bit platforms:
+ .
+ - https://sourceware.org/git/?p=glibc.git;a=commit;h=2e44b10b42d68d98
+ - https://sourceware.org/git/?p=glibc.git;a=commit;h=ec138c67cbda8b58
+Author: Andreas Müller <schnitzeltony@gmail.com>
+Forwarded: no
+Last-Update: 2020-09-02
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -148,7 +148,14 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return Allow();
+ #endif
+ 
+-  if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) {
++  if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep
++#if defined(__NR_clock_gettime64)
++                                  || sysno == __NR_clock_gettime64
++#endif
++#if defined(__NR_clock_nanosleep_time64)
++                                  || sysno == __NR_clock_nanosleep_time64
++#endif
++  ) {
+     return RestrictClockID();
+   }
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
+@@ -60,6 +60,12 @@ class RestrictClockIdPolicy : public bpf
+       case __NR_clock_gettime:
+       case __NR_clock_getres:
+       case __NR_clock_nanosleep:
++#if defined(__NR_clock_nanosleep_time64)
++      case __NR_clock_nanosleep_time64:
++#endif
++#if defined(__NR_clock_gettime64)
++      case __NR_clock_gettime64:
++#endif
+         return RestrictClockID();
+       default:
+         return Allow();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -39,6 +39,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                 // filtered by RestrictClokID().
+     case __NR_clock_gettime:    // Parameters filtered by RestrictClockID().
+     case __NR_clock_nanosleep:  // Parameters filtered by RestrictClockID().
++#if defined(__NR_clock_gettime64)
++    case __NR_clock_gettime64:  // Parameters filtered by RestrictClockID().
++#endif
++#if defined(__NR_clock_nanosleep_time64)
++    case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
++#endif
+     case __NR_clock_settime:    // Privileged.
+ #if defined(__i386__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1385,6 +1385,14 @@
+ #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
+ #endif
+ 
++#if !defined(__NR_clock_gettime64)
++#define __NR_clock_gettime64 (__NR_SYSCALL_BASE+403)
++#endif
++
++#if !defined(__NR_clock_nanosleep_time64)
++#define __NR_clock_nanosleep_time64 (__NR_SYSCALL_BASE+407)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h
+@@ -1433,4 +1433,12 @@
+ #define __NR_memfd_create (__NR_Linux + 354)
+ #endif
+ 
++#if !defined(__NR_clock_gettime64)
++#define __NR_clock_gettime64 (__NR_Linux + 403)
++#endif
++
++#if !defined(__NR_clock_nanosleep_time64)
++#define __NR_clock_nanosleep_time64 (__NR_Linux + 407)
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 1bacb88e9ec2..b49665122bb2 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
 version=5.15.2
-revision=1
+revision=2
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
 wrksrc="qtwebengine-everywhere-src-${version}"
 build_style=qmake

From c9e89fb626862165fab22c2846f2b1c999812682 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 19 Jan 2021 19:15:44 +0100
Subject: [PATCH 0088/3482] vlc: update to 3.0.12.

---
 srcpkgs/vlc/patches/qt_5_15.patch | 33 -------------------------------
 srcpkgs/vlc/template              |  6 +++---
 2 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/vlc/patches/qt_5_15.patch

diff --git a/srcpkgs/vlc/patches/qt_5_15.patch b/srcpkgs/vlc/patches/qt_5_15.patch
deleted file mode 100644
index 66b0df96e018..000000000000
--- a/srcpkgs/vlc/patches/qt_5_15.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -u -r vlc-3.0.10/modules/gui/qt/components/playlist/views.cpp vlc-3.0.10-qt-5.15/modules/gui/qt/components/playlist/views.cpp
---- modules/gui/qt/components/playlist/views.cpp	2017-11-24 15:29:17.000000000 +0000
-+++ modules/gui/qt/components/playlist/views.cpp	2020-05-29 20:50:09.267959371 +0000
-@@ -27,6 +27,7 @@
- #include "input_manager.hpp"                      /* THEMIM */
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRect>
- #include <QStyleOptionViewItem>
- #include <QFontMetrics>
-diff -u -r vlc-3.0.10/modules/gui/qt/dialogs/plugins.cpp vlc-3.0.10-qt-5.15/modules/gui/qt/dialogs/plugins.cpp
---- modules/gui/qt/dialogs/plugins.cpp	2017-11-24 15:29:17.000000000 +0000
-+++ modules/gui/qt/dialogs/plugins.cpp	2020-05-29 20:49:44.114275108 +0000
-@@ -53,6 +53,7 @@
- #include <QListView>
- #include <QListWidget>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStyleOptionViewItem>
- #include <QKeyEvent>
- #include <QPushButton>
-diff -u -r vlc-3.0.10/modules/gui/qt/util/timetooltip.hpp vlc-3.0.10-qt-5.15/modules/gui/qt/util/timetooltip.hpp
---- modules/gui/qt/util/timetooltip.hpp	2018-05-03 12:03:21.000000000 +0000
-+++ modules/gui/qt/util/timetooltip.hpp	2020-05-29 20:40:30.306628713 +0000
-@@ -24,6 +24,7 @@
- 
- #include "qt.hpp"
- 
-+#include <QPainterPath>
- #include <QWidget>
- 
- class TimeTooltip : public QWidget
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 7cb0b4a3c1db..fe29870ac996 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=3.0.11.1
-revision=6
+version=3.0.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -17,7 +17,7 @@ license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://www.videolan.org/vlc/"
 changelog="https://www.videolan.org/developers/vlc-branch/NEWS"
 distfiles="https://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz"
-checksum=189311d28aa814f106a7b3645211ac52c0b3e2b9f4b348de2f63bab3218086b8
+checksum=eff458f38a92126094f44f2263c2bf2c7cdef271b48192d0fe7b1726388cf879
 
 lib32disabled=yes
 

From 1d74fb6d7badb85a8b1edeadf460c1680acfa119 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:31:50 +1100
Subject: [PATCH 0089/3482] common/build-style/texmf.sh: various improvments.

- do_check (ownership check): only check against latest version of
  package.
- Add comments.
---
 common/build-style/texmf.sh | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/common/build-style/texmf.sh b/common/build-style/texmf.sh
index 798d44e14d22..dbed1fd64bfd 100644
--- a/common/build-style/texmf.sh
+++ b/common/build-style/texmf.sh
@@ -1,19 +1,34 @@
 do_build() {
 	local f p
+	# Extract the source files
 	mkdir -p "build/usr/share/texmf-dist"
 	find . -maxdepth 1 -print -name "*.tar.xz" \
 		-exec bsdtar -C "build/usr/share/texmf-dist" -xf {} \;
 	cd "build/usr/share/texmf-dist/"
+	# Everything in usr/share/texmf-dist/texmf-dist should really be in
+	# usr/share/texmf-dist, so we move it
 	if [ -d "texmf-dist" ] ; then
 		rsync -ar texmf-dist/ ./
 		rm -rf texmf-dist/
 	fi
+	# LICENSEs are unneeded
 	rm -f LICENSE*
+
+	# We have some conflicting files between different packages. To work
+	# around this, we use an ownership file that maps which conflicting
+	# files should be in which packages. Here, each file in the map list is
+	# checked whether it is in the package, and if it shouldn't be it is
+	# removed.
 	while IFS=' ' read -r f p ; do
 		if [ "$p" = "$pkgname" ] && ! [ -e "$f" ]; then
+			# Error out if the ownership map expects this package to have a
+			# file but it dosen't
 			msg_error "$pkgver: missing file $f\n"
 		elif [ "$p" != "$pkgname" ] && [ -e "$f" ]; then
+			# Remove a file that according to the ownership map belongs to
+			# another file
 			echo "removed $f"
+			# Install a file that lists the removed packages
 			mkdir -p ../texlive/removed
 			echo "$f" >> ../texlive/removed/$pkgname.txt
 			rm -f "$f"
@@ -22,10 +37,21 @@ do_build() {
 }
 
 do_check() {
-	local f p exitcode=0
+	# This is essentially a helper for generating the ownership map. It checks
+	# to see if there are any conflicts between all of the different packages.
+	local f p current_ver current_rev exitcode=0
 	cd build
+
 	while read p; do
-		if [[ ${p%-*} =~ .*-bin$ ]] || [ "${p%-*}" = "$pkgname" ]; then
+		# Don't check against the texlive-bin* packages, ourselves, -dbg or -32bit pkgs
+		if [[ ${p%-*} =~ .*-bin$ ]] || [ "${p%-*}" = "$pkgname" ] || [[ ${p%-*} =~ .*-dbg$ ]] || [[ ${p%-*} =~ .*-32bit$ ]]; then
+			continue
+		fi
+		# Don't check against any version other than the version in the source tree
+		current_ver="$(grep -m 1 version= ${XBPS_SRCPKGDIR}/${p%-*}/template | cut -d= -f2)"
+		current_rev="$(grep -m 1 revision= ${XBPS_SRCPKGDIR}/${p%-*}/template | cut -d= -f2)"
+		if [ "${p%-*}-${current_ver}_${current_rev}" != "${p}" ]; then
+			# They are not the same version
 			continue
 		fi
 		echo checking conflicts with ${p}...

From 0215f1c6ce03ac6db858c186d417d393c6012ea5 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:24:33 +1100
Subject: [PATCH 0090/3482] texlive-core: update to 2020.57066.

---
 srcpkgs/texlive-core/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-core/template b/srcpkgs/texlive-core/template
index b264f88ea4f3..b330bfc6c2bc 100644
--- a/srcpkgs/texlive-core/template
+++ b/srcpkgs/texlive-core/template
@@ -1,11 +1,11 @@
 # Template file for 'texlive-core'
 pkgname=texlive-core
-version=2020.55416
-revision=2
+version=2020.57066
+revision=1
 build_style="texmf"
 short_desc="TeX Live - core texmf distribution"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=8e025c2dfa4e19dcb6aa5e661874d2c2a158aa2e1a078c11a4ddd6347bd9db45
+checksum=b3280ddd2b2c8d41dba3784ba41b755e317e5352868015fe1f70a16b24f5dde9

From 91c67acbab9d2c3395838258cd59721ea825d68e Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:25:09 +1100
Subject: [PATCH 0091/3482] texlive-bibtexextra: update to 2020.56991.

---
 srcpkgs/texlive-bibtexextra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-bibtexextra/template b/srcpkgs/texlive-bibtexextra/template
index 8919b87655b4..fe9d2fa2681d 100644
--- a/srcpkgs/texlive-bibtexextra/template
+++ b/srcpkgs/texlive-bibtexextra/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-bibtexextra'
 pkgname=texlive-bibtexextra
-version=2020.55376
-revision=2
+version=2020.56991
+revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Additional BibTeX styles and bibliography databases"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=f886188aa015f8450519a22cca61b7dc929bb206c90f5de8947a1a949f762f4a
+checksum=29ac4e1ab0447832a6847abf4a4f2a034ff4deae339fe9c118aef1bc95c02b49

From cdbcb542ec359e23713a464265b7fd8e92f0a629 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:25:31 +1100
Subject: [PATCH 0092/3482] texlive-fontsextra: update to 2020.57042.

---
 srcpkgs/texlive-fontsextra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-fontsextra/template b/srcpkgs/texlive-fontsextra/template
index bded49719ef5..ea129fa90f8c 100644
--- a/srcpkgs/texlive-fontsextra/template
+++ b/srcpkgs/texlive-fontsextra/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-fontsextra'
 pkgname=texlive-fontsextra
-version=2020.55407
-revision=2
+version=2020.57042
+revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - All sorts of extra fonts"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=25e1060c699f09e02924bf27902b162d7af5a6cc2d0c898f83c09ca0928d9060
+checksum=88a46fc20ec4522bb825aad3b8792ad1494933b2dcbeee4e6b746e1a264352fb

From 701dbdcb17b9f777b662f37b75638f58f43f77b9 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:25:50 +1100
Subject: [PATCH 0093/3482] texlive-formatsextra: update to 2020.56699.

---
 srcpkgs/texlive-formatsextra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-formatsextra/template b/srcpkgs/texlive-formatsextra/template
index 9c16243f8674..fee99a62cd6e 100644
--- a/srcpkgs/texlive-formatsextra/template
+++ b/srcpkgs/texlive-formatsextra/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-formatsextra'
 pkgname=texlive-formatsextra
-version=2020.54498
-revision=2
+version=2020.56699
+revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Collection of extra TeX 'formats'"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=897881410cc6144478c40cee45d976950a60bd5f86f798857d57501b3c2a4bf0
+checksum=ead7b2f6674f0db9b35db6ad89c13dead0831f7782999b7fdd921937ffec8352

From 1891d87d730dee9691fa8b8d526678e9665c51e9 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:26:10 +1100
Subject: [PATCH 0094/3482] texlive-games: update to 2020.56833.

---
 srcpkgs/texlive-games/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-games/template b/srcpkgs/texlive-games/template
index 886078f5f55d..682791ab0e36 100644
--- a/srcpkgs/texlive-games/template
+++ b/srcpkgs/texlive-games/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-games'
 pkgname=texlive-games
-version=2020.55271
-revision=2
+version=2020.56833
+revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Typesetting board games"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=8fee7616c18bd8c53cdea108d2d17583b88ace4a97fe6d23f13d32c56397885b
+checksum=c11db61e7daf90f815a606df357da480479d300ebe7606179f67ca8c13fedc27

From 69cb037e60199b833edd5ab2795325659bb7bbf2 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:26:48 +1100
Subject: [PATCH 0095/3482] texlive-humanities: update to 2020.57034.

---
 srcpkgs/texlive-humanities/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-humanities/template b/srcpkgs/texlive-humanities/template
index 6a212087ae11..4623280a8914 100644
--- a/srcpkgs/texlive-humanities/template
+++ b/srcpkgs/texlive-humanities/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-humanities'
 pkgname=texlive-humanities
-version=2020.55389
-revision=2
+version=2020.57034
+revision=1
 build_style="texmf"
 depends="texlive-core texlive-latexextra texlive-pictures"
 short_desc="TeX Live - Packages for humanities, law, linguistics, etc"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=528bc27a2ba5410a76d4ab509b97d0ea87038fde1b65f4254fb0d94805c1f3e5
+checksum=9eecd63565d7ab550fa7f82f10f4f1bbb523c501e987c3eef051426e5927ed70

From a9eec7c92ec86834bcf8d062ca9b3d2aa9e6f0f9 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:27:17 +1100
Subject: [PATCH 0096/3482] texlive-langchinese: update to 2020.57044.

---
 srcpkgs/texlive-langchinese/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-langchinese/template b/srcpkgs/texlive-langchinese/template
index 45500a2fcaef..9b10e8751d56 100644
--- a/srcpkgs/texlive-langchinese/template
+++ b/srcpkgs/texlive-langchinese/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-langchinese'
 pkgname=texlive-langchinese
-version=2020.55162
-revision=2
+version=2020.57044
+revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Fonts and macro packages for typesetting Chinese"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=4ed294a09e69ca853fd9a141103ad4d4f6282afc3dcc058e18415acfd71f8883
+checksum=635ff96a2373caca1c4b927ba54d6fd1bd3ee629dc9279be768021eb8fe1c93f

From d8e2fb9c660d742e900843118477e586493bc18d Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:27:43 +1100
Subject: [PATCH 0097/3482] texlive-langcyrillic: update to 2020.56674.

---
 srcpkgs/texlive-langcyrillic/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-langcyrillic/template b/srcpkgs/texlive-langcyrillic/template
index 2bf412808038..6ab9170e30d1 100644
--- a/srcpkgs/texlive-langcyrillic/template
+++ b/srcpkgs/texlive-langcyrillic/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-langcyrillic'
 pkgname=texlive-langcyrillic
-version=2020.54594
-revision=2
+version=2020.56674
+revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Fonts and macro packages for typesetting Cyrillic text"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=42cb98a93a1cb9437691d24d4aae64360b260da036f874cb6644aa7bc8a47c67
+checksum=b20e99fd5a7f48e0024fc2e2bb2609d28eb9a74e5b2abee1843e680632833cf9

From 64fb532bb3e031d75afd840caf5a91a336d7cdce Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:28:05 +1100
Subject: [PATCH 0098/3482] texlive-langextra: update to 2020.56781.

---
 srcpkgs/texlive-langextra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-langextra/template b/srcpkgs/texlive-langextra/template
index e59d071ad633..a66c38aa338a 100644
--- a/srcpkgs/texlive-langextra/template
+++ b/srcpkgs/texlive-langextra/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-langextra'
 pkgname=texlive-langextra
-version=2020.55417
-revision=2
+version=2020.56781
+revision=1
 build_style="texmf"
 depends="texlive-core texlive-latexextra"
 short_desc="TeX Live - Packages for a bunch of extra languages"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=b92cff8917d8f44071de42307c9f5d72d0be8999d789d1d407225d010f026ac9
+checksum=57b27be556189cb9a50ee5c724d4cce40cab2efdc3e253d8a4fb61c52d36860a

From bbe7149352fa0434fdae06573346add248ac074c Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:28:30 +1100
Subject: [PATCH 0099/3482] texlive-langgreek: update to 2020.56956.

---
 srcpkgs/texlive-langgreek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-langgreek/template b/srcpkgs/texlive-langgreek/template
index dffd3471916d..1e4c61c3fc2b 100644
--- a/srcpkgs/texlive-langgreek/template
+++ b/srcpkgs/texlive-langgreek/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-langgreek'
 pkgname=texlive-langgreek
-version=2020.54512
-revision=2
+version=2020.56956
+revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Fonts and macro packages for typesetting Greek"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=72c7c9b7ab23df11edf2ec2430a97d8a45885316ccbcfa7bc62684b3f2e9188b
+checksum=9fac133578469c91572306a537c47ee6fdc661caf0f0dacba276af6a69fca465

From 030f8b3c1983b6d561a6cc84cb2ef581ca24b668 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:28:51 +1100
Subject: [PATCH 0100/3482] texlive-langjapanese: update to 2020.57025.

---
 srcpkgs/texlive-langjapanese/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-langjapanese/template b/srcpkgs/texlive-langjapanese/template
index 3a8d424ac1d7..e5949a7f2325 100644
--- a/srcpkgs/texlive-langjapanese/template
+++ b/srcpkgs/texlive-langjapanese/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-langjapanese'
 pkgname=texlive-langjapanese
-version=2020.55320
-revision=2
+version=2020.57025
+revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Fonts and macro packages for typesetting Japanese"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=2e2538c9c81ed69530ce78b1dd132eaa54832276e614d6907bafeec17a1c3a90
+checksum=8f358bde670e7afb8b1561382bc0c18797da97f0e2ea40c74b87a54fc32057c7

From 4e238f3037ac396b38bf5fd464625acc15ce8dd9 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:29:12 +1100
Subject: [PATCH 0101/3482] texlive-langkorean: update to 2020.56915.

---
 srcpkgs/texlive-langkorean/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-langkorean/template b/srcpkgs/texlive-langkorean/template
index 75e6390c8bb8..05287fea5178 100644
--- a/srcpkgs/texlive-langkorean/template
+++ b/srcpkgs/texlive-langkorean/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-langkorean'
 pkgname=texlive-langkorean
-version=2020.54519
-revision=2
+version=2020.56915
+revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Fonts and macro packages for typesetting Korean"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=dfc1e1434bbc10442009e9c3e28609ae45aeda96930df899d365eea38423f66e
+checksum=e767951038f076f9cdd76a7b5bad9598733ef3df098082d623511d9adffb1d1e

From cb84587d57965c66043e2b164797bf6732b06427 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:29:36 +1100
Subject: [PATCH 0102/3482] texlive-latexextra: update to 2020.57067.

---
 srcpkgs/texlive-latexextra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-latexextra/template b/srcpkgs/texlive-latexextra/template
index 7d9ab489fe0b..bedea0152676 100644
--- a/srcpkgs/texlive-latexextra/template
+++ b/srcpkgs/texlive-latexextra/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-latexextra'
 pkgname=texlive-latexextra
-version=2020.55418
-revision=2
+version=2020.57067
+revision=1
 build_style="texmf"
 depends="perl-File-Which python3-Pygments texlive-core texlive-pictures"
 short_desc="TeX Live - Collection of LaTeX addon packages"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=a2ee21a2a6f00def6bec620a85bb8116de97a16dcd98adaa308eb455fe0e7fcb
+checksum=6ab6ca702f7d956de9ee8fb9c78518da64c322472716c99780d9dfd9c158930f

From 7482d0f75287739b49ace1bc2b81151db9ca4765 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:29:54 +1100
Subject: [PATCH 0103/3482] texlive-music: update to 2020.56473.

---
 srcpkgs/texlive-music/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-music/template b/srcpkgs/texlive-music/template
index 2210ffcb9363..03a03d99805f 100644
--- a/srcpkgs/texlive-music/template
+++ b/srcpkgs/texlive-music/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-music'
 pkgname=texlive-music
-version=2020.54758
-revision=2
+version=2020.56473
+revision=1
 build_style="texmf"
 depends="fontforge python3 texlive-core"
 short_desc="TeX Live - Music typesetting packages"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=47f418d851a0f838c08be406135ef338533e32cf0bc9c4ffefeaa0139973e8f1
+checksum=06caf29f5ef2e3881cde74963f70ffe75215359ae824ebae4f0599b24ca4458b

From 0541d0848fecf3a61f94e0924da5199dbfbc243d Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:30:10 +1100
Subject: [PATCH 0104/3482] texlive-pictures: update to 2020.57065.

---
 srcpkgs/texlive-pictures/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-pictures/template b/srcpkgs/texlive-pictures/template
index 5f1c07af383e..e60fb2462824 100644
--- a/srcpkgs/texlive-pictures/template
+++ b/srcpkgs/texlive-pictures/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-pictures'
 pkgname=texlive-pictures
-version=2020.55342
-revision=2
+version=2020.57065
+revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Packages for drawing graphics"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=4bfd4a1cf0339151806ff7591c11d4b1868bc9ebf7f9b0f396193abbc3c7aec5
+checksum=4e9a720d65b4a2d15cb05591f817cc76dff57797485b075f356c1c1ff109bca5

From 2f2812d2b93512222a4a69f5cf7a736c3791077c Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:30:32 +1100
Subject: [PATCH 0105/3482] texlive-pstricks: update to 2020.56758.

---
 srcpkgs/texlive-pstricks/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-pstricks/template b/srcpkgs/texlive-pstricks/template
index f7ca79bf6814..40773bad302a 100644
--- a/srcpkgs/texlive-pstricks/template
+++ b/srcpkgs/texlive-pstricks/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-pstricks'
 pkgname=texlive-pstricks
-version=2020.55289
-revision=2
+version=2020.56758
+revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Additional PSTricks packages"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=be0eb4d24474a3af116af7d34af5b78f6cdc7aee6235ed4d63f1682dc2ef0cbc
+checksum=3c02a5733450544e8d38f66e6fa20055974a474e6184b293fe7d7003e891f6a1

From 55fdb4c05aaf1bbce0941376b96dced1f858a363 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:30:51 +1100
Subject: [PATCH 0106/3482] texlive-publishers: update to 2020.57058.

---
 srcpkgs/texlive-publishers/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-publishers/template b/srcpkgs/texlive-publishers/template
index f1cea965157b..892d6e202462 100644
--- a/srcpkgs/texlive-publishers/template
+++ b/srcpkgs/texlive-publishers/template
@@ -1,11 +1,11 @@
 # Template file for 'texlive-publishers'
 pkgname=texlive-publishers
-version=2020.55415
-revision=2
+version=2020.57058
+revision=1
 build_style="texmf"
 short_desc="TeX Live - Classes and packages for certain publishers"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=4d36cad1e18e5ad9b9866bba17c9288454f6d7b17a3ac144160ec4a5bce79176
+checksum=13a312f58913e168e68b6dc57ef93b099485537c99e5f6f588f5c98764abf069

From 82795f9db6d733061b5a790a1c8eeb442b8d9c17 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:31:09 +1100
Subject: [PATCH 0107/3482] texlive-science: update to 2020.57068.

---
 srcpkgs/texlive-science/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-science/template b/srcpkgs/texlive-science/template
index 9a179ccfbe13..c405043a4638 100644
--- a/srcpkgs/texlive-science/template
+++ b/srcpkgs/texlive-science/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-science'
 pkgname=texlive-science
-version=2020.55390
-revision=2
+version=2020.57068
+revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Typesetting for mathematatics and science disciplines"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=c42294cd26e5a65585b27520e5a877539f88ba1583d5e1101c828a934225eea4
+checksum=ae3925dce04e315ee53cef15799c03a743bdf048313cf328a50b143ff9ace888

From 71d25cb5e9f03d2cd357f847ffdaa1479a37f9a0 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:32:42 +1100
Subject: [PATCH 0108/3482] texlive-minimal: update to 2020.1.

---
 srcpkgs/texlive-minimal/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-minimal/template b/srcpkgs/texlive-minimal/template
index 1b40bb3ea71d..cd6fed4d1f4e 100644
--- a/srcpkgs/texlive-minimal/template
+++ b/srcpkgs/texlive-minimal/template
@@ -1,10 +1,10 @@
 # Template file for 'texlive-minimal'
 pkgname=texlive-minimal
-version=2020
-revision=2
+version=2020.1
+revision=1
 build_style=meta
 depends="texlive>=20200406
- texlive-core>=2020.55416"
+ texlive-core>=2020.57066"
 short_desc="TeX Live - Metapackage including minimal packages"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"

From 782f9dd24a6250d816ac7d3561de39aa17466a54 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:33:02 +1100
Subject: [PATCH 0109/3482] texlive-basic: update to 2020.1.

---
 srcpkgs/texlive-basic/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/texlive-basic/template b/srcpkgs/texlive-basic/template
index 8058751dc87f..68af65f2c705 100644
--- a/srcpkgs/texlive-basic/template
+++ b/srcpkgs/texlive-basic/template
@@ -1,15 +1,15 @@
 # Template file for 'texlive-basic'
 pkgname=texlive-basic
-version=2020
-revision=2
+version=2020.1
+revision=1
 build_style=meta
 depends="texlive>=20200406
  texlive-BibTeX>=20200406
  texlive-LuaTeX>=20200406
  texlive-dvi>=20200406
- texlive-core>=2020.55416
- texlive-latexextra>=2020.55418
- texlive-pictures>=2020.55342"
+ texlive-core>=2020.57066
+ texlive-latexextra>=2020.57067
+ texlive-pictures>=2020.57065"
 short_desc="TeX Live - Metapackage including some simple packages"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"

From d283710afc4ac74ba3afbd4def02084b7a71b285 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:33:16 +1100
Subject: [PATCH 0110/3482] texlive-most: update to 2020.1.

---
 srcpkgs/texlive-most/template | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/texlive-most/template b/srcpkgs/texlive-most/template
index 8e61be6ff875..68683f7d1c01 100644
--- a/srcpkgs/texlive-most/template
+++ b/srcpkgs/texlive-most/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-most'
 pkgname=texlive-most
-version=2020
-revision=2
+version=2020.1
+revision=1
 build_style=meta
 depends="texlive>=20200406
  texlive-BibTeX>=20200406
@@ -11,18 +11,18 @@ depends="texlive>=20200406
  texlive-Xdvi>=20200406
  texlive-XeTeX>=20200406
  texlive-dvi>=20200406
- texlive-core>=2020.55416
- texlive-bibtexextra>=2020.55376
- texlive-fontsextra>=2020.55407
- texlive-formatsextra>=2020.54498
- texlive-games>=2020.55271
- texlive-humanities>=2020.55389
- texlive-latexextra>=2020.55418
- texlive-music>=2020.54758
- texlive-pictures>=2020.55342
- texlive-pstricks>=2020.55289
- texlive-publishers>=2020.55415
- texlive-science>=2020.55390"
+ texlive-core>=2020.57066
+ texlive-bibtexextra>=2020.56991
+ texlive-fontsextra>=2020.57042
+ texlive-formatsextra>=2020.56699
+ texlive-games>=2020.56833
+ texlive-humanities>=2020.57034
+ texlive-latexextra>=2020.57067
+ texlive-music>=2020.56473
+ texlive-pictures>=2020.57065
+ texlive-pstricks>=2020.56758
+ texlive-publishers>=2020.57058
+ texlive-science>=2020.57068"
 short_desc="TeX Live - Metapackage including most packages"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"

From 482dccd751055142f933ef420436b1a2d80c9a0b Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:33:29 +1100
Subject: [PATCH 0111/3482] texlive-lang: update to 2020.1.

---
 srcpkgs/texlive-lang/template | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/texlive-lang/template b/srcpkgs/texlive-lang/template
index b6eb6ec78e16..7473c58c229a 100644
--- a/srcpkgs/texlive-lang/template
+++ b/srcpkgs/texlive-lang/template
@@ -1,15 +1,15 @@
 # Template file for 'texlive-lang'
 pkgname=texlive-lang
-version=2020
-revision=2
+version=2020.1
+revision=1
 build_style=meta
-depends="texlive-core>=2020.55416
- texlive-langchinese>=2020.55162
- texlive-langcyrillic>=2020.54594
- texlive-langextra>=2020.55417
- texlive-langgreek>=2020.54512
- texlive-langjapanese>=2020.55320
- texlive-langkorean>=2020.54519"
+depends="texlive-core>=2020.57066
+ texlive-langchinese>=2020.57044
+ texlive-langcyrillic>=2020.56674
+ texlive-langextra>=2020.56781
+ texlive-langgreek>=2020.56956
+ texlive-langjapanese>=2020.57025
+ texlive-langkorean>=2020.56915"
 short_desc="TeX Live - Metapackage including all languages"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"

From dddafd43a2d8fb7a9013547aed56de39ffa7d6c1 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:33:39 +1100
Subject: [PATCH 0112/3482] texlive-full: update to 2020.1.

---
 srcpkgs/texlive-full/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/texlive-full/template b/srcpkgs/texlive-full/template
index e506e4935c7d..dd578736f605 100644
--- a/srcpkgs/texlive-full/template
+++ b/srcpkgs/texlive-full/template
@@ -1,10 +1,10 @@
 # Template file for 'texlive-full'
 pkgname=texlive-full
-version=2020
-revision=2
+version=2020.1
+revision=1
 build_style=meta
-depends="texlive-most>=2020
- texlive-lang>=2020"
+depends="texlive-most>=2020.1
+ texlive-lang>=2020.1"
 short_desc="TeX Live - Metapackage including all packages"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"

From f3738c37d684b738bd9536cb2c5b5f7db47a3b6e Mon Sep 17 00:00:00 2001
From: Chris Brannon <chris@the-brannons.com>
Date: Wed, 6 Jan 2021 14:55:41 +0000
Subject: [PATCH 0113/3482] xen: update to 4.14.1.

Also:
* Move qemu-xen firmware to /usr/share, not /usr/libexec.  That's where
Xen expects it.  Some of those things are ELF files, but they're used
as data and not host executables.
* Bring back a musl patch for hvmloader.  This came from Alpine Linux,
though we had it in the tree a long time ago.  Update stdint_local.h
with the version from Alpine.
---
 srcpkgs/xen/files/stdint_local.h              |  29 ++-
 .../patches/musl-hvmloader-fix-stdint.patch   | 190 ++++++++++++++++++
 srcpkgs/xen/template                          |  39 ++--
 3 files changed, 218 insertions(+), 40 deletions(-)
 create mode 100644 srcpkgs/xen/patches/musl-hvmloader-fix-stdint.patch

diff --git a/srcpkgs/xen/files/stdint_local.h b/srcpkgs/xen/files/stdint_local.h
index 2c2fa6dd8386..e61982672767 100644
--- a/srcpkgs/xen/files/stdint_local.h
+++ b/srcpkgs/xen/files/stdint_local.h
@@ -1,23 +1,20 @@
+/* Copied from Alpine Linux's aports repo: */
 /* 32 bit int types */
 #ifndef STDINT_LOCAL_H
 #define STDINT_LOCAL_H
-typedef signed char             int8_t;
-typedef short int               int16_t;
-typedef int                     int32_t;
-# if defined(__x86_64__)
-typedef long int                int64_t;
-#else
-typedef long long int           int64_t;
-#endif
+typedef	__INT8_TYPE__		int8_t;
+typedef __INT16_TYPE__		int16_t;
+typedef __INT32_TYPE__		int32_t;
+typedef __INT64_TYPE__		int64_t;
+typedef __INTPTR_TYPE__		intptr_t;
 
 /* Unsigned.  */
-typedef unsigned char           uint8_t;
-typedef unsigned short int      uint16_t;
-typedef unsigned int            uint32_t;
-# if defined(__x86_64__)
-typedef unsigned long int       uint64_t;
-#else
-typedef unsigned long long int  uint64_t;
-#endif
+typedef	__UINT8_TYPE__		uint8_t;
+typedef __UINT16_TYPE__		uint16_t;
+typedef __UINT32_TYPE__		uint32_t;
+typedef __UINT64_TYPE__		uint64_t;
+typedef __UINTPTR_TYPE__	uintptr_t;
 
+#define INTPTR_MAX	0x7fffffffffffffffL
+#define UINTPTR_MAX	0xffffffffffffffffUL
 #endif
diff --git a/srcpkgs/xen/patches/musl-hvmloader-fix-stdint.patch b/srcpkgs/xen/patches/musl-hvmloader-fix-stdint.patch
new file mode 100644
index 000000000000..0579d595768e
--- /dev/null
+++ b/srcpkgs/xen/patches/musl-hvmloader-fix-stdint.patch
@@ -0,0 +1,190 @@
+(patch from Alpine Linux's aports repository)
+musl's stdint does not support gcc -m32 so we need to make sure that we
+don't use system's stdint.h. We ship a stdind_local.h and make sure that
+we use that instead
+
+https://bugs.alpinelinux.org/issues/3308
+
+diff --git a/tools/firmware/Rules.mk b/tools/firmware/Rules.mk
+index 26bbddc..efad58c 100644
+--- a/tools/firmware/Rules.mk
++++ b/tools/firmware/Rules.mk
+@@ -12,6 +12,7 @@ CFLAGS += -DNDEBUG
+ endif
+ 
+ CFLAGS += -Werror
++CFLAGS += -I$(XEN_ROOT)/tools/firmware
+ 
+ $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))
+ 
+diff --git a/tools/firmware/hvmloader/32bitbios_support.c b/tools/firmware/hvmloader/32bitbios_support.c
+index 1141350..0ba9d38 100644
+--- a/tools/firmware/hvmloader/32bitbios_support.c
++++ b/tools/firmware/hvmloader/32bitbios_support.c
+@@ -20,8 +20,8 @@
+  * this program; If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+-#include <inttypes.h>
+-#include <elf.h>
++#include <stdint_local.h>
++#include <elf_local.h>
+ #ifdef __sun__
+ #include <sys/machelf.h>
+ #endif
+diff --git a/tools/firmware/hvmloader/config.h b/tools/firmware/hvmloader/config.h
+index 844120b..8cb799f 100644
+--- a/tools/firmware/hvmloader/config.h
++++ b/tools/firmware/hvmloader/config.h
+@@ -1,7 +1,7 @@
+ #ifndef __HVMLOADER_CONFIG_H__
+ #define __HVMLOADER_CONFIG_H__
+ 
+-#include <stdint.h>
++#include <stdint_local.h>
+ #include <stdbool.h>
+ 
+ enum virtual_vga { VGA_none, VGA_std, VGA_cirrus, VGA_pt };
+diff --git a/tools/firmware/hvmloader/hypercall.h b/tools/firmware/hvmloader/hypercall.h
+index 5368c30..c57bc86 100644
+--- a/tools/firmware/hvmloader/hypercall.h
++++ b/tools/firmware/hvmloader/hypercall.h
+@@ -31,7 +31,7 @@
+ #ifndef __HVMLOADER_HYPERCALL_H__
+ #define __HVMLOADER_HYPERCALL_H__
+ 
+-#include <stdint.h>
++#include <stdint_local.h>
+ #include <xen/xen.h>
+ #include "config.h"
+ 
+diff --git a/tools/firmware/hvmloader/mp_tables.c b/tools/firmware/hvmloader/mp_tables.c
+index d207ecb..6dae38a 100644
+--- a/tools/firmware/hvmloader/mp_tables.c
++++ b/tools/firmware/hvmloader/mp_tables.c
+@@ -27,7 +27,7 @@
+  * this program; If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+-#include <stdint.h>
++#include <stdint_local.h>
+ #include "config.h"
+ 
+ /* number of non-processor MP table entries */
+diff --git a/tools/firmware/hvmloader/option_rom.h b/tools/firmware/hvmloader/option_rom.h
+index 0fefe08..66a93bc 100644
+--- a/tools/firmware/hvmloader/option_rom.h
++++ b/tools/firmware/hvmloader/option_rom.h
+@@ -1,7 +1,7 @@
+ #ifndef __HVMLOADER_OPTION_ROM_H__
+ #define __HVMLOADER_OPTION_ROM_H__
+ 
+-#include <stdint.h>
++#include <stdint_local.h>
+ 
+ struct option_rom_header {
+     uint8_t signature[2]; /* "\x55\xaa" */
+diff --git a/tools/firmware/hvmloader/pir_types.h b/tools/firmware/hvmloader/pir_types.h
+index 9f9259c..7c004c8 100644
+--- a/tools/firmware/hvmloader/pir_types.h
++++ b/tools/firmware/hvmloader/pir_types.h
+@@ -23,7 +23,7 @@
+ #ifndef PIR_TYPES_H
+ #define PIR_TYPES_H
+ 
+-#include <stdint.h>
++#include <stdint_local.h>
+ 
+ #define NR_PIR_SLOTS 6
+ 
+diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/smbios.c
+index 97a054e..e1646ee 100644
+--- a/tools/firmware/hvmloader/smbios.c
++++ b/tools/firmware/hvmloader/smbios.c
+@@ -19,7 +19,7 @@
+  * Authors: Andrew D. Ball <aball@us.ibm.com>
+  */
+ 
+-#include <stdint.h>
++#include <stdint_local.h>
+ #include <xen/xen.h>
+ #include <xen/version.h>
+ #include "smbios_types.h"
+diff --git a/tools/firmware/hvmloader/smbios_types.h b/tools/firmware/hvmloader/smbios_types.h
+index 7c648ec..6ea0dc8 100644
+--- a/tools/firmware/hvmloader/smbios_types.h
++++ b/tools/firmware/hvmloader/smbios_types.h
+@@ -25,7 +25,7 @@
+ #ifndef SMBIOS_TYPES_H
+ #define SMBIOS_TYPES_H
+ 
+-#include <stdint.h>
++#include <stdint_local.h>
+ 
+ /* SMBIOS entry point -- must be written to a 16-bit aligned address
+    between 0xf0000 and 0xfffff. 
+diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
+index 7da144b..5a96608 100644
+--- a/tools/firmware/hvmloader/util.c
++++ b/tools/firmware/hvmloader/util.c
+@@ -24,7 +24,7 @@
+ #include "vnuma.h"
+ #include <acpi2_0.h>
+ #include <libacpi.h>
+-#include <stdint.h>
++#include <stdint_local.h>
+ #include <xen/xen.h>
+ #include <xen/memory.h>
+ #include <xen/sched.h>
+diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h
+index 31889de..4f32283 100644
+--- a/tools/firmware/hvmloader/util.h
++++ b/tools/firmware/hvmloader/util.h
+@@ -2,7 +2,7 @@
+ #define __HVMLOADER_UTIL_H__
+ 
+ #include <stdarg.h>
+-#include <stdint.h>
++#include <stdint_local.h>
+ #include <stddef.h>
+ #include <stdbool.h>
+ #include <xen/xen.h>
+diff --git a/tools/firmware/rombios/32bit/pmm.c b/tools/firmware/rombios/32bit/pmm.c
+index 09fec42..133cab7 100644
+--- a/tools/firmware/rombios/32bit/pmm.c
++++ b/tools/firmware/rombios/32bit/pmm.c
+@@ -62,7 +62,7 @@
+  *     }
+  */
+ 
+-#include <stdint.h>
++#include <stdint_local.h>
+ #include <stddef.h>
+ #include "config.h"
+ #include "e820.h"
+diff --git a/tools/firmware/rombios/32bit/util.c b/tools/firmware/rombios/32bit/util.c
+index 6c1c480..52c5878 100644
+--- a/tools/firmware/rombios/32bit/util.c
++++ b/tools/firmware/rombios/32bit/util.c
+@@ -17,7 +17,7 @@
+  * this program; If not, see <http://www.gnu.org/licenses/>.
+  */
+ #include <stdarg.h>
+-#include <stdint.h>
++#include <stdint_local.h>
+ #include "rombios_compat.h"
+ #include "util.h"
+ 
+diff --git a/tools/libacpi/acpi2_0.h b/tools/libacpi/acpi2_0.h
+index 2619ba3..c0498ca 100644
+--- a/tools/libacpi/acpi2_0.h
++++ b/tools/libacpi/acpi2_0.h
+@@ -14,7 +14,7 @@
+ #ifndef _ACPI_2_0_H_
+ #define _ACPI_2_0_H_
+ 
+-#include <stdint.h>
++#include <stdint_local.h>
+ #include <xen/xen.h>
+ #include <xen/hvm/ioreq.h>
+ 
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index 5e6381480e37..8b6649410d00 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
-version=4.14.0
-revision=4
+version=4.14.1
+revision=1
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
 # TODO: arm / aarch64
@@ -23,11 +23,21 @@ homepage="https://www.xenproject.org/"
 distfiles="
  https://downloads.xenproject.org/release/xen/${version}/${pkgname}-${version}.tar.gz
  https://github.com/ipxe/ipxe/archive/${_git_tag_ipxe}.tar.gz"
-checksum="
- 06839f68ea7620669dbe8b67861213223cc2a7d02ced61b56e5249c50e87f035
+checksum="cf0d7316ad674491f49b7ef0518cb1d906a2e3bfad639deef0ef2343b119ac0c
  4850691d6f196eaf4d6210f2de01383251b3ea1b928141da9ce28c0b06a90938"
 skip_extraction="${_git_tag_ipxe}.tar.gz"
 nopie=yes
+patch_args='-Np1'
+ignore_elf_dirs="/usr/share/xen/qemu /usr/share/qemu-xen/qemu"
+nostrip_files="
+ hppa-firmware.img
+ u-boot.e500
+ openbios-ppc
+ openbios-sparc32
+ openbios-sparc64
+ palcode-clipper
+ s390-ccw.img
+ s390-netboot.img"
 
 build_options="stubdom"
 build_options_default="stubdom"
@@ -90,19 +100,6 @@ conf_files="
  /etc/conf.d/xendomains
  /etc/conf.d/xencommons
  /etc/xen/xl.conf"
-nostrip_files="
- hppa-firmware.img
- u-boot.e500
- openbios-ppc
- openbios-sparc32
- openbios-sparc64
- palcode-clipper
- s390-ccw.img
- s390-netboot.img"
-ignore_elf_files="
- /usr/share/xen/qemu/openbios-ppc
- /usr/share/xen/qemu/openbios-sparc64
- /usr/share/xen/qemu/openbios-sparc32"
 
 post_extract() {
 	local _src="${XBPS_SRCDISTDIR}/${pkgname}-${version}"
@@ -144,6 +141,7 @@ do_configure() {
 	# Silence a stream edit for dependencies
 	vsed -i Config.mk -e 's;sed ";@&;'
 	cp -a ${FILESDIR}/*.h ${wrksrc}/tools/firmware
+	cp -a ${FILESDIR}/stdint_local.h ${wrksrc}/tools/libxl/
 	rm -f ${XBPS_WRAPPERDIR}/strip
 	./autogen.sh
 	./configure ${configure_args}
@@ -168,9 +166,6 @@ do_install() {
 	# Remove useless stuff.
 	rm -rf ${DESTDIR}/etc/init.d ${DESTDIR}/usr/local
 	rm -f ${DESTDIR}/install.sh
-	if [ -d ${DESTDIR}/usr/lib64/efi ]; then
-		mv -v ${DESTDIR}/usr/lib64/efi ${DESTDIR}/usr/lib/
-	fi
 	rm -rf ${DESTDIR}/usr/lib64
 	rm -rf ${DESTDIR}/usr/bin/qemu-*-xen
 	rm -f ${DESTDIR}/boot/xen{,-4,-4.3}.gz
@@ -197,10 +192,6 @@ do_install() {
 	rm -f ${DESTDIR}/usr/share/doc/xen/html/man/{xmdomain.cfg,xend-config.sxp}.5.html
 	rm -f ${DESTDIR}/usr/share/examples/xen/xmexample*
 
-	# Move usr/share/qemu-xen/qemu to usr/libexec/qemu-xen/qemu
-	mkdir -p ${DESTDIR}/usr/libexec/qemu-xen
-	mv -v ${DESTDIR}/usr/{share,libexec}/qemu-xen/qemu
-
 	# runit services
 	vsv xen
 	vsv xenconsoled

From fcc0982fd8135bd403c387645e784cf6011efd8c Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@ae-design.ws>
Date: Tue, 5 Jan 2021 15:27:48 +0100
Subject: [PATCH 0114/3482] hexchat: change depends from enchant to enchant2

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index de331d9b7b9f..b0dd3fbbf170 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,7 +1,7 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=3
+revision=4
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
@@ -10,7 +10,7 @@ hostmakedepends="gettext pkg-config glib-devel"
 makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
-depends="desktop-file-utils enchant"
+depends="desktop-file-utils enchant2"
 short_desc="GTK+ based IRC client successor of Xchat"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 975d623508103617dd9462eb3242b250e6c12d89 Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@ae-design.ws>
Date: Wed, 6 Jan 2021 12:34:28 +0100
Subject: [PATCH 0115/3482] balsa: replace enchant with gspell

---
 srcpkgs/balsa/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/balsa/template b/srcpkgs/balsa/template
index 76db1624f981..255ae0f226a5 100644
--- a/srcpkgs/balsa/template
+++ b/srcpkgs/balsa/template
@@ -1,12 +1,12 @@
 # Template file for 'balsa'
 pkgname=balsa
 version=2.6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-gnome --with-libsecret --with-gpgme --with-sqlite
- --with-html-widget=webkit2"
+ --with-html-widget=webkit2 --with-spell-checker=gspell"
 hostmakedepends="automake gettext-devel intltool pkg-config"
-makedepends="enchant-devel gmime3-devel gnutls-devel gpgme-devel iso-codes
+makedepends="gspell-devel gmime3-devel gnutls-devel gpgme-devel iso-codes
  libesmtp-devel libnotify-devel libsecret-devel webkit2gtk-devel libical-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Email client for GNOME"

From 972a5d40bf244ef23309cf6b6c71c4a61601e11f Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@ae-design.ws>
Date: Wed, 6 Jan 2021 14:47:35 +0100
Subject: [PATCH 0116/3482] python3-enchant: replace enchant with enchant2

By ericonr:
- switch to GH distfiles, which include tests
- fix tests

Closes: #27716 [via git-merge-pr]
---
 srcpkgs/python3-enchant/template | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/python3-enchant/template b/srcpkgs/python3-enchant/template
index cb44e98880b4..f7593aef017f 100644
--- a/srcpkgs/python3-enchant/template
+++ b/srcpkgs/python3-enchant/template
@@ -1,18 +1,16 @@
 # Template file for 'python3-enchant'
 pkgname=python3-enchant
 version=3.1.1
-revision=2
+revision=3
 wrksrc="pyenchant-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools enchant-devel"
-depends="enchant"
+hostmakedepends="python3-setuptools enchant2-devel"
+depends="enchant2"
+# needs an en_US dict to run
+checkdepends="$depends python3-pytest python3-pytest-cov hunspell-en_US"
 short_desc="Spellchecking library for Python 3"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
 homepage="https://github.com/rfk/pyenchant"
-distfiles="${PYPI_SITE}/p/pyenchant/pyenchant-${version}.tar.gz"
-checksum=ce0915d7acd771fde6e8c2dce8ad0cb0e6f7c4fa8430cc96e3e7134e99aeb12f
-
-do_check() {
-	: GtkSpellCheckerDialog is Python 2 only, at least in my understand
-}
+distfiles="https://github.com/pyenchant/pyenchant/archive/v${version}.tar.gz"
+checksum=ced3a776116e63ed7e496401ed23ac4ba52ac7942cd808492e8e654b27dccacd

From 57c63a7a674e09eeb9ccbbea31a1284d1fca7fa3 Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@ae-design.ws>
Date: Wed, 6 Jan 2021 13:46:21 +0100
Subject: [PATCH 0117/3482] lyx: update to 2.3.6.1 and replace old enchant

---
 srcpkgs/lyx/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lyx/template b/srcpkgs/lyx/template
index 7bac08ea7822..96dad71fe07e 100644
--- a/srcpkgs/lyx/template
+++ b/srcpkgs/lyx/template
@@ -1,16 +1,16 @@
 # Template file for 'lyx'
 pkgname=lyx
-version=2.3.6
+version=2.3.6.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-qt5 --without-included-mythes --without-included-boost"
 hostmakedepends="pkg-config bc qt5-devel"
-makedepends="file-devel boost-devel mythes-devel enchant-devel qt5-svg-devel"
+makedepends="file-devel boost-devel mythes-devel enchant2-devel qt5-svg-devel"
 depends="virtual?tex GraphicsMagick python3"
 short_desc="Document Processor WYSIWYM Editor & Latex frontend"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.lyx.org/Home"
 distfiles="https://ftp.lip6.fr/pub/lyx/stable/2.3.x/${pkgname}-${version}.tar.gz"
-checksum=6cd22594f2dc1e7c4860a97e3340513ab7a82899cd5e824bbaa2a147aa122932
+checksum=6d6f5458ebaac644cdfa35114d029e9ec57b4d930268d6d40bd9795d5c7e7929
 python_version=3

From 153550640ae3511caa7668689c21fb0edb7bace9 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 8 Dec 2020 15:58:26 -0600
Subject: [PATCH 0118/3482] castero: Add missing runtime deps

---
 srcpkgs/castero/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/castero/template b/srcpkgs/castero/template
index d0a29a1c6720..9cf9b3031566 100644
--- a/srcpkgs/castero/template
+++ b/srcpkgs/castero/template
@@ -1,11 +1,11 @@
 # Template file for 'castero'
 pkgname=castero
 version=0.8.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-BeautifulSoup4 python3-cjkwrap
- python3-mpv python3-requests"
+depends="python3-BeautifulSoup4 python3-cjkwrap python3-gevent
+ python3-grequests python3-mpv python3-requests python3-zope.event"
 short_desc="TUI podcast client for the terminal"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="MIT"

From e4ceefeace2f40d84efb0e161e5258605bd92e30 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 8 Dec 2020 16:21:48 -0600
Subject: [PATCH 0119/3482] New package: python3-grequests-0.6.0

---
 srcpkgs/python3-grequests/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-grequests/template

diff --git a/srcpkgs/python3-grequests/template b/srcpkgs/python3-grequests/template
new file mode 100644
index 000000000000..7343ca6928d4
--- /dev/null
+++ b/srcpkgs/python3-grequests/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-grequests'
+pkgname=python3-grequests
+version=0.6.0
+revision=1
+wrksrc="grequests-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-gevent python3-requests"
+checkdepends="${depends} python3-nose"
+short_desc="Asynchronus HTTP requests with gevent"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/spyoungtech/grequests"
+distfiles="https://github.com/spyoungtech/grequests/archive/v${version}.tar.gz"
+checksum=8c4a7c004d6f01a44bb84069043b1d266228af238a4d4f2ea6f6bbdd4c37ee0e
+
+post_install() {
+	vlicense LICENSE
+}

From 84df9b287ae0f33df755e987f0b6228d30b49516 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 8 Dec 2020 16:29:17 -0600
Subject: [PATCH 0120/3482] python3-gevent: update to 20.9.0.

---
 srcpkgs/python3-gevent/patches/setup_py.patch | 18 ------------------
 srcpkgs/python3-gevent/template               |  4 ++--
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/python3-gevent/patches/setup_py.patch

diff --git a/srcpkgs/python3-gevent/patches/setup_py.patch b/srcpkgs/python3-gevent/patches/setup_py.patch
deleted file mode 100644
index 4aaecb30a60b..000000000000
--- a/srcpkgs/python3-gevent/patches/setup_py.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- setup.py.orig	2018-06-08 12:56:05.000000000 +0200
-+++ setup.py	2018-06-09 18:13:19.783191927 +0200
-@@ -306,15 +306,6 @@
- 
- 
- def run_setup(ext_modules, run_make):
--    if run_make:
--        if (not LIBEV_EMBED and not WIN and cffi_modules) or PYPY:
--            # We're not embedding libev but we do want
--            # to build the CFFI module. We need to configure libev
--            # because the CORE Extension won't.
--            # TODO: Generalize this.
--            if LIBEV_CFFI_MODULE in cffi_modules and not WIN:
--                system(libev_configure_command)
--
-     setup(
-         name='gevent',
-         version=__version__,
diff --git a/srcpkgs/python3-gevent/template b/srcpkgs/python3-gevent/template
index fad5556530b9..ce71112dc99c 100644
--- a/srcpkgs/python3-gevent/template
+++ b/srcpkgs/python3-gevent/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-gevent'
 pkgname=python3-gevent
-version=1.4.0
+version=20.9.0
 revision=4
 wrksrc="gevent-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.gevent.org/"
 distfiles="https://github.com/gevent/gevent/archive/${version}.tar.gz"
-checksum=7dee57c362240b3c15d2f9c50d4b0bb13f4cca25a9fe7adf3ae7c76ddc5e73f4
+checksum=a43d6b8335eae4d1ebb3f9585bcb78c397c6f1f141eb2449838167cbb4a40ee3
 
 export LIBEV_EMBED=0
 export CARES_EMBED=0

From 751648b77953bd1827af4163878c610c876b5e58 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 8 Dec 2020 16:44:50 -0600
Subject: [PATCH 0121/3482] python3-pyinfra: Add missing runtime dep

---
 srcpkgs/python3-pyinfra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index da7abbf01fcb..5eb2c77c2c0e 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,13 +1,13 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
 version=1.3.3
-revision=1
+revision=2
 wrksrc="pyinfra-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-Jinja2 python3-click python3-colorama python3-dateutil
- python3-docopt python3-gevent python3-paramiko python3-pywinrm python3-six
- python3-yaml"
+ python3-distro python3-docopt python3-gevent python3-paramiko python3-pywinrm
+ python3-six python3-yaml"
 short_desc="Automate infrastructure super fast at massive scale"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"

From 49ded64d23bf1e123f8368d29b25767185385e78 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Mon, 18 Jan 2021 22:23:31 -0800
Subject: [PATCH 0122/3482] python3-pycryptodomex: update to 3.9.9.

---
 srcpkgs/python3-pycryptodomex/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pycryptodomex/template b/srcpkgs/python3-pycryptodomex/template
index 0e7c5327177c..9c6234007523 100644
--- a/srcpkgs/python3-pycryptodomex/template
+++ b/srcpkgs/python3-pycryptodomex/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pycryptodomex'
 pkgname=python3-pycryptodomex
-version=3.9.8
-revision=2
+version=3.9.9
+revision=1
 wrksrc="pycryptodomex-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="Public Domain, BSD-2-Clause"
 homepage="https://www.pycryptodome.org/"
 changelog="https://raw.githubusercontent.com/Legrandin/pycryptodome/master/Changelog.rst"
 distfiles="${PYPI_SITE}/p/pycryptodomex/pycryptodomex-${version}.tar.gz"
-checksum=48cc2cfc251f04a6142badeb666d1ff49ca6fdfc303fd72579f62b768aaa52b9
+checksum=7b5b7c5896f8172ea0beb283f7f9428e0ab88ec248ce0a5b8c98d73e26267d51
 
 post_install() {
 	vlicense LICENSE.rst

From 0b03e999dc8f5fc20be161dc7e1a30b55130c73c Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 19 Jan 2021 08:45:47 +0100
Subject: [PATCH 0123/3482] ed: update to 1.17.

---
 srcpkgs/ed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ed/template b/srcpkgs/ed/template
index d08a86ec40ba..a91b6fadff4a 100644
--- a/srcpkgs/ed/template
+++ b/srcpkgs/ed/template
@@ -1,6 +1,6 @@
 # Template file for 'ed'
 pkgname=ed
-version=1.16
+version=1.17
 revision=1
 build_style=gnu-configure
 hostmakedepends="lzip"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/ed/ed.html"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.lz"
-checksum=cfc07a14ab048a758473ce222e784fbf031485bcd54a76f74acfee1f390d8b2c
+checksum=71de39883c25b6fab44add80635382a10c9bf154515b94729f4a6529ddcc5e54
 
 do_build() {
 	make CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"

From 8e4b31e643a1ae40547d7b0654aa9f2a0b90f5be Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 18 Jan 2021 16:08:51 +0200
Subject: [PATCH 0124/3482] mtools: update to 4.0.26.

---
 srcpkgs/mtools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtools/template b/srcpkgs/mtools/template
index ddce128dd9d6..ee6656642915 100644
--- a/srcpkgs/mtools/template
+++ b/srcpkgs/mtools/template
@@ -1,6 +1,6 @@
 # Template file for 'mtools'
 pkgname=mtools
-version=4.0.25
+version=4.0.26
 revision=1
 build_style=gnu-configure
 makedepends="acl-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/mtools"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=fd161eec3bb7a93d13936db67725ad3e17f2d5f4e6fa8f7667fbc7ac728e2c15
+checksum=539f1c8b476a16e198d8bcb10a5799e22e69de49d854f7dbd85b64c2a45dea1a
 conf_files="/etc/mtools.conf"
 
 post_install() {

From b921a889623affaad3ebebed4e86a572f699cbe4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 18 Jan 2021 13:44:33 +0200
Subject: [PATCH 0125/3482] goodvibes: update to 0.6.2.

---
 srcpkgs/goodvibes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template
index d098fa9fd132..f3b9782ac927 100644
--- a/srcpkgs/goodvibes/template
+++ b/srcpkgs/goodvibes/template
@@ -1,6 +1,6 @@
 # Template file for 'goodvibes'
 pkgname=goodvibes
-version=0.6.1
+version=0.6.2
 revision=1
 wrksrc="goodvibes-v${version}"
 build_style=meson
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.com/goodvibes/goodvibes"
 changelog="https://gitlab.com/goodvibes/goodvibes/-/raw/master/NEWS"
 distfiles="https://gitlab.com/goodvibes/goodvibes/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=f71e8b5a843b53ca24ec93da2c9c402a71ac2a594434636a83a6b8fd5937f228
+checksum=01eb5dd4853e0f38b159b7f46d87507b8c524cb4a29df899961684873eab4fdc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"

From 7d4d60fbde3ccf40fc95d16a9b872dadae64241a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 18 Jan 2021 14:16:48 +0200
Subject: [PATCH 0126/3482] dialog: update to 1.3.20210117.

---
 srcpkgs/dialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index bafc9132ef3b..3a9f39fe1c1b 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,7 +1,7 @@
 # Template file for 'dialog'
 pkgname=dialog
 _distver=1.3
-_date=20201126
+_date=20210117
 version="${_distver}.${_date}"
 revision=1
 wrksrc="${pkgname}-${_distver}-${_date}"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=c9233a6c8ea33a59e2378e5146ae2bd13b519744cfdb647af7420adac5ad3866
+checksum=3c1ed08f44bcf6f159f2aa6fde765db94e8997b3eefb49d8b4c86691693c43e1
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib

From d14c3d1d4397a2b53a1dfd498fa8cfc699218c77 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 18 Jan 2021 13:26:37 +0100
Subject: [PATCH 0127/3482] conky-cli: update to 1.11.6.

---
 srcpkgs/conky-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
index 64e9bc3ba7f7..4dcfd8deb731 100644
--- a/srcpkgs/conky-cli/template
+++ b/srcpkgs/conky-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'conky-cli'
 pkgname=conky-cli
-version=1.11.5
-revision=3
+version=1.11.6
+revision=1
 wrksrc="${pkgname/-cli/}-${version}"
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-3.0-or-later"
 homepage="https://github.com/brndnmtthws/conky"
 distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz"
-checksum=4cefdd92219a90934c28297e4ac7448a3f69d6aeec5d48c5763b23f6b214ef13
+checksum=e7c01e4910744851e05f85f0a0aab3f5068215b1af850515189ac40e7deeb26d
 
 provides="conky-${version}_${revision}"
 conflicts="conky>=0"

From 96534c0c43cf90c954cc51e15515d9fdfab300b8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 18 Jan 2021 16:22:18 +0200
Subject: [PATCH 0128/3482] monocypher: update to 3.1.2.

---
 srcpkgs/monocypher/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monocypher/template b/srcpkgs/monocypher/template
index 2f062513c882..532e4bbb68ac 100644
--- a/srcpkgs/monocypher/template
+++ b/srcpkgs/monocypher/template
@@ -1,14 +1,15 @@
 # Template file for 'monocypher'
 pkgname=monocypher
-version=3.1.1
+version=3.1.2
 revision=1
 build_style=gnu-makefile
 short_desc="Easy to use crypto library inspired by libsodium and TweetNaCl"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://monocypher.org"
+changelog="https://monocypher.org/changelog"
 distfiles="https://monocypher.org/download/monocypher-${version}.tar.gz"
-checksum=ed96874acfe75781cfbe06b049868920f0e9f493ec78e7d6e3879177a8d0af7a
+checksum=f80a2e16d553e4b119634fd0e85ff86fc42afb4c9cc4569077854d1b6f5ef4f9
 
 post_install() {
 	vlicense LICENCE.md

From f1c5465f0dcda0df34f6a968600893c1410b30b4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 18 Jan 2021 16:41:08 +0200
Subject: [PATCH 0129/3482] oil: update to 0.8.6.

---
 srcpkgs/oil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index b68eca52034a..df432c0f2859 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
 # Template file for 'oil'
 pkgname=oil
-version=0.8.4
+version=0.8.6
 revision=1
 build_style=configure
 configure_args="--prefix=/usr $(vopt_with readline)"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.oilshell.org"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=08fd1c6d653ea594a5dcecb7bf40037e683845cf7627129bbeeb4d0b9fe7b879
+checksum=7d7d66888f325f39ff4fd71b6d9ffb13afed2ecdd15ec5f73e07c2eec0712235
 python_version=2
 register_shell="/usr/bin/osh"
 nocross="Binaries doesn't build if cross built"

From 863481f806dbeee176890ce732cc17ab270ac8e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 18 Jan 2021 17:56:30 +0100
Subject: [PATCH 0130/3482] postfix: update to 3.5.9.

---
 srcpkgs/postfix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 2b4785932b43..5722fe15adb7 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,6 +1,6 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.5.8
+version=3.5.9
 revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmysqlclient-devel pcre-devel
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=22582628cf3edc18c5155c9ff44543dd95a9435fb68135d76a99f572cb07456f
+checksum=51ced5a3165a415beba812b6c9ead0496b7172ac6c3beb654d2ccd9a1b00762b
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"

From 9f19256d102d96aef5bbfe9f946ded88a8ad538c Mon Sep 17 00:00:00 2001
From: mojamuto <carlosme@protonmail.ch>
Date: Mon, 18 Jan 2021 18:04:28 +0100
Subject: [PATCH 0131/3482] bleachbit: update to 4.2.0.

---
 srcpkgs/bleachbit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bleachbit/template b/srcpkgs/bleachbit/template
index a7b9c9cbb271..7d79473e667b 100644
--- a/srcpkgs/bleachbit/template
+++ b/srcpkgs/bleachbit/template
@@ -1,6 +1,6 @@
 # Template file for 'bleachbit'
 pkgname=bleachbit
-version=4.1.0
+version=4.2.0
 revision=1
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
@@ -11,5 +11,5 @@ maintainer="graysky <graysky@archlinux.us>"
 license="GPL-3.0-or-later"
 homepage="https://www.bleachbit.org/"
 distfiles="https://github.com/bleachbit/bleachbit/archive/v${version}.tar.gz"
-checksum=0f783a22e1f8197bae6bfe3074875dd6381b16aab7a3cfe5a3fcd65cba1a4f58
+checksum=cc1a6a191c9d43564e8745e2c576a6d30cfe9b994cda7edc67724dee50fe981c
 python_version=3

From a47f96056b46a71859ecfa3e7efbf9e7dd45988b Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Mon, 18 Jan 2021 18:11:55 +0100
Subject: [PATCH 0132/3482] kid3: update to 3.8.4

---
 common/shlibs         | 4 ++--
 srcpkgs/kid3/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a6b5cedc84ed..e98f088266bd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3474,8 +3474,8 @@ libfifechan_opengl.so.0.1.5 fifechan-0.1.5_1
 libpolyclipping.so.22 clipper-6.4.2_1
 libSoapySDR.so.0.7 SoapySDR-0.7.0_1
 libeditorconfig.so.0 editorconfig-0.12.2_1
-libkid3-core.so.3.8.3 kid3-3.8.3_1
-libkid3-gui.so.3.8.3 kid3-3.8.3_1
+libkid3-core.so.3.8.4 kid3-3.8.4_1
+libkid3-gui.so.3.8.4 kid3-3.8.4_1
 libcfitsio.so.9 cfitsio-3.480_1
 libapparmor.so.1 libapparmor-2.12.0_1
 libplacebo.so.72 libplacebo-2.72.0_1
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5c9375b47524..074b992774dd 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,6 +1,6 @@
 # Template file for 'kid3'
 pkgname=kid3
-version=3.8.3
+version=3.8.4
 revision=1
 build_style=cmake
 configure_args="-DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
@@ -19,7 +19,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-only"
 homepage="https://kid3.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/kid3/kid3-${version}.tar.gz"
-checksum=6a1aa06d2f225f6d8a139cfd3c3d382f82170fa17196517690d28caaeb220c44
+checksum=598b843aa32ed9530ebfa9a45424579e622714447f0d67cf36a62e693277bc07
 
 build_options="KDE mp3 mp4 flac vorbis taglib chromaprint"
 build_options_default="mp3 mp4 flac vorbis taglib chromaprint"

From d1db70d17cce3fb00a220d445f0217a3846962cf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 19 Jan 2021 00:20:34 +0200
Subject: [PATCH 0133/3482] xfce4-whiskermenu-plugin: update to 2.5.2.

Closes: #28024 [via git-merge-pr]
---
 srcpkgs/xfce4-whiskermenu-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 85d226fe0400..93a53ee68ad8 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-whiskermenu-plugin'
 pkgname=xfce4-whiskermenu-plugin
-version=2.5.1
+version=2.5.2
 revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config"
@@ -9,6 +9,6 @@ short_desc="Alternate menu for Xfce4"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-whiskermenu-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/master/NEWS"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=b2074f8a9caa766e2d97f0b960ef2f4d1e20dd804497229bc1f0157791896925
+checksum=a6f7070afd1c9020257d8ed7483872643a6cddd76d5d73de107c7fbd981fc515

From aa57b7079fbe733cd6ec6adfaabaf78b03a88e84 Mon Sep 17 00:00:00 2001
From: Ulf <ulf@voidlinux.home>
Date: Mon, 18 Jan 2021 20:10:48 +0000
Subject: [PATCH 0134/3482] python3-chromecast: update to 7.7.2.

No longer requires requests.

Closes: #28023 [via git-merge-pr]
---
 srcpkgs/python3-chromecast/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-chromecast/template b/srcpkgs/python3-chromecast/template
index 97a9cd9c99d9..c018f118050e 100644
--- a/srcpkgs/python3-chromecast/template
+++ b/srcpkgs/python3-chromecast/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-chromecast'
 pkgname=python3-chromecast
-version=7.7.1
+version=7.7.2
 revision=1
 wrksrc="pychromecast-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-requests python3-protobuf python3-zeroconf python3-casttube"
+depends="python3-protobuf python3-zeroconf python3-casttube"
 short_desc="Python3 library to communicate with Google Chromecast"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="MIT"
 homepage="https://github.com/home-assistant-libs/pychromecast"
 distfiles="https://github.com/home-assistant-libs/pychromecast/archive/${version}.tar.gz"
-checksum=933aa7e334c931739a92ae9869cc0f42752177b7abf0e01460a34e611ad8c0ee
+checksum=98aef480168163c26405c16e69458829d7ec62ac9129c0d9c8f2e86a3f83a10e
 
 post_install() {
 	vlicense LICENSE

From fdefdc04d4662f031da7a46d5a5256d7cf383900 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 19 Jan 2021 00:41:22 +0200
Subject: [PATCH 0135/3482] xfce4-appfinder: update to 4.16.1.

Add changelog.

Closes: #28026 [via git-merge-pr]
---
 srcpkgs/xfce4-appfinder/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index c15ca8b10a7f..80c4b0927509 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
-version=4.16.0
-revision=2
+version=4.16.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
@@ -11,5 +11,6 @@ short_desc="Appfinder for the Xfce Desktop Environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
+changelog="https://gitlab.xfce.org/xfce/xfce4-appfinder/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=37b92aaaeeec8220ed23163cf89321168d3b49e0c48b4c10f12dc4a21fdf0954
+checksum=bfe3e9bd92695014ee74a2fbb7f5fd1b4c29cf043c4a11598b8958324c81e7ec

From 2aad4dfbb12430603cbb8a3642542f6877926e83 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 19 Jan 2021 00:35:04 +0200
Subject: [PATCH 0136/3482] garcon: update to 4.16.1.

Closes: #28025 [via git-merge-pr]
---
 srcpkgs/garcon/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index 327595a2f225..18543988ddfe 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,7 +1,7 @@
 # Template file for 'garcon'
 pkgname=garcon
-version=0.8.0
-revision=3
+version=4.16.1
+revision=1
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --with-locales-dir=/usr/share/locale
@@ -13,8 +13,9 @@ short_desc="Glib/GIO freedesktop.org compliant menu implementation"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://xfce.org/"
+changelog="https://gitlab.xfce.org/xfce/garcon/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/garcon/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=4811d89ee5bc48dbdeffd69fc3eec6c112bbf01fde98a9e848335b374a4aa1bb
+checksum=84914927a2c1fda167f67af26a6640630a744a22940df508aa6c752cdbd3d21d
 
 build_options="gir"
 build_options_default="gir"

From 14757effd3210cee0cb7b97fa35b51632aaec84b Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 17 Jan 2021 21:14:24 +0100
Subject: [PATCH 0137/3482] bpytop: update to 1.0.59.

---
 srcpkgs/bpytop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bpytop/template b/srcpkgs/bpytop/template
index 6b0b5474ff41..d1b7362fb732 100644
--- a/srcpkgs/bpytop/template
+++ b/srcpkgs/bpytop/template
@@ -1,6 +1,6 @@
 # Template file for 'bpytop'
 pkgname=bpytop
-version=1.0.57
+version=1.0.59
 revision=1
 build_style=gnu-makefile
 depends="python3-psutil"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aristocratos/bpytop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=50978e17d634a53691a78befb9b177a7aa10dae77fd031076e8ac4345ba24c4f
+checksum=c95d0034ab6567a72d377d12806f5a89f87a796e72b8993fbbb5efc79e5a9133
 
 pre_configure() {
 	vsed -e '/^update_check/s/\$update_check/false/' -i bpytop.py

From 8c865beca7e4e1e6da31c795e212fbfde399f54f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 17 Jan 2021 21:08:40 +0100
Subject: [PATCH 0138/3482] youtube-dl: update to 2021.01.16.

---
 srcpkgs/youtube-dl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index a4e36b7f5e6c..e45004501bb3 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-dl'
 pkgname=youtube-dl
-version=2021.01.08
+version=2021.01.16
 revision=1
 wrksrc="${pkgname}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
 homepage="https://yt-dl.org"
 changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"
 distfiles="${homepage}/downloads/${version}/${pkgname}-${version}.tar.gz"
-checksum=7340448a90ac82dfb2b1b6569f08bd87552b9b1647a81eb735e11dd6d30607cd
+checksum=113a5272c1917d83f1c1e7e54971ab41aa6e22b43ba736f2b66816220bdf17e1
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From b3a4be619e1b56d0dac6ef6612d31b3cbcae30e3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 17 Jan 2021 20:48:59 +0100
Subject: [PATCH 0139/3482] x42-plugins: update to 20210114.

---
 srcpkgs/x42-plugins/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/x42-plugins/template b/srcpkgs/x42-plugins/template
index dc9ab0efa2a0..001e3d36459b 100644
--- a/srcpkgs/x42-plugins/template
+++ b/srcpkgs/x42-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'x42-plugins'
 pkgname=x42-plugins
-version=20200714
+version=20210114
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -9,9 +9,9 @@ makedepends="cairo-devel pango-devel glu-devel jack-devel libsndfile-devel
 short_desc="Collection of LV2 plugins"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/x42/x42-plugins"
+homepage="https://x42-plugins.com"
 distfiles="https://gareus.org/misc/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=746fe07a561392ba8c9c5de75dd3881fcc1de0733f55880238a62378a72f60ab
+checksum=c54880fe4e596c8fd2918f1adb416cc91c2a3f1c4cb5e88574484517ff1ed8e0
 
 pre_build() {
 	export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG"

From 537f0f234918c7ec297dcc7a3afee7d84c69d08c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 20 Jan 2021 00:11:20 +0100
Subject: [PATCH 0140/3482] janet: disable LTO, breaks jpm

---
 srcpkgs/janet/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index abc45fde9bde..77674059ea68 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,8 +1,9 @@
 # Template file for 'janet'
 pkgname=janet
 version=1.14.1
-revision=1
+revision=2
 build_style=meson
+configure_args="-Db_lto=false"  # breaks jpm
 short_desc="Dynamic Lisp dialect and bytecode VM"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"

From 58644a231887b00a2b69d20fb9462923128a9a81 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Tue, 19 Jan 2021 22:45:18 +0100
Subject: [PATCH 0141/3482] options.description: describe openblas option

---
 common/options.description     | 1 +
 srcpkgs/dlib/template          | 1 -
 srcpkgs/python3-numpy/template | 1 -
 srcpkgs/python3-scipy/template | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/options.description b/common/options.description
index 360fc21bca2e..51d3261abf6b 100644
--- a/common/options.description
+++ b/common/options.description
@@ -50,6 +50,7 @@ desc_option_microhttpd="Enable support for microhttpd"
 desc_option_mpcdec="Enable support for the Musepack decoder"
 desc_option_notify="Enable support for desktop notifications (libnotify)"
 desc_option_nvenc="Enable support for NVENC codecs"
+desc_option_openblas="Enable support for OpenBLAS accelerated linear algebra"
 desc_option_opengl="Enable support for OpenGL"
 desc_option_openssl="Enable support for SSL with OpenSSL"
 desc_option_pam="Enable support for PAM"
diff --git a/srcpkgs/dlib/template b/srcpkgs/dlib/template
index 442f3fec8723..bd85c15d64b7 100644
--- a/srcpkgs/dlib/template
+++ b/srcpkgs/dlib/template
@@ -14,7 +14,6 @@ distfiles="https://github.com/davisking/${pkgname}/archive/v${version}.tar.gz"
 checksum=fc3f0986350e8e53aceadf95a71d2f413f1eedc469abda99a462cb528741d411
 
 build_options="openblas x11"
-desc_option_openblas="Enable OpenBlas for performance"
 desc_option_x11="Enable X11 for GUI components"
 build_options_default="openblas x11"
 
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index c4e97ae9172d..ae5a0d095328 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -17,7 +17,6 @@ checksum=43fe3bcdf27a2eb27196a1d140385aeece71c8b1a6eda18d2c6365239e50c60f
 alternatives="numpy:f2py:/usr/bin/f2py3"
 
 build_options="openblas"
-desc_option_openblas="Enable support for openblas accelerated linear algebra"
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|aarch64*|armv[67]*|ppc64*)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 04b11c62dfef..0c778e8ef3ca 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -19,7 +19,6 @@ distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${
 checksum=dd06d02e8ac6e13e973cbab3da63888daf26a4fec1cd8a8d0804ec872864a7f5
 
 build_options="openblas"
-desc_option_openblas="Enable support for openblas accelerated linear algebra"
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|aarch64*|armv[67]*|ppc64*)

From fffd6cac0dc89adee8cb194ebc0e1e15d76894f2 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 17 Jan 2021 20:49:35 +0100
Subject: [PATCH 0142/3482] celluloid: update to 0.20

---
 srcpkgs/celluloid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/celluloid/template b/srcpkgs/celluloid/template
index 3e37c48b2f59..1ad41decbe8b 100644
--- a/srcpkgs/celluloid/template
+++ b/srcpkgs/celluloid/template
@@ -1,6 +1,6 @@
 # Template file for 'celluloid'
 pkgname=celluloid
-version=0.19
+version=0.20
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://celluloid-player.github.io/"
 distfiles="https://github.com/${pkgname}-player/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=5413799506ad82c1ed513e18bee566b814f170364b6f662321f19954759c78e8
+checksum=63798c4cd7da818aef3ddbfed64d67a6db7b14d3774d143db18cefc6aed8524e
 
 gnome-mpv_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7bee58e43a60122d775d8d2fecf0b7163f89d507 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Sun, 17 Jan 2021 10:01:37 -0800
Subject: [PATCH 0143/3482] tintin: update to 2.02.05.

---
 srcpkgs/tintin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tintin/template b/srcpkgs/tintin/template
index 6efe9347c6d5..14fadd6d4dab 100644
--- a/srcpkgs/tintin/template
+++ b/srcpkgs/tintin/template
@@ -1,6 +1,6 @@
 # Template file for 'tintin'
 pkgname=tintin
-version=2.02.01
+version=2.02.05
 revision=1
 wrksrc=tt
 build_wrksrc=src
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://tintin.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/tintin/${pkgname}-${version}.tar.gz"
-checksum=decc933d18f91e0d890e13325d8e9e60eff4238bdf3f431a647dac0c9ad15295
+checksum=63a70052122d24d69d7bc012395745f1a0412dffd456a8e8aab85704d44bd5a1
 
 post_install() {
 	for i in FAQ SCRIPTS README; do

From 4325f230301a6d01cee66f629b66a0b4b87abab6 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 19 Jan 2021 20:39:43 +0000
Subject: [PATCH 0144/3482] python-b2sdk: update to 1.3.0.

---
 srcpkgs/python-b2sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index ab0f4edc4aba..d394714962d3 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -1,7 +1,7 @@
 # Template file for 'python-b2sdk'
 # keep python-b2sdk name to revert this package
 pkgname=python-b2sdk
-version=1.2.0
+version=1.3.0
 revision=1
 wrksrc="b2sdk-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://pypi.org/project/b2sdk"
 distfiles="${PYPI_SITE}/b/b2sdk/b2sdk-${version}.tar.gz"
-checksum=8e46ff9d47a9b90d8b9beab1969fcf4920300b02e20e6bf0745be04e09e8a6ff
+checksum=af53e2449414b772a0bd6fad311d98a171c3693f77ebca933499946e786715ae
 
 post_install() {
 	vlicense LICENSE

From 37a22c51d7b629e09275228bac3adad5db81290f Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 19 Jan 2021 20:40:41 +0000
Subject: [PATCH 0145/3482] backblaze-b2: update to 2.1.0.

---
 srcpkgs/backblaze-b2/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template
index d613b0297fa0..b37ea7673f6d 100644
--- a/srcpkgs/backblaze-b2/template
+++ b/srcpkgs/backblaze-b2/template
@@ -1,7 +1,7 @@
 # Template file for 'backblaze-b2'
 pkgname=backblaze-b2
-version=1.4.2
-revision=5
+version=2.1.0
+revision=1
 wrksrc="b2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/Backblaze/B2_Command_Line_Tool"
 distfiles="${PYPI_SITE}/b/b2/b2-${version}.tar.gz"
-checksum=f0a3baf0a94b4c4cc652c5206a03311516742fe87a0e33b51c06adf3eb89c054
+checksum=fdae4aa7c88c7981ae68784600cc820ab8fd591a2ca6dc7af5e6b4d1549c2080
 replaces="python-b2>=0"
 provides="python-b2-${version}_${revision}"
 

From 2148970336f16c99e1f6be4a4d13b76a276e0382 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 19 Jan 2021 20:41:24 +0000
Subject: [PATCH 0146/3482] bash-preexec: update to 0.4.1.

---
 srcpkgs/bash-preexec/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bash-preexec/template b/srcpkgs/bash-preexec/template
index 71a5f696c128..abb127f50f6d 100644
--- a/srcpkgs/bash-preexec/template
+++ b/srcpkgs/bash-preexec/template
@@ -1,14 +1,14 @@
 # Template file for 'bash-preexec'
 pkgname=bash-preexec
-version=0.3.7
-revision=2
+version=0.4.1
+revision=1
 depends="bash"
 short_desc="Preexec and Precmd functions for Bash just like Zsh"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/rcaloras/bash-preexec"
 distfiles="https://github.com/rcaloras/bash-preexec/archive/${version}.tar.gz"
-checksum=56c33779763f9960dee863f4d87bc58f8da0ad9120b2c60dd12ba61c71c72da4
+checksum=5e6515d247e6156c99a31de6db58e9cbef53071806292a1ca10b7af74633a8c9
 
 do_install() {
 	vbin bash-preexec.sh

From 2d2f20063c06f1daf11929eb61bc07581867d650 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 19 Jan 2021 20:41:49 +0000
Subject: [PATCH 0147/3482] csound: update to 6.15.0.

---
 srcpkgs/csound/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template
index 4539bf3a0877..b4c67632ca8a 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
-version=6.14.0
-revision=2
+version=6.15.0
+revision=1
 build_style=cmake
 configure_args="
  -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1
@@ -17,7 +17,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="https://csound.com/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=bef349c5304b2d3431ef417933b4c9e9469c0a408a4fa4a98acf0070af360a22
+checksum=d47ed0fb70c752cb06ee2655ee9f010d8d1e369fc73d09d2ac2bc1b3060bf724
 
 CFLAGS="-fcommon"
 CXXFLAGS="-Wno-error -fcommon"

From 5dae041faa25afe562b91d7bd88111c87e62ac53 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 19 Jan 2021 20:48:10 +0000
Subject: [PATCH 0148/3482] packer: update to 1.6.6.

---
 srcpkgs/packer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index 2eb02e6aa877..018c81b5b063 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,6 +1,6 @@
 # Template file for 'packer'
 pkgname=packer
-version=1.6.5
+version=1.6.6
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/packer"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="http://www.packer.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=983d20903bf62c3f1e424b67d360cbaa835e3022dc2aa35a0c3bb6a5726c2f82
+checksum=76b2108fce383b558717ce42a23b8bce5f7ab81d7cc64d18a5746d87e0454e43
 replaces="packer-bin>=0"
 
 case "$XBPS_TARGET_MACHINE" in

From b07f53fd1ca42a2688a5149551837c0fef61e2fa Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 19 Jan 2021 23:12:58 +0000
Subject: [PATCH 0149/3482] tbb: update to 2020.U3.

---
 srcpkgs/tbb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index 65886aae299b..aeef6ebdd061 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,7 +1,7 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U1
-revision=2
+version=2020.U3
+revision=1
 # version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
 _ver=${version/./_}
 wrksrc="oneTBB-${_ver}"
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://www.threadingbuildingblocks.org"
 distfiles="https://github.com/oneapi-src/oneTBB/archive/${_ver}.tar.gz"
-checksum=d80ca22c224ab7ef913dfae72c23fc1434b6aa46bfd472916d8c874c90881f5e
+checksum=2103cc6238c935664f87680618f6684d57501d4a2fa8ea8f6c97ad6ff7dc722a
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*)

From 3ef35a7b40f9200529ad886c477f9479b82c70f1 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 19 Jan 2021 23:14:12 +0000
Subject: [PATCH 0150/3482] terraform: update to 0.14.4.

---
 srcpkgs/terraform/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index b6440c9c41d4..788b4b2c78d0 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=0.13.5
+version=0.14.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=c4bdb9e636550795862f13e0ae667a1d381bf2f6cd30c4dde54411afdd07aeab
+checksum=56da03b95c62c849adf5c5397ae4bc3b8cad2ca4ffb26244d3daf90567208e63

From 53d8496aef3a6cdbc3ced8298f2873a8dfcd8bec Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 19 Jan 2021 23:18:14 +0000
Subject: [PATCH 0151/3482] terragrunt: update to 0.27.1.

---
 srcpkgs/terragrunt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 10e6489f66e1..9f1da160a162 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.23.33
+version=0.27.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/$pkgname"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=28e5a3bc2d9ec9ad8a2037680ba28214267ec974f6d8315ad23730c222c6a1fe
+checksum=5cc13d6556b9206335be97a5e8f163c85e2097a44b352c284efb369ea6c0e446
 
 post_install() {
 	vlicense LICENSE.txt

From 88287e9036da0f7fb280f3ad311a30c286b80ba0 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 17 Jan 2021 16:43:49 +0100
Subject: [PATCH 0152/3482] jhead: update to 3.0.4

---
 srcpkgs/jhead/patches/CVE-2018-16554.patch | 20 ----------------
 srcpkgs/jhead/patches/CVE-2018-17088.patch | 27 ----------------------
 srcpkgs/jhead/template                     |  4 ++--
 3 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/jhead/patches/CVE-2018-16554.patch
 delete mode 100644 srcpkgs/jhead/patches/CVE-2018-17088.patch

diff --git a/srcpkgs/jhead/patches/CVE-2018-16554.patch b/srcpkgs/jhead/patches/CVE-2018-16554.patch
deleted file mode 100644
index ba47806e370e..000000000000
--- a/srcpkgs/jhead/patches/CVE-2018-16554.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Ludovic Rousseau <rousseau@debian.org>
-Date: Sat Sep  8 16:19:07 CEST 2018
-Subject: fix heap buffer overflow
-
-Bug-Debian: https://bugs.debian.org/908176
-Description: Fix CVE-2018-16554
-
---- gpsinfo.c
-+++ gpsinfo.c
-@@ -162,7 +162,8 @@
-                 break;
- 
-             case TAG_GPS_ALT:
--                sprintf(ImageInfo.GpsAlt + 1, "%.2fm", 
-+                snprintf(ImageInfo.GpsAlt + 1, sizeof(ImageInfo.GpsAlt) -1,
-+                    "%.2fm",
-                     ConvertAnyFormat(ValuePtr, Format));
-                 break;
-         }
-
diff --git a/srcpkgs/jhead/patches/CVE-2018-17088.patch b/srcpkgs/jhead/patches/CVE-2018-17088.patch
deleted file mode 100644
index 733c7f31bf1a..000000000000
--- a/srcpkgs/jhead/patches/CVE-2018-17088.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Ludovic Rousseau <rousseau@debian.org>
-Date: Wed Sep  5 15:32:00 CEST 2018
-Subject: Fix heap buffer overflow
-
-Bug-Debian: http://bugs.debian.org/907925
-Description: Fix CVE-2018-17088
-
---- gpsinfo.c
-+++ gpsinfo.c
-@@ -4,6 +4,7 @@
- // Matthias Wandel,  Dec 1999 - Dec 2002 
- //--------------------------------------------------------------------------
- #include "jhead.h"
-+#include <stdint.h>
- 
- #define MAX_GPS_TAG 0x1e
- 
-@@ -101,7 +102,7 @@
-             unsigned OffsetVal;
-             OffsetVal = Get32u(DirEntry+8);
-             // If its bigger than 4 bytes, the dir entry contains an offset.
--            if (OffsetVal+ByteCount > ExifLength){
-+            if (OffsetVal > UINT32_MAX - ByteCount || OffsetVal+ByteCount > ExifLength){
-                 // Bogus pointer offset and / or bytecount value
-                 ErrNonfatal("Illegal value pointer for Exif gps tag %04x", Tag,0);
-                 continue;
-
diff --git a/srcpkgs/jhead/template b/srcpkgs/jhead/template
index facb6bc2d7df..e6774d93ea9b 100644
--- a/srcpkgs/jhead/template
+++ b/srcpkgs/jhead/template
@@ -1,6 +1,6 @@
 # Template file for 'jhead'
 pkgname=jhead
-version=3.03
+version=3.04
 revision=1
 build_style=gnu-makefile
 short_desc="Display and manipulate EXIF header of JPEG images"
@@ -8,7 +8,7 @@ maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
 license="Public Domain"
 homepage="http://www.sentex.net/~mwandel/jhead/"
 distfiles="${homepage}/jhead-${version}.tar.gz"
-checksum=82194e0128d9141038f82fadcb5845391ca3021d61bc00815078601619f6c0c2
+checksum=ef89bbcf4f6c25ed88088cf242a47a6aedfff4f08cc7dc205bf3e2c0f10a03c9
 
 post_extract() {
 	sed -i -e 's,/local,,' -e '/CC.*-o/s/$/ $(LDFLAGS)/' makefile

From f9eeed20877040ec6dcda93daaf5550f08efe868 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 17 Jan 2021 21:49:38 +0100
Subject: [PATCH 0153/3482] libstrophe: update to 0.10.1.

removed libressl patch because its supported upstream now
added build option for new c-ares support
added build option for tls
---
 srcpkgs/libstrophe/patches/fix-libressl.patch | 40 -------------------
 srcpkgs/libstrophe/template                   | 14 +++++--
 2 files changed, 10 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/libstrophe/patches/fix-libressl.patch

diff --git a/srcpkgs/libstrophe/patches/fix-libressl.patch b/srcpkgs/libstrophe/patches/fix-libressl.patch
deleted file mode 100644
index a356285ee75b..000000000000
--- a/srcpkgs/libstrophe/patches/fix-libressl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Source: maxice8
-Upstream: not upstreamable
-Reason: Fixes compilation with LibreSSL
-
---- src/tls_openssl.c
-+++ src/tls_openssl.c
-@@ -51,12 +51,8 @@ static void _tls_log_error(xmpp_ctx_t *ctx);
- 
- void tls_initialize(void)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     SSL_library_init();
-     SSL_load_error_strings();
--#else
--    OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
--#endif
- }
- 
- void tls_shutdown(void)
-@@ -120,20 +116,6 @@ tls_t *tls_new(xmpp_conn_t *conn)
-         /* Trust server's certificate when user sets the flag explicitly. */
-         mode = conn->tls_trust ? SSL_VERIFY_NONE : SSL_VERIFY_PEER;
-         SSL_set_verify(tls->ssl, mode, 0);
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
--        /* Hostname verification is supported in OpenSSL 1.0.2 and newer. */
--        X509_VERIFY_PARAM *param = SSL_get0_param(tls->ssl);
--
--        /*
--         * Allow only complete wildcards.  RFC 6125 discourages wildcard usage
--         * completely, and lists internationalized domain names as a reason
--         * against partial wildcards.
--         * See https://tools.ietf.org/html/rfc6125#section-7.2 for more information.
--         */
--        X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
--        X509_VERIFY_PARAM_set1_host(param, conn->domain, 0);
--#endif
--
-         ret = SSL_set_fd(tls->ssl, conn->sock);
-         if (ret <= 0)
-             goto err_free_ssl;
diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 08b98ba8067b..4d90ded8f475 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,16 +1,22 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
-version=0.9.3
-revision=2
+version=0.10.1
+revision=1
 build_style=gnu-configure
+configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
-makedepends="expat-devel libressl-devel zlib-devel"
+makedepends="$(vopt_if cares c-ares-devel) expat-devel
+ $(vopt_if tls libressl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="http://strophe.im/libstrophe/"
+changelog="https://raw.githubusercontent.com/strophe/libstrophe/master/ChangeLog"
 distfiles="https://github.com/strophe/libstrophe/archive/${version}.tar.gz"
-checksum=8a3b79f62177ed59c01d4d4108357ff20bd933d53b845ee4e350d304c051a4fe
+checksum=5bf0bbc555cb6059008f1b748370d4d2ee1e1fabd3eeab68475263556405ba39
+
+build_options="cares tls"
+build_options_default="tls"
 
 pre_configure() {
 	NOCONFIGURE=1 ./bootstrap.sh

From a2cdafe611ff8d7df1308bc5a3c4fccc8b777a96 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 17 Jan 2021 22:03:00 +0100
Subject: [PATCH 0154/3482] profanity: update to 0.10.0.

---
 srcpkgs/profanity/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template
index 88c75ab5f2fc..338e3092a675 100644
--- a/srcpkgs/profanity/template
+++ b/srcpkgs/profanity/template
@@ -1,7 +1,7 @@
 # Template file for 'profanity'
 pkgname=profanity
-version=0.9.5
-revision=3
+version=0.10.0
+revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable notify notifications) $(vopt_enable otr)
  $(vopt_enable pgp) $(vopt_enable python python-plugins) $(vopt_enable plugins)
@@ -18,8 +18,9 @@ short_desc="Console based XMPP client"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
 homepage="https://profanity-im.github.io/"
+changelog="https://raw.githubusercontent.com/profanity-im/profanity/master/CHANGELOG"
 distfiles="https://github.com/boothj5/profanity/releases/download/${version}/profanity-${version}.tar.gz"
-checksum=23f7b2e5c6cf85913b9e7a228802bca9ecb1d1cf3bf8f8f285e9676176a24902
+checksum=4a05e32590f9ec38430e33735bd02cfa199b257922b4116613f23912ca39ff8c
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)

From 705698f99cc8409c22432925ae0e8022773fd451 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 17 Jan 2021 11:43:18 +0100
Subject: [PATCH 0155/3482] leocad: update to 21.01.

---
 srcpkgs/leocad/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/leocad/template b/srcpkgs/leocad/template
index 4202da76a8bf..fa8a093c6c05 100644
--- a/srcpkgs/leocad/template
+++ b/srcpkgs/leocad/template
@@ -1,8 +1,8 @@
 # Template file for 'leocad'
 pkgname=leocad
-version=19.07.1
-revision=3
-_lib_version=14384
+version=21.01
+revision=1
+_lib_version=20.03
 build_style=qmake
 configure_args="DISABLE_UPDATE_CHECK=1"
 hostmakedepends="qt5-tools-devel unzip"
@@ -12,9 +12,9 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only, CC-BY-2.0"
 homepage="http://leocad.org"
 distfiles="https://github.com/leozide/${pkgname}/archive/v${version}.tar.gz
- https://github.com/leozide/leocad/releases/download/v${version}/Library-Linux-${_lib_version}.zip"
-checksum="b74557e00366f1d3ddc211f9e55c28dba39987d66e5e3106490ab5fb75d25bc0
- 6bec1e45b464545fab866fcf7842d7e659521d418d7e7391f5f5cf574a4bd4e8"
+ https://github.com/leozide/leocad/releases/download/v${version}/Library-${_lib_version}.zip"
+checksum="d57576ced3855e1b57aa7e310c81929505db57e88a891094972579b2481bf0d6
+ 88d6d28b3a494a15ae63e984c1e732e28362fabc2e145ffab828fed2eb5e3632"
 
 leocad-data_package() {
 	short_desc+=" - data files"

From 391f36b9b259b503a541e6f742cad2c43c7d349a Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Wed, 13 Jan 2021 21:41:21 +0600
Subject: [PATCH 0156/3482] pgbouncer: update to 1.15.0.

Fix tests and add changelog.

Closes: #27984 [via git-merge-pr]
---
 srcpkgs/pgbouncer/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 8f4213f2a258..6ea13d31c9c7 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,16 +1,22 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
-version=1.14.0
+version=1.15.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"
+checkdepends="which postgresql13 postgresql13-client"
 short_desc="Lightweight connection pooler for PostgreSQL"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="ISC"
 homepage="https://pgbouncer.github.io/"
+changelog="https://raw.githubusercontent.com/pgbouncer/pgbouncer/master/NEWS.md"
 distfiles="https://pgbouncer.github.io/downloads/files/${version}/pgbouncer-${version}.tar.gz"
-checksum=a0c13d10148f557e36ff7ed31793abb7a49e1f8b09aa2d4695d1c28fa101fee7
+checksum=e05a9e158aa6256f60aacbcd9125d3109155c1001a1d1c15d33a37c685d31380
+
+pre_check() {
+	. /etc/profile.d/postgresql13.sh
+}
 
 post_install() {
 	vlicense COPYRIGHT

From 20db1867c69d2baf1b28815e33c53fdc7273802a Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 14 Jan 2021 17:51:17 +0100
Subject: [PATCH 0157/3482] appstream-glib: update to 0.7.18

---
 srcpkgs/appstream-glib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/appstream-glib/template b/srcpkgs/appstream-glib/template
index fccc2072965c..5eaf493d53f6 100644
--- a/srcpkgs/appstream-glib/template
+++ b/srcpkgs/appstream-glib/template
@@ -1,6 +1,6 @@
 # Template file for 'appstream-glib'
 pkgname=appstream-glib
-version=0.7.16
+version=0.7.18
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://people.freedesktop.org/~hughsient/appstream-glib/"
 changelog="https://raw.githubusercontent.com/hughsie/appstream-glib/master/NEWS"
 distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz"
-checksum=04f290d73bc865071112076b8a3345df2730783a16af976fe3becfd2f50d5992
+checksum=ca1ed22e3bde3912cb903aaa7de085d55771da454f1c0573fd9608e1de9c4002
 
 build_options="gir"
 build_options_default="gir"

From 4ad181a3c8f2efa6deff4d9a76842c8d773c7207 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 14 Jan 2021 17:49:08 +0100
Subject: [PATCH 0158/3482] deja-dup: update to 42.7

---
 srcpkgs/deja-dup/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/deja-dup/template b/srcpkgs/deja-dup/template
index d48e19189bdb..4bbc10feae9b 100644
--- a/srcpkgs/deja-dup/template
+++ b/srcpkgs/deja-dup/template
@@ -1,16 +1,22 @@
 # Template file for 'deja-dup'
 pkgname=deja-dup
-version=42.6
+version=42.7
 revision=1
 build_style=meson
 hostmakedepends="appstream-glib dbus glib-devel intltool itstool
  libgpg-error-devel pkg-config vala desktop-file-utils"
 makedepends="gnome-online-accounts-devel json-glib-devel libgpg-error-devel
- libhandy-devel libpeas-devel libsecret-devel libsoup-devel"
+ libhandy1-devel libpeas-devel libsecret-devel libsoup-devel"
 depends="dbus duplicity"
 short_desc="Simple backup tool that uses duplicity as the backend"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/deja-dup"
+changelog="https://gitlab.gnome.org/World/deja-dup/-/raw/main/NEWS.md"
 distfiles="https://gitlab.gnome.org/World/deja-dup/-/archive/${version}/deja-dup-${version}.tar.gz"
-checksum=d035fcc7fc84f17fe101184b3a6bfa5a7dd8f51696a1eee092d6d8d75047d7db
+checksum=e4c4986644f829e72b242278eb4298a54c9264be480d854aac8fd72e492b5593
+
+do_check() {
+	# tests fail
+	:
+}

From f7845164d8fdbbc133cf527974b32b1bb1db1f05 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 14 Jan 2021 16:39:18 +0100
Subject: [PATCH 0159/3482] libhandy1: update to 1.0.3, adopt

---
 srcpkgs/libhandy1/template | 13 +++++--------
 srcpkgs/libhandy1/update   |  3 +--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index 547afccaa11f..b1b7f1f9c32e 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,6 +1,6 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
-version=1.0.0
+version=1.0.3
 revision=1
 wrksrc="libhandy-${version}"
 build_style=meson
@@ -11,20 +11,17 @@ configure_args="-Dexamples=false -Dtests=false $(vopt_bool gir vapi)
  -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
-short_desc="Library full of GTK+ widgets for mobile phones"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="GTK+3 Building blocks for modern adaptive applications"
+maintainer="Paper <paper@tilde.institute>"
 license="LGPL-2.0-or-later"
-homepage="https://source.puri.sm/Librem5/libhandy"
+homepage="https://gitlab.gnome.org/GNOME/libhandy/"
 distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
-checksum=a9398582f47b7d729205d6eac0c068fef35aaf249fdd57eea3724f8518d26699
+checksum=559bb3acc2c362488917eb72ed25bdc181f4ae26ac94d177634cc5d34c867f7a
 
 build_options="gir glade"
 desc_option_glade="Generate glade modules and catalog files"
 build_options_default="gir glade"
 
-# https://gitlab.gnome.org/GNOME/glade/-/commit/bb626dd
-CFLAGS="-DGWA_GET_CLASS=GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS"
-
 libhandy1-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} gtk+3-devel"
 	conflicts="libhandy-devel>=0"
diff --git a/srcpkgs/libhandy1/update b/srcpkgs/libhandy1/update
index bbea94b75ae6..f01319fe1b71 100644
--- a/srcpkgs/libhandy1/update
+++ b/srcpkgs/libhandy1/update
@@ -1,2 +1 @@
-site="https://source.puri.sm/Librem5/libhandy/tags"
-pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'
+pkgname=libhandy

From 2e5677268a3af4f5b12b8d883d55a8588113be8f Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Wed, 13 Jan 2021 22:13:16 +0100
Subject: [PATCH 0160/3482] simage: update to 1.8.1

---
 srcpkgs/simage/template | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/simage/template b/srcpkgs/simage/template
index 7f26620e1dd1..5bbddc3f0f4b 100644
--- a/srcpkgs/simage/template
+++ b/srcpkgs/simage/template
@@ -1,23 +1,20 @@
 # Template file for 'simage'
 pkgname=simage
-version=1.7.0
-revision=2
-build_style=gnu-configure
-# XXX disable gif support since misuse of giflib 5.x API
-#     (3rd param "int *ErrorCode" is missing in all calls)
-configure_args="--without-gif"
-makedepends="libXt-devel libjpeg-turbo-devel libpng-devel tiff-devel jasper-devel
- libsndfile-devel libogg-devel libvorbis-devel"
+version=1.8.1
+revision=1
+wrksrc=simage
+build_style=cmake
+makedepends="libjpeg-turbo-devel libpng-devel tiff-devel jasper-devel
+ libsndfile-devel libvorbis-devel giflib-devel"
 short_desc="Library with image format loaders for image files as texture"
 maintainer="yopito <pierre.bourgin@free.fr>"
-license="GPL-3"
-homepage="https://bitbucket.org/Coin3D/simage"
-distfiles="https://bitbucket.org/Coin3D/coin/downloads/${pkgname}-${version}.tar.gz"
-checksum=c9a0c43e45f825c46941789f5a8f6c3b61da5ac87e4088cb611ac0fead494def
+license="0BSD"
+homepage="https://github.com/coin3d/simage"
+distfiles="https://github.com/coin3d/simage/releases/download/v${version}/simage-${version}-src.tar.gz"
+checksum=a0b85ffa14cc03dcd5e4918dac8982a280df229f7e5758d1c28281920e9f8e74
 
-pre_configure() {
-	sed -i '326s/(setjmp(png_ptr->jmpbuf)/(setjmp(png_jmpbuf(png_ptr))/' \
-	    src/simage_png.c
+post_install() {
+	vlicense LICENSE
 }
 
 simage-devel_package() {
@@ -25,9 +22,8 @@ simage-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/bin
+		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 		vmove /usr/lib/pkgconfig
-		vmove /usr/share/aclocal
 	}
 }

From 8cbd86028f36f909674fc26005cb5c2338804928 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 13 Jan 2021 22:52:21 +0200
Subject: [PATCH 0161/3482] libebml: update to 1.4.1.

---
 srcpkgs/libebml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libebml/template b/srcpkgs/libebml/template
index 9c85bbb6e8b1..6fa20f7667c6 100644
--- a/srcpkgs/libebml/template
+++ b/srcpkgs/libebml/template
@@ -1,6 +1,6 @@
 # Template file for 'libebml'
 pkgname=libebml
-version=1.4.0
+version=1.4.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dl.matroska.org/downloads/libebml/"
 distfiles="https://dl.matroska.org/downloads/libebml/libebml-${version}.tar.xz"
-checksum=80abc9a82549615018798ee704997270a39b43de9a6e7e0d23b62f8ce682c4b3
+checksum=6e94c669405061aa0d25a523b9f1bea8ac73536e37721a110b3372c7f8717032
 
 libebml-devel_package() {
 	depends="libebml>=${version}_${revision}"

From cd054a0aa52bb4cc9549f453147ee66f4b22a10d Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Wed, 13 Jan 2021 16:07:44 -0700
Subject: [PATCH 0162/3482] mesa: update to 20.3.3.

---
 srcpkgs/mesa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index abfaa5031ef7..614f17e76d07 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=20.3.2
+version=20.3.3
 revision=1
 wrksrc="mesa-${version}"
 build_style=meson
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=cce001b685d23afb976b04138714906abcf7e7f996da6355e6a43e5ca486533d
+checksum=f74e212d4838e982a10c203ffa998817d1855c5cf448ae87b58f96edea61d156
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From 5b1d651502e5986086a4d725177b64bfbcbd4a05 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 20 Jan 2021 01:33:48 +0100
Subject: [PATCH 0163/3482] mattermost-desktop: remove

---
 .../files/mattermost-desktop.sh               |  2 -
 .../patches/10-only-build-unpacked.patch      |  7 --
 .../patches/20-create-desktop-file.patch      | 17 -----
 .../patches/30-allow-build-as-root.patch      |  4 --
 srcpkgs/mattermost-desktop/template           | 66 -------------------
 5 files changed, 96 deletions(-)
 delete mode 100644 srcpkgs/mattermost-desktop/files/mattermost-desktop.sh
 delete mode 100644 srcpkgs/mattermost-desktop/patches/10-only-build-unpacked.patch
 delete mode 100644 srcpkgs/mattermost-desktop/patches/20-create-desktop-file.patch
 delete mode 100644 srcpkgs/mattermost-desktop/patches/30-allow-build-as-root.patch
 delete mode 100644 srcpkgs/mattermost-desktop/template

diff --git a/srcpkgs/mattermost-desktop/files/mattermost-desktop.sh b/srcpkgs/mattermost-desktop/files/mattermost-desktop.sh
deleted file mode 100644
index a9e09a37a869..000000000000
--- a/srcpkgs/mattermost-desktop/files/mattermost-desktop.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec electron7 /usr/libexec/mattermost-desktop/app.asar --disable-dev-mode "$@"
diff --git a/srcpkgs/mattermost-desktop/patches/10-only-build-unpacked.patch b/srcpkgs/mattermost-desktop/patches/10-only-build-unpacked.patch
deleted file mode 100644
index 7cbf34356a30..000000000000
--- a/srcpkgs/mattermost-desktop/patches/10-only-build-unpacked.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- electron-builder.json.orig	2020-07-25 12:41:25.091865817 +0300
-+++ electron-builder.json	2020-07-25 12:41:41.889843654 +0300
-@@ -38,3 +38 @@
--      "deb",
--      "tar.gz",
--      "appimage"
-+      "dir"
diff --git a/srcpkgs/mattermost-desktop/patches/20-create-desktop-file.patch b/srcpkgs/mattermost-desktop/patches/20-create-desktop-file.patch
deleted file mode 100644
index c83d76f54150..000000000000
--- a/srcpkgs/mattermost-desktop/patches/20-create-desktop-file.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- electron-builder.json.orig	2020-07-25 12:46:12.470489136 +0300
-+++ electron-builder.json	2020-07-25 12:47:22.490397616 +0300
-@@ -52 +52,2 @@
--          "README.md"
-+          "README.md",
-+          "Mattermost.desktop"
---- resources/linux/Mattermost.desktop.orig	1970-01-01 03:00:00.000000000 +0300
-+++ resources/linux/Mattermost.desktop		2020-07-25 12:49:12.938253258 +0300
-@@ -0,0 +1,8 @@
-+[Desktop Entry]
-+Name=Mattermost
-+Comment=Mattermost Desktop application for Linux
-+Exec=/usr/bin/mattermost-desktop
-+Terminal=false
-+Type=Application
-+Icon=mattermost-desktop
-+Categories=Network;InstantMessaging;
diff --git a/srcpkgs/mattermost-desktop/patches/30-allow-build-as-root.patch b/srcpkgs/mattermost-desktop/patches/30-allow-build-as-root.patch
deleted file mode 100644
index f7ad3d4936ac..000000000000
--- a/srcpkgs/mattermost-desktop/patches/30-allow-build-as-root.patch
+++ /dev/null
@@ -1,4 +0,0 @@
---- .npmrc.orig	1970-01-01 03:00:00.000000000 +0300
-+++ .npmrc	2020-07-25 19:10:22.837221360 +0300
-@@ -0,0 +1 @@
-+unsafe-perm = true
diff --git a/srcpkgs/mattermost-desktop/template b/srcpkgs/mattermost-desktop/template
deleted file mode 100644
index 66ea1136af50..000000000000
--- a/srcpkgs/mattermost-desktop/template
+++ /dev/null
@@ -1,66 +0,0 @@
-# Template file for 'mattermost-desktop'
-pkgname=mattermost-desktop
-version=4.6.0
-revision=1
-archs="x86_64* i686*"
-wrksrc="desktop-${version}"
-# electron-builder needs GNU tar
-hostmakedepends="git p7zip jq nodejs-lts-10 python libicns GraphicsMagick xz tar"
-makedepends="libnotify-devel electron7"
-depends="electron7"
-short_desc="Team messaging app, an open source Slack alternative"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://mattermost.com/"
-distfiles="https://github.com/mattermost/desktop/archive/v${version}.tar.gz"
-checksum=ee1ff93120ed0d296c293950fd00cbd9dcc36a4f5085e1f3abf9c48ccc1e7ce0
-nocross=yes
-
-if [ "$XBPS_LIBC" = "musl" ]; then
-	hostmakedepends+=" gcompat" #XXX: ugly af
-	# Npm fetches a bunch of binaries that are lined against glibc
-	# refuses to use the system one
-	# this also kinda limits the amount of support host archs for the build
-	# can partly fixed by adding some host deps so these tools can be built
-	# from source. In short npm packages are a busted mess that shouldn't exist
-fi
-
-do_configure() {
-	case "${XBPS_TARGET_MACHINE#-musl}" in
-		x86_64*) sed -i 's/--ia32//g' package.json ;;
-		i686*) sed -i 's/--x64//g' package.json ;;
-	esac
-
-	# Prepend to system electron in order to avoid an unneeded download.
-	local electronDist="/usr/lib/electron7"
-	local electronVersion="$(<"$electronDist"/version)"
-	jq '{"electronDist": $electronDist, "electronVersion": $electronVersion} + .' \
-		--arg electronDist "$electronDist" \
-		--arg electronVersion "$electronVersion" \
-		electron-builder.json > electron-builder-new.json
-	mv electron-builder-new.json electron-builder.json
-}
-
-pre_build() {
-	# XXX: Should probably be done in some kind of npm helper
-	export USE_SYSTEM_7ZA="true"
-	npm install
-}
-
-do_build() {
-	export USE_SYSTEM_7ZA="true"
-	npm run build
-	npm run package:linux
-}
-
-do_install() {
-	case $XBPS_TARGET_MACHINE in
-		x86_64*)	cd release/linux-unpacked ;;
-		i686*)		cd release/linux-ia32-unpacked ;;
-	esac
-	vmkdir usr/libexec/${pkgname}
-	vinstall resources/app.asar 644 usr/libexec/${pkgname}
-	vinstall Mattermost.desktop 644 usr/share/applications
-	vinstall icon.svg 644 usr/share/icons/hicolor/scalable/apps mattermost-desktop.svg
-	vbin ${FILESDIR}/mattermost-desktop.sh mattermost-desktop
-}

From 16cefef48dc552862a2663288acbad65deade725 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 20 Jan 2021 01:34:10 +0100
Subject: [PATCH 0164/3482] electron7: remove

---
 ...musl-default-pthread-stacksize.patch.patch |   31 -
 .../chromium-musl-sandbox.patch.patch         |  176 -
 ...um-musl_canonicalize_file_name.patch.patch |   13 -
 .../chromium-musl_cdefs.patch.patch           |   45 -
 ...musl_define_temp_failure_retry.patch.patch |   18 -
 .../chromium-musl_dns.patch.patch             |   61 -
 .../chromium-musl_exeinfo.patch.patch         |   96 -
 .../chromium-musl_fpstate_t.patch.patch       |   48 -
 .../chromium-musl_getcontext.patch.patch      |   25 -
 .../chromium-musl_mallinfo.patch.patch        |   61 -
 .../chromium-musl_pread_pwrite64.patch.patch  |   18 -
 .../chromium-musl_push_back.patch.patch       |   13 -
 .../chromium-musl_si_fields.patch.patch       |   13 -
 .../chromium-musl_stack_size.patch.patch      |   41 -
 .../chromium-musl_stack_trace.patch.patch     |   44 -
 .../chromium-musl_tcp_listen.patch.patch      |   14 -
 .../chromium-musl_wordsize.patch.patch        |   24 -
 .../chromium-musl_xxx_ppc64le.patch           |  187 -
 ...um-001-upstream_chrome_cleaner.patch.patch |   73 -
 ..._logs_from_test_cild_processes.patch.patch |  342 --
 ...pstream_move_child_process_log.patch.patch |  730 ---
 ...pstream_use_childprocesslogger.patch.patch |  186 -
 ...-005-upstream-chromium_version.patch.patch |   26 -
 .../files/patches/chromium-77-clang.patch     |   13 -
 .../patches/chromium-77-pulseaudio-13.patch   |   82 -
 .../patches/chromium-77-system-icu.patch      |   20 -
 .../patches/chromium-78-gcc-alignas.patch     |  102 -
 .../patches/chromium-78-gcc-enum-range.patch  |   46 -
 .../patches/chromium-78-gcc-noexcept.patch    |   32 -
 .../files/patches/chromium-78-icon.patch      |   12 -
 .../files/patches/chromium-78-include.patch   |   40 -
 .../files/patches/chromium-78-pm-crash.patch  |   43 -
 .../patches/chromium-78-protobuf-export.patch |   13 -
 .../chromium-78-revert-noexcept-r1.patch      | 1471 ------
 ...romium-79-gcc-ambiguous-nodestructor.patch |   39 -
 .../patches/chromium-79-gcc-includes.patch    |  102 -
 .../patches/chromium-79-gcc-status-enum.patch |   31 -
 .../files/patches/chromium-79-icu-65.patch    |   13 -
 .../files/patches/chromium-79-icu-67.patch    |  167 -
 ...chromium-chromium_atk_optional.patch.patch |   17 -
 .../chromium-clang10_glslang.patch.patch      |   25 -
 .../files/patches/chromium-compiler-r10.patch |  185 -
 .../patches/chromium-fix-char_traits.patch    |   14 -
 .../chromium-fix-commandline-include.patch    |   44 -
 .../chromium-fix-sucess-definition.patch      |   15 -
 .../files/patches/chromium-gcc-lto.patch      |  131 -
 .../files/patches/chromium-gcc-shared.patch   |   20 -
 .../patches/chromium-gn_bootstrap_ninja.patch |   32 -
 .../files/patches/chromium-libc_malloc.patch  |   26 -
 .../patches/chromium-toolchain-host.patch     |   11 -
 .../patches/chromium-unbundle-zlib-r1.patch   |   13 -
 ...3-files-to-have-a-start-time-of-zero.patch |   38 -
 .../files/patches/chromium-xxx-ppc64le.patch  | 4141 -----------------
 ...a-script-to-list-patch-targets.patch.patch |   42 -
 .../patches/electron-Build-fixes.patch.patch  |   57 -
 ...ectron-dont-assume-python-is-python2.patch |   17 -
 .../files/patches/electron-fix-includes.patch |   19 -
 .../electron-mjsunit-not-exsit.patch.patch    |   47 -
 srcpkgs/electron7/template                    |  341 --
 srcpkgs/electron7/update                      |    2 -
 60 files changed, 9748 deletions(-)
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl-default-pthread-stacksize.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl-sandbox.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl_canonicalize_file_name.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl_cdefs.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl_define_temp_failure_retry.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl_dns.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl_exeinfo.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl_fpstate_t.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl_getcontext.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl_mallinfo.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl_pread_pwrite64.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl_push_back.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl_si_fields.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl_stack_size.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl_stack_trace.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl_tcp_listen.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl_wordsize.patch.patch
 delete mode 100644 srcpkgs/electron7/files/musl-patches/chromium-musl_xxx_ppc64le.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-001-upstream_chrome_cleaner.patch.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-002-upstream_save_logs_from_test_cild_processes.patch.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-003-upstream_move_child_process_log.patch.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-004-upstream_use_childprocesslogger.patch.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-005-upstream-chromium_version.patch.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-77-clang.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-77-pulseaudio-13.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-77-system-icu.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-78-gcc-alignas.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-78-gcc-enum-range.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-78-gcc-noexcept.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-78-icon.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-78-include.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-78-pm-crash.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-78-protobuf-export.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-78-revert-noexcept-r1.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-79-gcc-ambiguous-nodestructor.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-79-gcc-includes.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-79-gcc-status-enum.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-79-icu-65.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-79-icu-67.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-chromium_atk_optional.patch.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-clang10_glslang.patch.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-compiler-r10.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-fix-char_traits.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-fix-commandline-include.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-fix-sucess-definition.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-gcc-lto.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-gcc-shared.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-gn_bootstrap_ninja.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-libc_malloc.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-toolchain-host.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-unbundle-zlib-r1.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-upstream-force-mp3-files-to-have-a-start-time-of-zero.patch
 delete mode 100644 srcpkgs/electron7/files/patches/chromium-xxx-ppc64le.patch
 delete mode 100644 srcpkgs/electron7/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
 delete mode 100644 srcpkgs/electron7/files/patches/electron-Build-fixes.patch.patch
 delete mode 100644 srcpkgs/electron7/files/patches/electron-dont-assume-python-is-python2.patch
 delete mode 100644 srcpkgs/electron7/files/patches/electron-fix-includes.patch
 delete mode 100644 srcpkgs/electron7/files/patches/electron-mjsunit-not-exsit.patch.patch
 delete mode 100644 srcpkgs/electron7/template
 delete mode 100644 srcpkgs/electron7/update

diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl-default-pthread-stacksize.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl-default-pthread-stacksize.patch.patch
deleted file mode 100644
index d0c1361b8ed1..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl-default-pthread-stacksize.patch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/base/threading/platform_thread_linux.cc b/base/threading/platform_thread_linux.cc
-index 095c49b..5044bb8 100644
---- a/base/threading/platform_thread_linux.cc
-+++ b/base/threading/platform_thread_linux.cc
-@@ -186,7 +186,7 @@ void TerminateOnThread() {}
- 
- size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
- #if !defined(THREAD_SANITIZER)
--  return 0;
-+  return (1 << 23);
- #else
-   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
-   // default stack size isn't enough for some browser tests.
-diff --git a/chrome/app/shutdown_signal_handlers_posix.cc b/chrome/app/shutdown_signal_handlers_posix.cc
-index 621d441..be21106 100644
---- a/chrome/app/shutdown_signal_handlers_posix.cc
-+++ b/chrome/app/shutdown_signal_handlers_posix.cc
-@@ -187,11 +187,11 @@ void InstallShutdownSignalHandlers(
-   g_shutdown_pipe_read_fd = pipefd[0];
-   g_shutdown_pipe_write_fd = pipefd[1];
- #if !defined(ADDRESS_SANITIZER)
--  const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
-+  const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2 *8;
- #else
-   // ASan instrumentation bloats the stack frames, so we need to increase the
-   // stack size to avoid hitting the guard page.
--  const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
-+  const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4 *8;
- #endif
-   ShutdownDetector* detector = new ShutdownDetector(
-       g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner);
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl-sandbox.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl-sandbox.patch.patch
deleted file mode 100644
index f485f6cc75af..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl-sandbox.patch.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-index 348ab6e..4550f9e 100644
---- ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -139,21 +139,11 @@ namespace sandbox {
- // present (as in newer versions of posix_spawn).
- ResultExpr RestrictCloneToThreadsAndEPERMFork() {
-   const Arg<unsigned long> flags(0);
--
--  // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
--  const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
--                                     CLONE_SIGHAND | CLONE_THREAD |
--                                     CLONE_SYSVSEM;
--  const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED;
--
--  const uint64_t kGlibcPthreadFlags =
--      CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD |
--      CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID;
--  const BoolExpr glibc_test = flags == kGlibcPthreadFlags;
--
--  const BoolExpr android_test =
--      AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask,
--            flags == kGlibcPthreadFlags);
-+  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
-+                       CLONE_THREAD | CLONE_SYSVSEM;
-+  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
-+                   CLONE_DETACHED;
-+  const BoolExpr thread_clone_ok = (flags&~safe)==required;
- 
-   // The following two flags are the two important flags in any vfork-emulating
-   // clone call. EPERM any clone call that contains both of them.
-@@ -163,7 +153,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
-       AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
-             (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
- 
--  return If(IsAndroid() ? android_test : glibc_test, Allow())
-+  return If(thread_clone_ok, Allow())
-       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
-       .Else(CrashSIGSYSClone());
- }
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-index 7dbcc87..589262f 100644
---- ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -391,6 +391,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #if defined(__i386__)
-     case __NR_waitpid:
- #endif
-+    case __NR_set_tid_address:
-       return true;
-     case __NR_clone:  // Should be parameter-restricted.
-     case __NR_setns:  // Privileged.
-@@ -403,7 +404,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-     case __NR_set_thread_area:
- #endif
--    case __NR_set_tid_address:
-     case __NR_unshare:
- #if !defined(__mips__) && !defined(__aarch64__)
-     case __NR_vfork:
-@@ -513,6 +513,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
-     case __NR_mlock:
-     case __NR_munlock:
-     case __NR_munmap:
-+    case __NR_mremap:
-+    case __NR_membarrier:
-       return true;
-     case __NR_madvise:
-     case __NR_mincore:
-@@ -530,7 +532,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
-     case __NR_modify_ldt:
- #endif
-     case __NR_mprotect:
--    case __NR_mremap:
-     case __NR_msync:
-     case __NR_munlockall:
-     case __NR_readahead:
-diff --git a/sandbox/linux/system_headers/arm64_linux_syscalls.h b/sandbox/linux/system_headers/arm64_linux_syscalls.h
-index 59d0eab..7ae7002 100644
---- ./sandbox/linux/system_headers/arm64_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/arm64_linux_syscalls.h
-@@ -1063,4 +1063,8 @@
- #define __NR_memfd_create 279
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 283
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/arm_linux_syscalls.h b/sandbox/linux/system_headers/arm_linux_syscalls.h
-index 1addd53..7843b5e 100644
---- ./sandbox/linux/system_headers/arm_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/arm_linux_syscalls.h
-@@ -1385,6 +1385,10 @@
- #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_SYSCALL_BASE+389)
-+#endif
-+
- // ARM private syscalls.
- #if !defined(__ARM_NR_BASE)
- #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
-diff --git a/sandbox/linux/system_headers/mips64_linux_syscalls.h b/sandbox/linux/system_headers/mips64_linux_syscalls.h
-index ec75815..612fcfa 100644
---- ./sandbox/linux/system_headers/mips64_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/mips64_linux_syscalls.h
-@@ -1271,4 +1271,8 @@
- #define __NR_memfd_create (__NR_Linux + 314)
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_Linux + 318)
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/mips_linux_syscalls.h b/sandbox/linux/system_headers/mips_linux_syscalls.h
-index ddbf97f..1742acd 100644
---- ./sandbox/linux/system_headers/mips_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/mips_linux_syscalls.h
-@@ -1433,4 +1433,8 @@
- #define __NR_memfd_create (__NR_Linux + 354)
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_Linux + 358)
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/x86_32_linux_syscalls.h b/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-index a6afc62..7ed0a3b 100644
---- ./sandbox/linux/system_headers/x86_32_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/x86_32_linux_syscalls.h
-@@ -1422,5 +1422,9 @@
- #define __NR_memfd_create 356
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 375
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
- 
-diff --git a/sandbox/linux/system_headers/x86_64_linux_syscalls.h b/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-index 349504a..ea3c7c9 100644
---- ./sandbox/linux/system_headers/x86_64_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/x86_64_linux_syscalls.h
-@@ -1290,5 +1290,9 @@
- #define __NR_memfd_create 319
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 324
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
- 
-diff --git a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc b/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-index 017f13c..50aeec3 100644
---- ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-+++ ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-@@ -88,10 +88,10 @@ ResultExpr RendererProcessPolicy::EvaluateSyscall(int sysno) const {
-     case __NR_sysinfo:
-     case __NR_times:
-     case __NR_uname:
--      return Allow();
--    case __NR_sched_getaffinity:
-     case __NR_sched_getparam:
-     case __NR_sched_getscheduler:
-+      return Allow();
-+    case __NR_sched_getaffinity:
-     case __NR_sched_setscheduler:
-       return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno);
-     case __NR_prlimit64:
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl_canonicalize_file_name.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl_canonicalize_file_name.patch.patch
deleted file mode 100644
index 05614daa7576..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl_canonicalize_file_name.patch.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/third_party/nasm/config/config-linux.h b/third_party/nasm/config/config-linux.h
-index 7eb7c20..882b736 100644
---- a/third_party/nasm/config/config-linux.h
-+++ b/third_party/nasm/config/config-linux.h
-@@ -117,7 +117,7 @@
- #define HAVE_ACCESS 1
- 
- /* Define to 1 if you have the `canonicalize_file_name' function. */
--#define HAVE_CANONICALIZE_FILE_NAME 1
-+/* #undef HAVE_CANONICALIZE_FILE_NAME */
- 
- /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */
- /* #undef HAVE_CPU_TO_LE16 */
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl_cdefs.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl_cdefs.patch.patch
deleted file mode 100644
index fc7dc06ff21b..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl_cdefs.patch.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/base/allocator/allocator_shim_internals.h b/base/allocator/allocator_shim_internal
-s.h
-index 0196f89..bb42b5d 100644
---- a/base/allocator/allocator_shim_internals.h
-+++ b/base/allocator/allocator_shim_internals.h
-@@ -7,7 +7,9 @@
-
- #if defined(__GNUC__)
-
-+#if defined(__GLIBC__)
- #include <sys/cdefs.h>  // for __THROW
-+#endif
-
- #ifndef __THROW  // Not a glibc system
- #ifdef _NOEXCEPT  // LLVM libc++ uses noexcept instead
-diff --git a/third_party/libsync/src/include/sync/sync.h b/third_party/libsync/src/include/sync/sync.h
-index 50ed0ac..7552a49 100644
---- a/third_party/libsync/src/include/sync/sync.h
-+++ b/third_party/libsync/src/include/sync/sync.h
-@@ -19,12 +19,13 @@
- #ifndef __SYS_CORE_SYNC_H
- #define __SYS_CORE_SYNC_H
- 
--#include <sys/cdefs.h>
- #include <stdint.h>
- 
- #include <linux/types.h>
- 
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
- 
- struct sync_legacy_merge_data {
-  int32_t fd2;
-@@ -158,6 +159,8 @@ struct sync_pt_info *sync_pt_info(struct sync_fence_info_data *info,
-                                   struct sync_pt_info *itr);
- void sync_fence_info_free(struct sync_fence_info_data *info);
- 
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
- 
- #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl_define_temp_failure_retry.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl_define_temp_failure_retry.patch.patch
deleted file mode 100644
index 61db658f849e..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl_define_temp_failure_retry.patch.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/sandbox/linux/suid/sandbox.c	2019-11-19 09:28:05.000000000 +0800
-+++ b/sandbox/linux/suid/sandbox.c	2020-04-24 11:50:12.719880728 +0800
-@@ -42,6 +42,15 @@
- #define CLONE_NEWNET 0x40000000
- #endif
- 
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                             \
-+    ({ long int __result;                                                    \
-+       do __result = (long int) (expression);                                \
-+       while (__result == -1L && errno == EINTR);                            \
-+       __result; }))
-+#endif
-+
- static bool DropRoot();
- 
- #define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x)
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl_dns.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl_dns.patch.patch
deleted file mode 100644
index f49d8bd0afaf..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl_dns.patch.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
-index 2f94832..2dd1a98 100644
---- a/net/dns/dns_config_service_posix.cc
-+++ b/net/dns/dns_config_service_posix.cc
-@@ -150,7 +150,7 @@ ConfigParsePosixResult ReadDnsConfig(DnsConfig* dns_config) {
- #if !defined(OS_ANDROID)
-   ConfigParsePosixResult result;
- // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
--#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
-+#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || (defined(OS_LINUX) && !defined(__GLIBC__))
-   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
-   // res_init behaves the same way.
-   memset(&_res, 0, sizeof(_res));
-@@ -173,7 +173,7 @@ ConfigParsePosixResult ReadDnsConfig(DnsConfig* dns_config) {
- #else
-   res_nclose(&res);
- #endif  // defined(OS_MACOSX) || defined(OS_FREEBSD)
--#endif  // defined(OS_OPENBSD)
-+#endif  // defined(OS_OPENBSD) || defined(OS_FUCHSIA) || (defined(OS_LINUX) && !defined(__GLIBC__))
- 
- #if defined(OS_MACOSX) && !defined(OS_IOS)
-   ConfigParsePosixResult error = DnsConfigWatcher::CheckDnsConfig();
-diff --git a/net/dns/dns_reloader.cc b/net/dns/dns_reloader.cc
-index 952cff4..4b366f4 100644
---- a/net/dns/dns_reloader.cc
-+++ b/net/dns/dns_reloader.cc
-@@ -4,7 +4,7 @@
- 
- #include "net/dns/dns_reloader.h"
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-+#if defined(OS_POSIX) && defined(__GLIBC__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-     !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
- 
- #include <resolv.h>
-diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
-index e8dea46..c86a830 100644
---- a/net/dns/host_resolver_manager.cc
-+++ b/net/dns/host_resolver_manager.cc
-@@ -2386,7 +2386,7 @@ HostResolverManager::HostResolverManager(
-   NetworkChangeNotifier::AddConnectionTypeObserver(this);
-   if (system_dns_config_notifier_)
-     system_dns_config_notifier_->AddObserver(this);
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-+#if defined(OS_POSIX) && defined(__GLIBC__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-     !defined(OS_ANDROID)
-   EnsureDnsReloaderInit();
- #endif
-diff --git a/net/dns/host_resolver_proc.cc b/net/dns/host_resolver_proc.cc
-index 0824540..3384978 100644
---- a/net/dns/host_resolver_proc.cc
-+++ b/net/dns/host_resolver_proc.cc
-@@ -197,7 +197,7 @@ int SystemHostResolverCall(const std::string& host,
-   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
-                                                 base::BlockingType::WILL_BLOCK);
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-+#if defined(OS_POSIX) && defined(__GLIBC__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-     !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
-   DnsReloaderMaybeReload();
- #endif
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl_exeinfo.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl_exeinfo.patch.patch
deleted file mode 100644
index f1afc7c1b176..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl_exeinfo.patch.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc
-index de2f356..f697c66 100644
---- a/base/debug/stack_trace_posix.cc
-+++ b/base/debug/stack_trace_posix.cc
-@@ -27,7 +27,7 @@
- #if !defined(USE_SYMBOLIZE)
- #include <cxxabi.h>
- #endif
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- #include <execinfo.h>
- #endif
- 
-@@ -86,7 +86,7 @@ void DemangleSymbols(std::string* text) {
-   // Note: code in this function is NOT async-signal safe (std::string uses
-   // malloc internally).
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
-   std::string::size_type search_from = 0;
-   while (search_from < text->size()) {
-     // Look for the start of a mangled symbol, from search_from.
-@@ -121,7 +121,7 @@ void DemangleSymbols(std::string* text) {
-       search_from = mangled_start + 2;
-     }
-   }
--#endif  // !defined(__UCLIBC__) && !defined(_AIX)
-+#endif  // defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- }
- #endif  // !defined(USE_SYMBOLIZE)
- 
-@@ -133,7 +133,7 @@ class BacktraceOutputHandler {
-   virtual ~BacktraceOutputHandler() = default;
- };
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
-   // This should be more than enough to store a 64-bit number in hex:
-   // 16 hex digits + 1 for null-terminator.
-@@ -216,7 +216,7 @@ void ProcessBacktrace(void* const* trace,
-   }
- #endif  // defined(USE_SYMBOLIZE)
- }
--#endif  // !defined(__UCLIBC__) && !defined(_AIX)
-+#endif  // defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- 
- void PrintToStderr(const char* output) {
-   // NOTE: This code MUST be async-signal safe (it's used by in-process
-@@ -828,7 +828,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
-   // NOTE: This code MUST be async-signal safe (it's used by in-process
-   // stack dumping signal handler). NO malloc or stdio is allowed here.
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
-   // Though the backtrace API man page does not list any possible negative
-   // return values, we take no chance.
-   return base::saturated_cast<size_t>(backtrace(trace, count));
-@@ -841,13 +841,13 @@ void StackTrace::PrintWithPrefix(const char* prefix_string) const {
- // NOTE: This code MUST be async-signal safe (it's used by in-process
- // stack dumping signal handler). NO malloc or stdio is allowed here.
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
-   PrintBacktraceOutputHandler handler;
-   ProcessBacktrace(trace_, count_, prefix_string, &handler);
- #endif
- }
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
-                                           const char* prefix_string) const {
-   StreamBacktraceOutputHandler handler(os);
-diff --git a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-index 798f150..97acc7c 100644
---- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-+++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-@@ -14,7 +14,7 @@
- #define ENABLE_CRASH_OVERRIDES 1
- 
- /* Define to 1 if you have the `backtrace' function. */
--#define HAVE_BACKTRACE 1
-+/* #undef HAVE_BACKTRACE */
- 
- /* Define to 1 if you have the <CrashReporterClient.h> header file. */
- /* #undef HAVE_CRASHREPORTERCLIENT_H */
-@@ -55,7 +55,7 @@
- #define HAVE_ERRNO_H 1
- 
- /* Define to 1 if you have the <execinfo.h> header file. */
--#define HAVE_EXECINFO_H 1
-+/* #undef HAVE_EXECINFO_H */
- 
- /* Define to 1 if you have the <fcntl.h> header file. */
- #define HAVE_FCNTL_H 1
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl_fpstate_t.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl_fpstate_t.patch.patch
deleted file mode 100644
index d8c41ccd9a03..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl_fpstate_t.patch.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-index 6ee6cc1..a8f9ccc 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-@@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- }
- 
- void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
--                                    const struct _libc_fpstate* fp) {
-+                                    const struct _fpstate* fp) {
-   const greg_t* regs = uc->uc_mcontext.gregs;
- 
-   out->context_flags = MD_CONTEXT_X86_FULL |
-@@ -97,7 +97,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- }
- 
- void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
--                                    const struct _libc_fpstate* fpregs) {
-+                                    const struct _fpstate* fpregs) {
-   const greg_t* regs = uc->uc_mcontext.gregs;
- 
-   out->context_flags = MD_CONTEXT_AMD64_FULL;
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-index f830618..f3dde1f 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-@@ -50,7 +50,7 @@ struct UContextReader {
-   //   info: the collection of register structures.
- #if defined(__i386__) || defined(__x86_64)
-   static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
--                             const struct _libc_fpstate* fp);
-+                             const struct _fpstate* fp);
- #elif defined(__aarch64__)
-   static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                              const struct fpsimd_context* fpregs);
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-index d1dc331..d1cc562 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-@@ -48,7 +48,7 @@ class ExceptionHandler;
- #if defined(__aarch64__)
- typedef struct fpsimd_context fpstate_t;
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
--typedef struct _libc_fpstate fpstate_t;
-+typedef struct _fpstate fpstate_t;
- #endif
- 
- // These entries store a list of memory regions that the client wants included
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl_getcontext.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl_getcontext.patch.patch
deleted file mode 100644
index 7697243a9104..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl_getcontext.patch.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-index b895f6d..4f13352 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -490,7 +490,9 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
-   siginfo.si_code = SI_USER;
-   siginfo.si_pid = getpid();
-   ucontext_t context;
-+#if defined(__GLIBC__)
-   getcontext(&context);
-+#endif
-   return HandleSignal(sig, &siginfo, &context);
- }
- 
-@@ -675,8 +677,10 @@ bool ExceptionHandler::WriteMinidump() {
-   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
- 
-   CrashContext context;
-+#if defined(__GLIBC__)
-   int getcontext_result = getcontext(&context.context);
-   if (getcontext_result)
-+#endif
-     return false;
- 
- #if defined(__i386__)
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl_mallinfo.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl_mallinfo.patch.patch
deleted file mode 100644
index 941313e49397..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl_mallinfo.patch.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/base/process/process_metrics_posix.cc b/base/process/process_metrics_posix.cc
-index 044bd8d..0521321 100644
---- a/base/process/process_metrics_posix.cc
-+++ b/base/process/process_metrics_posix.cc
-@@ -110,14 +110,14 @@ size_t ProcessMetrics::GetMallocUsage() {
-   malloc_statistics_t stats = {0};
-   malloc_zone_statistics(nullptr, &stats);
-   return stats.size_in_use;
--#elif defined(OS_LINUX) || defined(OS_ANDROID)
-+#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID)
-   struct mallinfo minfo = mallinfo();
- #if BUILDFLAG(USE_TCMALLOC)
-   return minfo.uordblks;
- #else
-   return minfo.hblkhd + minfo.arena;
- #endif
--#elif defined(OS_FUCHSIA)
-+#else
-   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
-   return 0;
- #endif
-diff --git a/base/trace_event/malloc_dump_provider.cc b/base/trace_event/malloc_dump_provider.cc
-index e89597c..eca258c 100644
---- a/base/trace_event/malloc_dump_provider.cc
-+++ b/base/trace_event/malloc_dump_provider.cc
-@@ -132,7 +132,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
-   }
- #elif defined(OS_FUCHSIA)
- // TODO(fuchsia): Port, see https://crbug.com/706592.
--#else
-+#elif defined(OS_LINUX) && defined(__GLIBC__)
-   struct mallinfo info = mallinfo();
-   DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
- 
-diff --git a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-index aa98242..97acc7c 100644
---- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-+++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-@@ -130,7 +130,7 @@
- /* #undef HAVE_MALLCTL */
- 
- /* Define to 1 if you have the `mallinfo' function. */
--#define HAVE_MALLINFO 1
-+/* #undef HAVE_MALLINFO */
- 
- /* Define to 1 if you have the <malloc.h> header file. */
- #define HAVE_MALLOC_H 1
-diff --git a/third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h b/third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h
-index 6e17020..d4a9ed0 100644
---- a/third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h
-+++ b/third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h
-@@ -122,7 +122,7 @@
- /* #undef HAVE_MALLCTL */
-
- /* Define to 1 if you have the `mallinfo' function. */
--#define HAVE_MALLINFO 1
-+/* #undef HAVE_MALLINFO */
-
- /* Define to 1 if you have the <malloc.h> header file. */
- #define HAVE_MALLOC_H 1
-
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl_pread_pwrite64.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl_pread_pwrite64.patch.patch
deleted file mode 100644
index 2aeaaeb7593f..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl_pread_pwrite64.patch.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h
-index 5d9c2e8..2682349 100644
---- a/third_party/lss/linux_syscall_support.h
-+++ b/third_party/lss/linux_syscall_support.h
-@@ -166,6 +166,13 @@ extern "C" {
- # undef __NR_waitpid
- #endif
- 
-+#ifdef pread64
-+#undef pread64
-+#endif
-+#ifdef pwrite64
-+#undef pwrite64
-+#endif
-+
- /* As glibc often provides subtly incompatible data structures (and implicit
-  * wrapper functions that convert them), we provide our own kernel data
-  * structures for use by the system calls.
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl_push_back.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl_push_back.patch.patch
deleted file mode 100644
index cff340287da5..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl_push_back.patch.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/net/socket/udp_socket_posix.cc b/net/socket/udp_socket_posix.cc
-index 08bf79c..3ee5353 100644
---- a/net/socket/udp_socket_posix.cc
-+++ b/net/socket/udp_socket_posix.cc
-@@ -1194,7 +1194,7 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
-     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
-   msgvec->reserve(buffers.size());
-   for (size_t j = 0; j < buffers.size(); j++)
--    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
-+    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, nullptr, 0, 0, 0}, 0});
-   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
-   SendResult send_result(0, 0, std::move(buffers));
-   if (result < 0) {
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl_si_fields.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl_si_fields.patch.patch
deleted file mode 100644
index fdbefd27e2bf..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl_si_fields.patch.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sandbox/linux/seccomp-bpf/trap.cc b/sandbox/linux/seccomp-bpf/trap.cc
-index 003708d..b21414f 100644
---- a/sandbox/linux/seccomp-bpf/trap.cc
-+++ b/sandbox/linux/seccomp-bpf/trap.cc
-@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) {
-   // most versions of glibc don't include this information in siginfo_t. So,
-   // we need to explicitly copy it into a arch_sigsys structure.
-   struct arch_sigsys sigsys;
--  memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
-+  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
- 
- #if defined(__mips__)
-   // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl_stack_size.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl_stack_size.patch.patch
deleted file mode 100644
index a4df7a3729b0..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl_stack_size.patch.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/third_party/blink/renderer/platform/wtf/stack_util.cc b/third_party/blink/renderer/platform/wtf/stack_util.cc
-index b242164..1a0b519 100644
---- a/third_party/blink/renderer/platform/wtf/stack_util.cc
-+++ b/third_party/blink/renderer/platform/wtf/stack_util.cc
-@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
- // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
- // correctly for the main thread.
- 
--#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-     defined(OS_FUCHSIA)
-   // pthread_getattr_np() can fail if the thread is not invoked by
-   // pthread_create() (e.g., the main thread of blink_unittests).
-@@ -55,6 +55,9 @@ size_t GetUnderestimatedStackSize() {
-   pthread_attr_destroy(&attr);
- #endif
- 
-+#if defined(OS_LINUX) && !defined(__GLIBC__)
-+  return 0;
-+#else
-   // Return a 512k stack size, (conservatively) assuming the following:
-   //  - that size is much lower than the pthreads default (x86 pthreads has a 2M
-   //    default.)
-@@ -62,6 +65,8 @@ size_t GetUnderestimatedStackSize() {
-   //    low as 512k.
-   //
-   return 512 * 1024;
-+#endif
-+
- #elif defined(OS_MACOSX)
-   // pthread_get_stacksize_np() returns too low a value for the main thread on
-   // OSX 10.9,
-@@ -97,7 +102,7 @@ return Threading::ThreadStackSize();
- }
- 
- void* GetStackStart() {
--#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-     defined(OS_FUCHSIA)
-   pthread_attr_t attr;
-   int error;
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl_stack_trace.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl_stack_trace.patch.patch
deleted file mode 100644
index 9a1f2b044583..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl_stack_trace.patch.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/base/debug/stack_trace.cc b/base/debug/stack_trace.cc
-index d8ca822..ffe1f08 100644
---- a/base/debug/stack_trace.cc
-+++ b/base/debug/stack_trace.cc
-@@ -225,7 +225,9 @@ void StackTrace::Print() const {
- }
-
- void StackTrace::OutputToStream(std::ostream* os) const {
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
-   OutputToStreamWithPrefix(os, nullptr);
-+#endif
- }
-
- std::string StackTrace::ToString() const {
-@@ -233,14 +233,14 @@ std::string StackTrace::ToString() const {
- }
- std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
-   std::stringstream stream;
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
-   OutputToStreamWithPrefix(&stream, prefix_string);
- #endif
-   return stream.str();
- }
- 
- std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
--#if !defined(__UCLIBC__) & !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) & !defined(_AIX)
-   s.OutputToStream(&os);
- #else
-   os << "StackTrace::OutputToStream not implemented.";
-diff --git a/base/logging.cc b/base/logging.cc
-index 36b8bfc..dd830fe 100644
---- a/base/logging.cc
-+++ b/base/logging.cc
-@@ -607,7 +607,7 @@ LogMessage::LogMessage(const char* file, int line, LogSeverity severity,
- LogMessage::~LogMessage() {
-   size_t stack_start = stream_.tellp();
- #if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
--    !defined(OS_AIX)
-+    !defined(OS_AIX) && defined(__GLIBC__)
-   if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
-     // Include a stack trace on a fatal, unless a debugger is attached.
-     base::debug::StackTrace stack_trace;
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl_tcp_listen.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl_tcp_listen.patch.patch
deleted file mode 100644
index fa62317b11ac..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl_tcp_listen.patch.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/content/public/common/socket_permission_request.h b/content/public/common/socket_permission_request.h
-index 7316621..6171219 100644
---- a/content/public/common/socket_permission_request.h
-+++ b/content/public/common/socket_permission_request.h
-@@ -9,6 +9,9 @@
- 
- #include <string>
- 
-+#ifdef TCP_LISTEN
-+#undef TCP_LISTEN
-+#endif
- 
- namespace content {
- 
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl_wordsize.patch.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl_wordsize.patch.patch
deleted file mode 100644
index 6208cffafbe3..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl_wordsize.patch.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h b/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
-index d03c7a8..78ca9dd 100644
---- a/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
-+++ b/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
-@@ -36,6 +36,7 @@
- #include <elf.h>
- #include <link.h>
- #include <stddef.h>
-+#include <limits.h>
- 
- #include "common/memory_range.h"
- 
-@@ -51,9 +52,9 @@ class ElfCoreDump {
-   typedef ElfW(Phdr) Phdr;
-   typedef ElfW(Word) Word;
-   typedef ElfW(Addr) Addr;
--#if __WORDSIZE == 32
-+#if ULONG_MAX == 0xffffffff
-   static const int kClass = ELFCLASS32;
--#elif __WORDSIZE == 64
-+#elif ULONG_MAX == 0xffffffffffffffff
-   static const int kClass = ELFCLASS64;
- #else
- #error "Unsupported __WORDSIZE for ElfCoreDump."
diff --git a/srcpkgs/electron7/files/musl-patches/chromium-musl_xxx_ppc64le.patch b/srcpkgs/electron7/files/musl-patches/chromium-musl_xxx_ppc64le.patch
deleted file mode 100644
index 5758a77aeeac..000000000000
--- a/srcpkgs/electron7/files/musl-patches/chromium-musl_xxx_ppc64le.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From f1167a4390736e6f1588c497c0a0a271c71ac9b4 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Sat, 12 Sep 2020 05:57:12 +0200
-Subject: [PATCH] ppc64le musl bits
-
----
- sandbox/linux/bpf_dsl/seccomp_macros.h                     | 6 +++---
- sandbox/linux/seccomp-bpf/syscall.cc                       | 4 ++--
- .../abseil-cpp/absl/base/internal/unscaledcycleclock.h     | 2 +-
- .../src/client/linux/dump_writer_common/thread_info.cc     | 7 +++++--
- .../src/client/linux/dump_writer_common/ucontext_reader.cc | 7 +++++--
- .../breakpad/src/client/linux/handler/exception_handler.cc | 5 +++++
- .../crashpad/crashpad/snapshot/linux/signal_context.h      | 2 +-
- third_party/crashpad/crashpad/util/linux/thread_info.h     | 1 +
- third_party/lss/linux_syscall_support.h                    | 4 ++++
- 9 files changed, 27 insertions(+), 11 deletions(-)
-
-diff --git a/sandbox/linux/bpf_dsl/seccomp_macros.h b/sandbox/linux/bpf_dsl/seccomp_macros.h
-index a6aec544e0..2a4a7f1bca 100644
---- a/sandbox/linux/bpf_dsl/seccomp_macros.h
-+++ b/sandbox/linux/bpf_dsl/seccomp_macros.h
-@@ -16,7 +16,7 @@
- #if defined(__mips__)
- // sys/user.h in eglibc misses size_t definition
- #include <stddef.h>
--#elif defined(__powerpc64__)
-+#elif defined(__powerpc64__) && defined(__GLIBC__)
- // Manually define greg_t on ppc64
- typedef unsigned long long greg_t;
- #endif
-@@ -361,11 +361,11 @@ typedef struct pt_regs regs_struct;
- #define SECCOMP_ARCH AUDIT_ARCH_PPC64
- #endif
- 
--#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
-+#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
- 
- #define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
- #define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
--#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
-+#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
- #define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
- #define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
- #define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
-diff --git a/sandbox/linux/seccomp-bpf/syscall.cc b/sandbox/linux/seccomp-bpf/syscall.cc
-index 10fa5fd070..30b7b3851f 100644
---- a/sandbox/linux/seccomp-bpf/syscall.cc
-+++ b/sandbox/linux/seccomp-bpf/syscall.cc
-@@ -497,9 +497,9 @@ void Syscall::PutValueInUcontext(intptr_t ret_val, ucontext_t* ctx) {
-   // Same as MIPS, need to invert ret and set error register (cr0.SO)
-   if (ret_val <= -1 && ret_val >= -4095) {
-     ret_val = -ret_val;
--    ctx->uc_mcontext.regs->ccr |= (1 << 28);
-+    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
-   } else {
--    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
-+    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
-   }
- #endif
-   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
-diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-index 2d361e9628..98242096cd 100644
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-@@ -46,7 +46,7 @@
- 
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
--  defined(__powerpc__) || defined(__ppc__) || \
-+  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
-   defined(_M_IX86) || defined(_M_X64)
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-index 03afec7a58..0264ecf135 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-@@ -273,6 +273,9 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
- 
- #elif defined(__powerpc64__)
- 
-+#include <asm/elf.h>
-+#include <asm/ptrace.h>
-+
- uintptr_t ThreadInfo::GetInstructionPointer() const {
-     return mcontext.gp_regs[PT_NIP];
- }
-@@ -290,9 +293,9 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
-     out->ctr = mcontext.gp_regs[PT_CTR];
-     
-     for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
--        out->float_save.fpregs[i] = mcontext.fp_regs[i];
-+        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
- 
--    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
-+    out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
- 
-     for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
-         out->vector_save.save_vr[i] = \
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-index 7620cf6f79..54e373611f 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-@@ -257,6 +257,9 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
- 
- #elif defined(__powerpc64__)
- 
-+#include <asm/elf.h>
-+#include <asm/ptrace.h>
-+
- uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
-     return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
- }
-@@ -280,9 +283,9 @@ void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
-     out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
-     
-     for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
--        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
-+        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
- 
--    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
-+    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
- 
-     for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
-         out->vector_save.save_vr[i] =
-diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-index 826c9e0c21..9bb4f6a3e4 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -105,6 +105,11 @@
- #define PR_SET_PTRACER 0x59616d61
- #endif
- 
-+/* musl hack, can't include asm/ptrace.h as that causes conflicts */
-+#if defined(__powerpc64__) && !defined(PT_NIP)
-+#define PT_NIP 32
-+#endif
-+
- namespace google_breakpad {
- 
- namespace {
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h b/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-index a1f2da2591..e6a5bd72ab 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-@@ -469,7 +469,7 @@ struct MContext64 {
-   SignalThreadContext64 gp_regs;
-   SignalFloatContext64  fp_regs;
-   SignalVectorContext64 *v_regs;
--  int64_t vmx_reserve[69];
-+  int64_t vmx_reserve[101];
- };
- 
- struct ContextTraits64 : public Traits64 {
-diff --git a/third_party/crashpad/crashpad/util/linux/thread_info.h b/third_party/crashpad/crashpad/util/linux/thread_info.h
-index dea0d1f39e..b203e5b2f2 100644
---- a/third_party/crashpad/crashpad/util/linux/thread_info.h
-+++ b/third_party/crashpad/crashpad/util/linux/thread_info.h
-@@ -30,6 +30,7 @@
- 
- #if defined(ARCH_CPU_PPC64_FAMILY)
- #include <sys/ucontext.h>
-+#include <asm/ptrace.h>
- #endif
- 
- namespace crashpad {
-diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h
-index c05710e56f..af327ea616 100644
---- a/third_party/lss/linux_syscall_support.h
-+++ b/third_party/lss/linux_syscall_support.h
-@@ -4226,9 +4226,13 @@ struct kernel_statfs {
-     }
-   #endif
-   #if defined(__NR_fstatat64)
-+    // musl does #define fstatat64 fstatat
-+    #undef fstatat64
-     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
-                          const char *,      p,
-                          struct kernel_stat64 *,   b,    int,   f)
-+    // set it back like it was
-+    #define fstatat64 fstatat
-   #endif
-   #if defined(__NR_waitpid)
-     // waitpid is polyfilled below when not available.
--- 
-2.28.0
-
diff --git a/srcpkgs/electron7/files/patches/chromium-001-upstream_chrome_cleaner.patch.patch b/srcpkgs/electron7/files/patches/chromium-001-upstream_chrome_cleaner.patch.patch
deleted file mode 100644
index 57e94180c59c..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-001-upstream_chrome_cleaner.patch.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From c755ec847459d9d3807c22c2d4d6aa6f9c86dc7c Mon Sep 17 00:00:00 2001
-From: John Budorick <jbudorick@chromium.org>
-Date: Tue, 19 Nov 2019 22:24:20 +0000
-Subject: [PATCH] 3904: chrome_cleaner: ensure internal targets are reachable
- from :gn_all.
-
-(cherry picked from commit eee513dfc780ad4bcaa74b67f2e0eaebf57b5c93)
-
-Bug: 984162, 1004848
-Change-Id: Ibb7c47f0188de8e077cd30aa8d68ca61133d2037
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1904549
-Commit-Queue: John Budorick <jbudorick@chromium.org>
-Reviewed-by: Joe Mason <joenotcharles@chromium.org>
-Cr-Original-Commit-Position: refs/heads/master@{#713683}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1922299
-Cr-Commit-Position: refs/branch-heads/3904@{#895}
-Cr-Branched-From: 675968a8c657a3bd9c1c2c20c5d2935577bbc5e6-refs/heads/master@{#693954}
----
- BUILD.gn                       |  2 +-
- chrome/chrome_cleaner/BUILD.gn | 23 ++++++++++++++++++++---
- 2 files changed, 21 insertions(+), 4 deletions(-)
-
-diff --git a/BUILD.gn b/BUILD.gn
-index 5e2f6b9b0f41c..ac0297608594f 100644
---- a/BUILD.gn
-+++ b/BUILD.gn
-@@ -604,7 +604,7 @@ group("gn_all") {
-   if (is_win) {
-     deps += [
-       "//base:pe_image_test",
--      "//chrome/chrome_cleaner:chrome_cleaner_unittests",
-+      "//chrome/chrome_cleaner",
-       "//chrome/chrome_elf:chrome_elf_unittests",
-       "//chrome/chrome_elf:dll_hash_main",
-       "//chrome/elevation_service:elevation_service_unittests",
-diff --git a/chrome/chrome_cleaner/BUILD.gn b/chrome/chrome_cleaner/BUILD.gn
-index fbd2d8d5307aa..1671a3f7d097c 100644
---- a/chrome/chrome_cleaner/BUILD.gn
-+++ b/chrome/chrome_cleaner/BUILD.gn
-@@ -64,9 +64,6 @@ static_library("other_executable_definitions") {
- }
- 
- test("chrome_cleaner_unittests") {
--  # Make this target findable from the "all" target used by the builders.
--  visibility += [ "//.:gn_all" ]
--
-   sources = [
-     "//chrome/chrome_cleaner/test/test_main.cc",
-   ]
-@@ -126,3 +123,23 @@ test("chrome_cleaner_unittests") {
-     ]
-   }
- }
-+
-+group("chrome_cleaner") {
-+  testonly = true
-+
-+  # Make this target findable from the "all" target used by the builders.
-+  visibility += [ "//.:gn_all" ]
-+
-+  deps = [
-+    ":chrome_cleaner_unittests",
-+    "//chrome/chrome_cleaner/executables:chrome_cleanup_tool",
-+    "//chrome/chrome_cleaner/executables:software_reporter_tool",
-+  ]
-+
-+  if (is_internal_chrome_cleaner_build) {
-+    deps += [
-+      "${chrome_cleaner_internal_root}:build_targets",
-+      "${chrome_cleaner_internal_root}:test_targets",
-+    ]
-+  }
-+}
diff --git a/srcpkgs/electron7/files/patches/chromium-002-upstream_save_logs_from_test_cild_processes.patch.patch b/srcpkgs/electron7/files/patches/chromium-002-upstream_save_logs_from_test_cild_processes.patch.patch
deleted file mode 100644
index 74b9fec59a7a..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-002-upstream_save_logs_from_test_cild_processes.patch.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-From daec661f27bdfab79132d7d2c4637cc17fd4aa35 Mon Sep 17 00:00:00 2001
-From: Joe Mason <joenotcharles@google.com>
-Date: Wed, 4 Dec 2019 18:04:21 +0000
-Subject: [PATCH] Save logs from test child processes by redirecting stdout and
- stderr.
-
-The previous solution can only capture logs after the child process
-creates a ScopedLogging object. We see flaky crashes in sandbox creation
-that happen before that so this will let us see the child process stack
-traces.
-
-Also moves some functions that were exported from ipc_test_util.h to be
-private to proto_chrome_prompt_ipc_unittest.cc, which is the only test
-that still uses them.
-
-(cherry picked from commit e7a755421136d7fc9b3a73a5e5464368f3efa7f9)
-
-Bug: 1030333
-Change-Id: Ie30eed3b16631721e81a420b3b70f1ec5f0d9a0c
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1948483
-Reviewed-by: proberge <proberge@chromium.org>
-Commit-Queue: Joe Mason <joenotcharles@chromium.org>
-Cr-Original-Commit-Position: refs/heads/master@{#721071}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1951089
-Reviewed-by: Joe Mason <joenotcharles@chromium.org>
-Cr-Commit-Position: refs/branch-heads/3904@{#913}
-Cr-Branched-From: 675968a8c657a3bd9c1c2c20c5d2935577bbc5e6-refs/heads/master@{#693954}
----
- chrome/chrome_cleaner/ipc/ipc_test_util.cc    | 92 ++++++++++++-------
- chrome/chrome_cleaner/ipc/ipc_test_util.h     | 13 ++-
- .../ipc/proto_chrome_prompt_ipc_unittest.cc   | 17 ++--
- chrome/chrome_cleaner/ipc/sandbox.cc          |  5 +-
- 4 files changed, 77 insertions(+), 50 deletions(-)
-
-diff --git a/chrome/chrome_cleaner/ipc/ipc_test_util.cc b/chrome/chrome_cleaner/ipc/ipc_test_util.cc
-index 05fc0d027ec43..0d03a6870fb07 100644
---- a/chrome/chrome_cleaner/ipc/ipc_test_util.cc
-+++ b/chrome/chrome_cleaner/ipc/ipc_test_util.cc
-@@ -13,6 +13,7 @@
- #include "base/command_line.h"
- #include "base/files/file_path.h"
- #include "base/files/file_util.h"
-+#include "base/files/scoped_temp_dir.h"
- #include "base/logging.h"
- #include "base/process/launch.h"
- #include "base/rand_util.h"
-@@ -23,7 +24,6 @@
- #include "base/test/test_timeouts.h"
- #include "base/win/win_util.h"
- #include "chrome/chrome_cleaner/ipc/sandbox.h"
--#include "chrome/chrome_cleaner/logging/scoped_logging.h"
- #include "sandbox/win/src/sandbox_factory.h"
- 
- namespace chrome_cleaner {
-@@ -32,12 +32,13 @@ namespace {
- 
- constexpr char kMojoPipeTokenSwitch[] = "mojo-pipe-token";
- 
--constexpr wchar_t kIPCTestUtilLogSuffix[] = L"ipc-test-util";
--
- class MojoSandboxSetupHooks : public SandboxSetupHooks {
-  public:
--  explicit MojoSandboxSetupHooks(SandboxedParentProcess* parent_process)
--      : parent_process_(parent_process) {}
-+  explicit MojoSandboxSetupHooks(
-+      SandboxedParentProcess* parent_process,
-+      base::win::ScopedHandle child_stdout_write_handle)
-+      : parent_process_(parent_process),
-+        child_stdout_write_handle_(std::move(child_stdout_write_handle)) {}
-   ~MojoSandboxSetupHooks() override = default;
- 
-   // SandboxSetupHooks
-@@ -49,6 +50,8 @@ class MojoSandboxSetupHooks : public SandboxSetupHooks {
-     parent_process_->CreateMojoPipe(command_line, &handles_to_inherit);
-     for (HANDLE handle : handles_to_inherit)
-       policy->AddHandleToShare(handle);
-+    policy->SetStdoutHandle(child_stdout_write_handle_.Get());
-+    policy->SetStderrHandle(child_stdout_write_handle_.Get());
-     return RESULT_CODE_SUCCESS;
-   }
- 
-@@ -61,33 +64,14 @@ class MojoSandboxSetupHooks : public SandboxSetupHooks {
- 
-  private:
-   SandboxedParentProcess* parent_process_;
-+  base::win::ScopedHandle child_stdout_write_handle_;
- };
- 
- }  // namespace
- 
- namespace internal {
- 
--base::FilePath::StringPieceType GetLogPathSuffix() {
--  return kIPCTestUtilLogSuffix;
--}
--
--base::FilePath GetLogPath() {
--  return ScopedLogging::GetLogFilePath(kIPCTestUtilLogSuffix);
--}
--
--bool DeleteChildProcessLogs() {
--  // Delete the child process log file if existing.
--  const base::FilePath log_path = GetLogPath();
--  if (!base::DeleteFile(log_path, false)) {
--    LOG(ERROR) << "Can't delete log file from previous run: "
--               << log_path.value();
--    return false;
--  }
--  return true;
--}
--
--void PrintChildProcessLogs() {
--  const base::FilePath log_path = GetLogPath();
-+void PrintChildProcessLogs(const base::FilePath& log_path) {
-   if (log_path.empty()) {
-     LOG(ERROR) << "Child process log path is empty";
-     return;
-@@ -174,11 +158,38 @@ bool ParentProcess::LaunchConnectedChildProcess(
-     const std::string& child_main_function,
-     base::TimeDelta timeout,
-     int32_t* exit_code) {
--  if (!internal::DeleteChildProcessLogs())
-+  // Adapted from
-+  // https://cs.chromium.org/chromium/src/sandbox/win/src/handle_inheritance_test.cc
-+  base::ScopedTempDir temp_dir;
-+  if (!temp_dir.CreateUniqueTempDir()) {
-+    PLOG(ERROR) << "Could not create temp dir for child stdout";
-+    return false;
-+  }
-+
-+  base::FilePath temp_file_name;
-+  if (!CreateTemporaryFileInDir(temp_dir.GetPath(), &temp_file_name)) {
-+    PLOG(ERROR) << "Could not create temp file for child stdout";
-+    return false;
-+  }
-+
-+  SECURITY_ATTRIBUTES attrs = {};
-+  attrs.nLength = sizeof(attrs);
-+  attrs.bInheritHandle = true;
-+
-+  base::win::ScopedHandle child_stdout_write_handle(
-+      ::CreateFile(temp_file_name.value().c_str(), GENERIC_WRITE,
-+                   FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE,
-+                   &attrs, OPEN_EXISTING, 0, nullptr));
-+  if (!child_stdout_write_handle.IsValid()) {
-+    PLOG(ERROR) << "Could not open child stdout file";
-     return false;
-+  }
- 
--  if (!PrepareAndLaunchTestChildProcess(child_main_function))
-+  if (!PrepareAndLaunchTestChildProcess(child_main_function,
-+                                        std::move(child_stdout_write_handle))) {
-+    internal::PrintChildProcessLogs(temp_file_name);
-     return false;
-+  }
- 
-   CreateImplOnIPCThread(std::move(mojo_pipe_));
-   const bool success = base::WaitForMultiprocessTestChildExit(
-@@ -189,21 +200,32 @@ bool ParentProcess::LaunchConnectedChildProcess(
-   }
-   DestroyImplOnIPCThread();
- 
--  if (!success || *exit_code != 0)
--    internal::PrintChildProcessLogs();
-+  if (!success || *exit_code != 0) {
-+    internal::PrintChildProcessLogs(temp_file_name);
-+  }
- 
-   return success;
- }
- 
- bool ParentProcess::PrepareAndLaunchTestChildProcess(
--    const std::string& child_main_function) {
-+    const std::string& child_main_function,
-+    base::win::ScopedHandle child_stdout_write_handle) {
-   base::LaunchOptions launch_options;
-   launch_options.handles_to_inherit = extra_handles_to_inherit_;
-+  launch_options.handles_to_inherit.push_back(child_stdout_write_handle.Get());
-+  launch_options.stdin_handle = INVALID_HANDLE_VALUE;
-+  launch_options.stdout_handle = child_stdout_write_handle.Get();
-+  launch_options.stderr_handle = child_stdout_write_handle.Get();
-+
-   CreateMojoPipe(&command_line_, &launch_options.handles_to_inherit);
- 
-   base::Process child_process = base::SpawnMultiProcessTestChild(
-       child_main_function, command_line_, launch_options);
- 
-+  // Now that it's been passed to the child process,
-+  // |child_stdout_write_handle| can be closed in this process as it goes out
-+  // of scope.
-+
-   ConnectMojoPipe(std::move(child_process));
-   return true;
- }
-@@ -235,8 +257,9 @@ SandboxedParentProcess::SandboxedParentProcess(
- SandboxedParentProcess::~SandboxedParentProcess() {}
- 
- bool SandboxedParentProcess::PrepareAndLaunchTestChildProcess(
--    const std::string& child_main_function) {
--  MojoSandboxSetupHooks hooks(this);
-+    const std::string& child_main_function,
-+    base::win::ScopedHandle child_stdout_write_handle) {
-+  MojoSandboxSetupHooks hooks(this, std::move(child_stdout_write_handle));
- 
-   // This switch usage is copied from SpawnMultiProcessTestChild.
-   //
-@@ -258,8 +281,7 @@ bool SandboxedParentProcess::PrepareAndLaunchTestChildProcess(
- 
- ChildProcess::ChildProcess(scoped_refptr<MojoTaskRunner> mojo_task_runner)
-     : mojo_task_runner_(mojo_task_runner),
--      command_line_(base::CommandLine::ForCurrentProcess()),
--      scopped_logging_(new ScopedLogging(kIPCTestUtilLogSuffix)) {
-+      command_line_(base::CommandLine::ForCurrentProcess()) {
-   sandbox::TargetServices* target_services =
-       sandbox::SandboxFactory::GetTargetServices();
-   if (!target_services)
-diff --git a/chrome/chrome_cleaner/ipc/ipc_test_util.h b/chrome/chrome_cleaner/ipc/ipc_test_util.h
-index 97f2072a09165..1b2e5598ed52a 100644
---- a/chrome/chrome_cleaner/ipc/ipc_test_util.h
-+++ b/chrome/chrome_cleaner/ipc/ipc_test_util.h
-@@ -14,9 +14,9 @@
- #include "base/process/launch.h"
- #include "base/process/process.h"
- #include "base/time/time.h"
-+#include "base/win/scoped_handle.h"
- #include "chrome/chrome_cleaner/ipc/chrome_prompt_ipc.h"
- #include "chrome/chrome_cleaner/ipc/mojo_task_runner.h"
--#include "chrome/chrome_cleaner/logging/scoped_logging.h"
- #include "mojo/public/cpp/platform/platform_channel.h"
- #include "mojo/public/cpp/system/invitation.h"
- #include "mojo/public/cpp/system/message_pipe.h"
-@@ -70,7 +70,8 @@ class ParentProcess : public base::RefCountedThreadSafe<ParentProcess> {
-   // as in the sandbox. Subclasses should call CreateMojoPipe before the
-   // subprocess is spawned and ConnectMojoPipe afterward.
-   virtual bool PrepareAndLaunchTestChildProcess(
--      const std::string& child_main_function);
-+      const std::string& child_main_function,
-+      base::win::ScopedHandle child_stdout_write_handle);
- 
-   scoped_refptr<MojoTaskRunner> mojo_task_runner();
- 
-@@ -95,7 +96,8 @@ class SandboxedParentProcess : public ParentProcess {
-   ~SandboxedParentProcess() override;
- 
-   bool PrepareAndLaunchTestChildProcess(
--      const std::string& child_main_function) override;
-+      const std::string& child_main_function,
-+      base::win::ScopedHandle child_stdout_write_handle) override;
- };
- 
- class ChildProcess : public base::RefCountedThreadSafe<ChildProcess> {
-@@ -120,7 +122,6 @@ class ChildProcess : public base::RefCountedThreadSafe<ChildProcess> {
- 
-  private:
-   base::CommandLine* command_line_;
--  std::unique_ptr<ScopedLogging> scopped_logging_;
- 
-   // This will be true iff the process is running in a sandbox and
-   // TargetServices was initialized successfully.
-@@ -143,9 +144,7 @@ class ChromePromptIPCTestErrorHandler : public ChromePromptIPC::ErrorHandler {
- };
- 
- namespace internal {
--base::FilePath::StringPieceType GetLogPathSuffix();
--bool DeleteChildProcessLogs();
--void PrintChildProcessLogs();
-+void PrintChildProcessLogs(const base::FilePath& log_file);
- }  // namespace internal
- 
- }  // namespace chrome_cleaner
-diff --git a/chrome/chrome_cleaner/ipc/proto_chrome_prompt_ipc_unittest.cc b/chrome/chrome_cleaner/ipc/proto_chrome_prompt_ipc_unittest.cc
-index 1c7b4c575eb3d..f867df58f96ea 100644
---- a/chrome/chrome_cleaner/ipc/proto_chrome_prompt_ipc_unittest.cc
-+++ b/chrome/chrome_cleaner/ipc/proto_chrome_prompt_ipc_unittest.cc
-@@ -5,6 +5,7 @@
- #include <windows.h>
- 
- #include "base/command_line.h"
-+#include "base/files/file_util.h"
- #include "base/process/process.h"
- #include "base/strings/strcat.h"
- #include "base/strings/string_number_conversions.h"
-@@ -41,8 +42,9 @@ constexpr char kExpectedPromptResultSwitch[] = "expected-prompt-result";
- constexpr char kExpectedChromeDisconnectPointSwitch[] =
-     "expected-parent-disconnected";
- 
--const base::char16 kInvalidUTF16String[] = {0xDC00, 0xD800, 0xD800, 0xDFFF,
--                                            0xDFFF, 0xDBFF, 0};
-+constexpr base::char16 kLogSuffix[] = L"prompt-ipc-test";
-+constexpr base::char16 kInvalidUTF16String[] = {0xDC00, 0xD800, 0xD800, 0xDFFF,
-+                                                0xDFFF, 0xDBFF, 0};
- const base::FilePath kInvalidFilePath(kInvalidUTF16String);
- const base::FilePath kNonASCIIFilePath(L"ééààçç");
- const base::string16 kInvalidRegistryKey(kInvalidUTF16String);
-@@ -420,8 +422,7 @@ class MockChrome {
- class ChildProcess {
-  public:
-   ChildProcess()
--      : scopped_logging_(
--            std::make_unique<ScopedLogging>(internal::GetLogPathSuffix())) {
-+      : scopped_logging_(std::make_unique<ScopedLogging>(kLogSuffix)) {
-     mock_chrome_ = std::make_unique<MockChrome>(
-         ExtractHandleFromCommandLine(chrome_cleaner::kChromeReadHandleSwitch),
-         ExtractHandleFromCommandLine(chrome_cleaner::kChromeWriteHandleSwitch));
-@@ -630,7 +631,10 @@ class ParentProcess {
-   }
- 
-   void Run() {
--    ASSERT_TRUE(internal::DeleteChildProcessLogs());
-+    // Delete the child process log file if existing.
-+    const base::FilePath log_path = ScopedLogging::GetLogFilePath(kLogSuffix);
-+    ASSERT_TRUE(base::DeleteFile(log_path, false))
-+        << "Can't delete log file from previous run: " << log_path.value();
- 
-     // Pass the command to the child process and launch the child process.
-     base::Process child_process = base::SpawnMultiProcessTestChild(
-@@ -702,7 +706,8 @@ class ParentProcess {
-     EXPECT_EQ(expected_exit_code, rv);
- 
-     if (!success || rv != 0) {
--      internal::PrintChildProcessLogs();
-+      internal::PrintChildProcessLogs(
-+          ScopedLogging::GetLogFilePath(kLogSuffix));
-     }
-   }
- 
-diff --git a/chrome/chrome_cleaner/ipc/sandbox.cc b/chrome/chrome_cleaner/ipc/sandbox.cc
-index 154bd05c51066..fafad4f0c6188 100644
---- a/chrome/chrome_cleaner/ipc/sandbox.cc
-+++ b/chrome/chrome_cleaner/ipc/sandbox.cc
-@@ -280,8 +280,9 @@ ResultCode StartSandboxTarget(const base::CommandLine& sandbox_command_line,
-       &last_win_error, &temp_process_info);
-   if (sandbox_result != sandbox::SBOX_ALL_OK) {
-     LOG(DFATAL) << "Failed to spawn sandbox target: " << sandbox_result
--                << " , last sandbox warning : " << last_sbox_warning
--                << " , last windows error: " << last_win_error;
-+                << ", last sandbox warning: " << last_sbox_warning
-+                << ", last windows error: "
-+                << logging::SystemErrorCodeToString(last_win_error);
-     return RESULT_CODE_FAILED_TO_START_SANDBOX_PROCESS;
-   }
- 
diff --git a/srcpkgs/electron7/files/patches/chromium-003-upstream_move_child_process_log.patch.patch b/srcpkgs/electron7/files/patches/chromium-003-upstream_move_child_process_log.patch.patch
deleted file mode 100644
index 518b955a0b0d..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-003-upstream_move_child_process_log.patch.patch
+++ /dev/null
@@ -1,730 +0,0 @@
-From 726cbfcfaa521e9e5098829195a7d9a9c19ca391 Mon Sep 17 00:00:00 2001
-From: Joe Mason <joenotcharles@google.com>
-Date: Wed, 4 Dec 2019 18:15:36 +0000
-Subject: [PATCH] Move child process log capture to a ChildProcessLogger class.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Update comments to clarify how the child process log interacts with
-ScopedLogging.
-
-Use the new class to capture logs in cleaner_test.cc,
-secure_dll_loading_test.cc and proto_chrome_prompt_ipc_unittest.cc.
-
-R=​proberge
-
-(cherry picked from commit 063600229fb7dc472ff66839ba2657bf99b98850)
-
-Bug: 1030333
-Change-Id: I88f538ff360bb8ed9da6743dc5d6c4b263af992c
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1947986
-Commit-Queue: Joe Mason <joenotcharles@chromium.org>
-Reviewed-by: proberge <proberge@chromium.org>
-Cr-Original-Commit-Position: refs/heads/master@{#721184}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1949631
-Reviewed-by: Joe Mason <joenotcharles@chromium.org>
-Cr-Commit-Position: refs/branch-heads/3904@{#914}
-Cr-Branched-From: 675968a8c657a3bd9c1c2c20c5d2935577bbc5e6-refs/heads/master@{#693954}
----
- chrome/chrome_cleaner/ipc/BUILD.gn            |  1 +
- chrome/chrome_cleaner/ipc/ipc_test_util.cc    | 98 +++----------------
- chrome/chrome_cleaner/ipc/ipc_test_util.h     | 17 ++--
- .../ipc/proto_chrome_prompt_ipc_unittest.cc   | 26 +++--
- chrome/chrome_cleaner/test/BUILD.gn           |  3 +
- .../test/child_process_logger.cc              | 90 +++++++++++++++++
- .../test/child_process_logger.h               | 62 ++++++++++++
- chrome/chrome_cleaner/test/cleaner_test.cc    | 14 ++-
- .../test/secure_dll_loading_test.cc           | 57 ++---------
- 9 files changed, 207 insertions(+), 161 deletions(-)
- create mode 100644 chrome/chrome_cleaner/test/child_process_logger.cc
- create mode 100644 chrome/chrome_cleaner/test/child_process_logger.h
-
-diff --git a/chrome/chrome_cleaner/ipc/BUILD.gn b/chrome/chrome_cleaner/ipc/BUILD.gn
-index 03fddfd8736e1..4d81803a24df6 100644
---- a/chrome/chrome_cleaner/ipc/BUILD.gn
-+++ b/chrome/chrome_cleaner/ipc/BUILD.gn
-@@ -77,6 +77,7 @@ source_set("ipc_test_util") {
-     "//base/test:test_support",
-     "//chrome/chrome_cleaner/ipc:sandbox",
-     "//chrome/chrome_cleaner/logging:common",
-+    "//chrome/chrome_cleaner/test:test_util",
-     "//mojo/public/cpp/system",
-     "//sandbox/win:sandbox",
-     "//testing/gtest",
-diff --git a/chrome/chrome_cleaner/ipc/ipc_test_util.cc b/chrome/chrome_cleaner/ipc/ipc_test_util.cc
-index 0d03a6870fb07..ea2bb2145bfdd 100644
---- a/chrome/chrome_cleaner/ipc/ipc_test_util.cc
-+++ b/chrome/chrome_cleaner/ipc/ipc_test_util.cc
-@@ -12,14 +12,10 @@
- #include "base/bind_helpers.h"
- #include "base/command_line.h"
- #include "base/files/file_path.h"
--#include "base/files/file_util.h"
--#include "base/files/scoped_temp_dir.h"
- #include "base/logging.h"
- #include "base/process/launch.h"
- #include "base/rand_util.h"
- #include "base/strings/string_number_conversions.h"
--#include "base/strings/string_piece.h"
--#include "base/strings/string_split.h"
- #include "base/test/multiprocess_test.h"
- #include "base/test/test_timeouts.h"
- #include "base/win/win_util.h"
-@@ -34,11 +30,8 @@ constexpr char kMojoPipeTokenSwitch[] = "mojo-pipe-token";
- 
- class MojoSandboxSetupHooks : public SandboxSetupHooks {
-  public:
--  explicit MojoSandboxSetupHooks(
--      SandboxedParentProcess* parent_process,
--      base::win::ScopedHandle child_stdout_write_handle)
--      : parent_process_(parent_process),
--        child_stdout_write_handle_(std::move(child_stdout_write_handle)) {}
-+  explicit MojoSandboxSetupHooks(SandboxedParentProcess* parent_process)
-+      : parent_process_(parent_process) {}
-   ~MojoSandboxSetupHooks() override = default;
- 
-   // SandboxSetupHooks
-@@ -50,8 +43,7 @@ class MojoSandboxSetupHooks : public SandboxSetupHooks {
-     parent_process_->CreateMojoPipe(command_line, &handles_to_inherit);
-     for (HANDLE handle : handles_to_inherit)
-       policy->AddHandleToShare(handle);
--    policy->SetStdoutHandle(child_stdout_write_handle_.Get());
--    policy->SetStderrHandle(child_stdout_write_handle_.Get());
-+    parent_process_->child_process_logger().UpdateSandboxPolicy(policy);
-     return RESULT_CODE_SUCCESS;
-   }
- 
-@@ -69,38 +61,6 @@ class MojoSandboxSetupHooks : public SandboxSetupHooks {
- 
- }  // namespace
- 
--namespace internal {
--
--void PrintChildProcessLogs(const base::FilePath& log_path) {
--  if (log_path.empty()) {
--    LOG(ERROR) << "Child process log path is empty";
--    return;
--  }
--
--  if (!base::PathExists(log_path)) {
--    LOG(ERROR) << "Child process log file doesn't exist";
--    return;
--  }
--
--  // Collect the child process log file, and dump the contents, to help
--  // debugging failures.
--  std::string log_file_contents;
--  if (!base::ReadFileToString(log_path, &log_file_contents)) {
--    LOG(ERROR) << "Failed to read child process log file";
--    return;
--  }
--
--  std::vector<base::StringPiece> lines =
--      base::SplitStringPiece(log_file_contents, "\n", base::TRIM_WHITESPACE,
--                             base::SPLIT_WANT_NONEMPTY);
--  LOG(ERROR) << "Dumping child process logs";
--  for (const auto& line : lines) {
--    LOG(ERROR) << "Child process: " << line;
--  }
--}
--
--}  // namespace internal
--
- ParentProcess::ParentProcess(scoped_refptr<MojoTaskRunner> mojo_task_runner)
-     : command_line_(base::GetMultiProcessTestChildBaseCommandLine()),
-       mojo_task_runner_(mojo_task_runner) {}
-@@ -158,36 +118,10 @@ bool ParentProcess::LaunchConnectedChildProcess(
-     const std::string& child_main_function,
-     base::TimeDelta timeout,
-     int32_t* exit_code) {
--  // Adapted from
--  // https://cs.chromium.org/chromium/src/sandbox/win/src/handle_inheritance_test.cc
--  base::ScopedTempDir temp_dir;
--  if (!temp_dir.CreateUniqueTempDir()) {
--    PLOG(ERROR) << "Could not create temp dir for child stdout";
-+  if (!child_process_logger_.Initialize())
-     return false;
--  }
--
--  base::FilePath temp_file_name;
--  if (!CreateTemporaryFileInDir(temp_dir.GetPath(), &temp_file_name)) {
--    PLOG(ERROR) << "Could not create temp file for child stdout";
--    return false;
--  }
--
--  SECURITY_ATTRIBUTES attrs = {};
--  attrs.nLength = sizeof(attrs);
--  attrs.bInheritHandle = true;
--
--  base::win::ScopedHandle child_stdout_write_handle(
--      ::CreateFile(temp_file_name.value().c_str(), GENERIC_WRITE,
--                   FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE,
--                   &attrs, OPEN_EXISTING, 0, nullptr));
--  if (!child_stdout_write_handle.IsValid()) {
--    PLOG(ERROR) << "Could not open child stdout file";
--    return false;
--  }
--
--  if (!PrepareAndLaunchTestChildProcess(child_main_function,
--                                        std::move(child_stdout_write_handle))) {
--    internal::PrintChildProcessLogs(temp_file_name);
-+  if (!PrepareAndLaunchTestChildProcess(child_main_function)) {
-+    child_process_logger_.DumpLogs();
-     return false;
-   }
- 
-@@ -201,31 +135,22 @@ bool ParentProcess::LaunchConnectedChildProcess(
-   DestroyImplOnIPCThread();
- 
-   if (!success || *exit_code != 0) {
--    internal::PrintChildProcessLogs(temp_file_name);
-+    child_process_logger_.DumpLogs();
-   }
- 
-   return success;
- }
- 
- bool ParentProcess::PrepareAndLaunchTestChildProcess(
--    const std::string& child_main_function,
--    base::win::ScopedHandle child_stdout_write_handle) {
-+    const std::string& child_main_function) {
-   base::LaunchOptions launch_options;
-   launch_options.handles_to_inherit = extra_handles_to_inherit_;
--  launch_options.handles_to_inherit.push_back(child_stdout_write_handle.Get());
--  launch_options.stdin_handle = INVALID_HANDLE_VALUE;
--  launch_options.stdout_handle = child_stdout_write_handle.Get();
--  launch_options.stderr_handle = child_stdout_write_handle.Get();
--
-+  child_process_logger_.UpdateLaunchOptions(&launch_options);
-   CreateMojoPipe(&command_line_, &launch_options.handles_to_inherit);
- 
-   base::Process child_process = base::SpawnMultiProcessTestChild(
-       child_main_function, command_line_, launch_options);
- 
--  // Now that it's been passed to the child process,
--  // |child_stdout_write_handle| can be closed in this process as it goes out
--  // of scope.
--
-   ConnectMojoPipe(std::move(child_process));
-   return true;
- }
-@@ -257,9 +182,8 @@ SandboxedParentProcess::SandboxedParentProcess(
- SandboxedParentProcess::~SandboxedParentProcess() {}
- 
- bool SandboxedParentProcess::PrepareAndLaunchTestChildProcess(
--    const std::string& child_main_function,
--    base::win::ScopedHandle child_stdout_write_handle) {
--  MojoSandboxSetupHooks hooks(this, std::move(child_stdout_write_handle));
-+    const std::string& child_main_function) {
-+  MojoSandboxSetupHooks hooks(this);
- 
-   // This switch usage is copied from SpawnMultiProcessTestChild.
-   //
-diff --git a/chrome/chrome_cleaner/ipc/ipc_test_util.h b/chrome/chrome_cleaner/ipc/ipc_test_util.h
-index 1b2e5598ed52a..1526a42701353 100644
---- a/chrome/chrome_cleaner/ipc/ipc_test_util.h
-+++ b/chrome/chrome_cleaner/ipc/ipc_test_util.h
-@@ -14,9 +14,9 @@
- #include "base/process/launch.h"
- #include "base/process/process.h"
- #include "base/time/time.h"
--#include "base/win/scoped_handle.h"
- #include "chrome/chrome_cleaner/ipc/chrome_prompt_ipc.h"
- #include "chrome/chrome_cleaner/ipc/mojo_task_runner.h"
-+#include "chrome/chrome_cleaner/test/child_process_logger.h"
- #include "mojo/public/cpp/platform/platform_channel.h"
- #include "mojo/public/cpp/system/invitation.h"
- #include "mojo/public/cpp/system/message_pipe.h"
-@@ -58,6 +58,10 @@ class ParentProcess : public base::RefCountedThreadSafe<ParentProcess> {
-     return extra_handles_to_inherit_;
-   }
- 
-+  const ChildProcessLogger& child_process_logger() const {
-+    return child_process_logger_;
-+  }
-+
-  protected:
-   friend base::RefCountedThreadSafe<ParentProcess>;
-   virtual ~ParentProcess();
-@@ -70,13 +74,13 @@ class ParentProcess : public base::RefCountedThreadSafe<ParentProcess> {
-   // as in the sandbox. Subclasses should call CreateMojoPipe before the
-   // subprocess is spawned and ConnectMojoPipe afterward.
-   virtual bool PrepareAndLaunchTestChildProcess(
--      const std::string& child_main_function,
--      base::win::ScopedHandle child_stdout_write_handle);
-+      const std::string& child_main_function);
- 
-   scoped_refptr<MojoTaskRunner> mojo_task_runner();
- 
-   base::CommandLine command_line_;
-   base::HandlesToInheritVector extra_handles_to_inherit_;
-+  ChildProcessLogger child_process_logger_;
- 
-  private:
-   scoped_refptr<MojoTaskRunner> mojo_task_runner_;
-@@ -96,8 +100,7 @@ class SandboxedParentProcess : public ParentProcess {
-   ~SandboxedParentProcess() override;
- 
-   bool PrepareAndLaunchTestChildProcess(
--      const std::string& child_main_function,
--      base::win::ScopedHandle child_stdout_write_handle) override;
-+      const std::string& child_main_function) override;
- };
- 
- class ChildProcess : public base::RefCountedThreadSafe<ChildProcess> {
-@@ -143,10 +146,6 @@ class ChromePromptIPCTestErrorHandler : public ChromePromptIPC::ErrorHandler {
-   base::OnceClosure on_closed_after_done_;
- };
- 
--namespace internal {
--void PrintChildProcessLogs(const base::FilePath& log_file);
--}  // namespace internal
--
- }  // namespace chrome_cleaner
- 
- #endif  // CHROME_CHROME_CLEANER_IPC_IPC_TEST_UTIL_H_
-diff --git a/chrome/chrome_cleaner/ipc/proto_chrome_prompt_ipc_unittest.cc b/chrome/chrome_cleaner/ipc/proto_chrome_prompt_ipc_unittest.cc
-index f867df58f96ea..e3ce2ab6c27fe 100644
---- a/chrome/chrome_cleaner/ipc/proto_chrome_prompt_ipc_unittest.cc
-+++ b/chrome/chrome_cleaner/ipc/proto_chrome_prompt_ipc_unittest.cc
-@@ -5,7 +5,6 @@
- #include <windows.h>
- 
- #include "base/command_line.h"
--#include "base/files/file_util.h"
- #include "base/process/process.h"
- #include "base/strings/strcat.h"
- #include "base/strings/string_number_conversions.h"
-@@ -19,7 +18,7 @@
- #include "base/win/win_util.h"
- #include "chrome/chrome_cleaner/ipc/ipc_test_util.h"
- #include "chrome/chrome_cleaner/ipc/proto_chrome_prompt_ipc.h"
--#include "chrome/chrome_cleaner/logging/scoped_logging.h"
-+#include "chrome/chrome_cleaner/test/child_process_logger.h"
- #include "components/chrome_cleaner/public/constants/constants.h"
- #include "components/chrome_cleaner/public/proto/chrome_prompt.pb.h"
- #include "components/chrome_cleaner/public/proto/chrome_prompt_for_tests.pb.h"
-@@ -42,7 +41,6 @@ constexpr char kExpectedPromptResultSwitch[] = "expected-prompt-result";
- constexpr char kExpectedChromeDisconnectPointSwitch[] =
-     "expected-parent-disconnected";
- 
--constexpr base::char16 kLogSuffix[] = L"prompt-ipc-test";
- constexpr base::char16 kInvalidUTF16String[] = {0xDC00, 0xD800, 0xD800, 0xDFFF,
-                                                 0xDFFF, 0xDBFF, 0};
- const base::FilePath kInvalidFilePath(kInvalidUTF16String);
-@@ -421,8 +419,7 @@ class MockChrome {
- // Gtest to log.
- class ChildProcess {
-  public:
--  ChildProcess()
--      : scopped_logging_(std::make_unique<ScopedLogging>(kLogSuffix)) {
-+  ChildProcess() {
-     mock_chrome_ = std::make_unique<MockChrome>(
-         ExtractHandleFromCommandLine(chrome_cleaner::kChromeReadHandleSwitch),
-         ExtractHandleFromCommandLine(chrome_cleaner::kChromeWriteHandleSwitch));
-@@ -571,7 +568,6 @@ class ChildProcess {
- 
-  private:
-   std::unique_ptr<MockChrome> mock_chrome_;
--  std::unique_ptr<ScopedLogging> scopped_logging_;
- 
-   ChromeDisconnectPoint expected_disconnect_point_ =
-       ChromeDisconnectPoint::kUnspecified;
-@@ -603,6 +599,9 @@ class ProtoChromePromptIPCTest
- class ParentProcess {
-  public:
-   bool Initialize() {
-+    if (!child_process_logger_.Initialize())
-+      return false;
-+
-     // Inject the flags related to the the config in the command line.
-     test_config_.EnhanceCommandLine(&command_line_);
- 
-@@ -631,14 +630,13 @@ class ParentProcess {
-   }
- 
-   void Run() {
--    // Delete the child process log file if existing.
--    const base::FilePath log_path = ScopedLogging::GetLogFilePath(kLogSuffix);
--    ASSERT_TRUE(base::DeleteFile(log_path, false))
--        << "Can't delete log file from previous run: " << log_path.value();
-+    child_process_logger_.UpdateLaunchOptions(&launch_options_);
- 
-     // Pass the command to the child process and launch the child process.
-     base::Process child_process = base::SpawnMultiProcessTestChild(
-         "ProtoChromePromptIPCClientMain", command_line_, launch_options_);
-+    if (!child_process.IsRunning())
-+      child_process_logger_.DumpLogs();
-     ASSERT_TRUE(child_process.IsRunning());
- 
-     // Close our references to the handles as they are now handled by the child
-@@ -705,10 +703,8 @@ class ParentProcess {
- 
-     EXPECT_EQ(expected_exit_code, rv);
- 
--    if (!success || rv != 0) {
--      internal::PrintChildProcessLogs(
--          ScopedLogging::GetLogFilePath(kLogSuffix));
--    }
-+    if (!success || rv != 0)
-+      child_process_logger_.DumpLogs();
-   }
- 
-   TestConfig& GetTestConfig() { return test_config_; }
-@@ -732,6 +728,8 @@ class ParentProcess {
-   // Blocks until we receive the response from Chrome or an error occurs.
-   base::RunLoop main_runloop_;
-   bool error_occurred_ = false;
-+
-+  ChildProcessLogger child_process_logger_;
- };
- 
- // This contains calls to the chrome_cleaner_ipc implementation.
-diff --git a/chrome/chrome_cleaner/test/BUILD.gn b/chrome/chrome_cleaner/test/BUILD.gn
-index 118454c2bdcd2..4b053fdcaf182 100644
---- a/chrome/chrome_cleaner/test/BUILD.gn
-+++ b/chrome/chrome_cleaner/test/BUILD.gn
-@@ -148,6 +148,8 @@ source_set("test_util") {
-   testonly = true
- 
-   sources = [
-+    "child_process_logger.cc",
-+    "child_process_logger.h",
-     "file_remover_test_util.cc",
-     "file_remover_test_util.h",
-     "reboot_deletion_helper.cc",
-@@ -228,6 +230,7 @@ source_set("integration_test_sources") {
-     "//chrome/chrome_cleaner/os:common_os",
-     "//chrome/chrome_cleaner/pup_data:pup_data_base",
-     "//chrome/chrome_cleaner/pup_data:test_uws",
-+    "//chrome/chrome_cleaner/test:test_util",
-     "//chrome/chrome_cleaner/zip_archiver:common",
-     "//components/chrome_cleaner/public/constants",
-     "//components/chrome_cleaner/test:test_name_helper",
-diff --git a/chrome/chrome_cleaner/test/child_process_logger.cc b/chrome/chrome_cleaner/test/child_process_logger.cc
-new file mode 100644
-index 0000000000000..9f4836267aea6
---- /dev/null
-+++ b/chrome/chrome_cleaner/test/child_process_logger.cc
-@@ -0,0 +1,90 @@
-+// Copyright 2019 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/chrome_cleaner/test/child_process_logger.h"
-+
-+#include <vector>
-+
-+#include "base/files/file_util.h"
-+#include "base/logging.h"
-+#include "base/strings/string_piece.h"
-+#include "base/strings/string_split.h"
-+
-+namespace chrome_cleaner {
-+
-+ChildProcessLogger::ChildProcessLogger() = default;
-+
-+ChildProcessLogger::~ChildProcessLogger() = default;
-+
-+bool ChildProcessLogger::Initialize() {
-+  // Adapted from
-+  // https://cs.chromium.org/chromium/src/sandbox/win/src/handle_inheritance_test.cc
-+  if (!temp_dir_.CreateUniqueTempDir()) {
-+    PLOG(ERROR) << "Could not create temp dir for child stdout";
-+    return false;
-+  }
-+
-+  if (!CreateTemporaryFileInDir(temp_dir_.GetPath(), &temp_file_name_)) {
-+    PLOG(ERROR) << "Could not create temp file for child stdout";
-+    return false;
-+  }
-+
-+  SECURITY_ATTRIBUTES attrs = {};
-+  attrs.nLength = sizeof(attrs);
-+  attrs.bInheritHandle = true;
-+
-+  child_stdout_handle_.Set(
-+      ::CreateFile(temp_file_name_.value().c_str(), GENERIC_WRITE,
-+                   FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE,
-+                   &attrs, OPEN_EXISTING, 0, nullptr));
-+  if (!child_stdout_handle_.IsValid()) {
-+    PLOG(ERROR) << "Could not open child stdout file";
-+    return false;
-+  }
-+
-+  return true;
-+}
-+
-+void ChildProcessLogger::UpdateLaunchOptions(
-+    base::LaunchOptions* options) const {
-+  DCHECK(child_stdout_handle_.IsValid());
-+  options->handles_to_inherit.push_back(child_stdout_handle_.Get());
-+  options->stdin_handle = INVALID_HANDLE_VALUE;
-+  options->stdout_handle = child_stdout_handle_.Get();
-+  options->stderr_handle = child_stdout_handle_.Get();
-+}
-+
-+void ChildProcessLogger::UpdateSandboxPolicy(
-+    sandbox::TargetPolicy* policy) const {
-+  DCHECK(child_stdout_handle_.IsValid());
-+  policy->SetStdoutHandle(child_stdout_handle_.Get());
-+  policy->SetStderrHandle(child_stdout_handle_.Get());
-+}
-+
-+void ChildProcessLogger::DumpLogs() const {
-+  DCHECK(!temp_file_name_.empty());
-+
-+  if (!base::PathExists(temp_file_name_)) {
-+    LOG(ERROR) << "Child process log file doesn't exist";
-+    return;
-+  }
-+
-+  // Collect the child process log file, and dump the contents, to help
-+  // debugging failures.
-+  std::string log_file_contents;
-+  if (!base::ReadFileToString(temp_file_name_, &log_file_contents)) {
-+    LOG(ERROR) << "Failed to read child process log file";
-+    return;
-+  }
-+
-+  std::vector<base::StringPiece> lines =
-+      base::SplitStringPiece(log_file_contents, "\n", base::TRIM_WHITESPACE,
-+                             base::SPLIT_WANT_NONEMPTY);
-+  LOG(ERROR) << "Dumping child process logs";
-+  for (const auto& line : lines) {
-+    LOG(ERROR) << "Child process: " << line;
-+  }
-+}
-+
-+}  // namespace chrome_cleaner
-diff --git a/chrome/chrome_cleaner/test/child_process_logger.h b/chrome/chrome_cleaner/test/child_process_logger.h
-new file mode 100644
-index 0000000000000..215fa911d7899
---- /dev/null
-+++ b/chrome/chrome_cleaner/test/child_process_logger.h
-@@ -0,0 +1,62 @@
-+// Copyright 2019 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_CHROME_CLEANER_TEST_CHILD_PROCESS_LOGGER_H_
-+#define CHROME_CHROME_CLEANER_TEST_CHILD_PROCESS_LOGGER_H_
-+
-+#include "base/files/scoped_temp_dir.h"
-+#include "base/process/launch.h"
-+#include "base/win/scoped_handle.h"
-+#include "sandbox/win/src/sandbox_policy.h"
-+
-+namespace chrome_cleaner {
-+
-+// Redirects stdin and stdout of a child process to a temp file. Tests that
-+// spawn children can add the contents of the temp file to the test output.
-+//
-+// Note that if the child process sets up ScopedLogging, ERROR and FATAL level
-+// logs will still be captured by this, but other logs will start going to the
-+// ScopedLogging log file. test_main.cc sets up ScopedLogging so usually this
-+// class will capture:
-+//
-+// 1. All log lines from before the ScopedLogging constructor.
-+// 2. ERROR and FATAL log lines from after that.
-+// 3. stdout and stderr output that doesn't go through the logging system.
-+// 4. Stack traces from any crashes.
-+//
-+// This should be all that's needed to diagnose errors in tests.
-+class ChildProcessLogger {
-+ public:
-+  ChildProcessLogger();
-+  ~ChildProcessLogger();
-+
-+  // Creates a temp file for child processes to log to. Logs an error and
-+  // returns false on failure.
-+  bool Initialize();
-+
-+  // Updates |options| to direct the child stdout and stderr to the temp file.
-+  // For use with base::LaunchProcess and base::SpawnMultiProcessTestChild.
-+  void UpdateLaunchOptions(base::LaunchOptions* options) const;
-+
-+  // Updates |policy| to direct the child stdout and stderr to the temp file.
-+  // For use with sandbox::BrokerServices::SpawnTarget.
-+  void UpdateSandboxPolicy(sandbox::TargetPolicy* policy) const;
-+
-+  // Writes every line in the temp file using LOG(ERROR) so that all lines are
-+  // captured in the test suite output. The class-level comment above describes
-+  // which log lines from the child will be captured.
-+  void DumpLogs() const;
-+
-+ private:
-+  ChildProcessLogger(const ChildProcessLogger& other) = delete;
-+  ChildProcessLogger& operator=(const ChildProcessLogger& other) = delete;
-+
-+  base::ScopedTempDir temp_dir_;
-+  base::FilePath temp_file_name_;
-+  base::win::ScopedHandle child_stdout_handle_;
-+};
-+
-+}  // namespace chrome_cleaner
-+
-+#endif  // CHROME_CHROME_CLEANER_TEST_CHILD_PROCESS_LOGGER_H_
-diff --git a/chrome/chrome_cleaner/test/cleaner_test.cc b/chrome/chrome_cleaner/test/cleaner_test.cc
-index d6df17e3516f1..f778103bfdad3 100644
---- a/chrome/chrome_cleaner/test/cleaner_test.cc
-+++ b/chrome/chrome_cleaner/test/cleaner_test.cc
-@@ -24,6 +24,7 @@
- #include "chrome/chrome_cleaner/os/pre_fetched_paths.h"
- #include "chrome/chrome_cleaner/pup_data/pup_data.h"
- #include "chrome/chrome_cleaner/pup_data/test_uws.h"
-+#include "chrome/chrome_cleaner/test/child_process_logger.h"
- #include "chrome/chrome_cleaner/test/test_util.h"
- #include "chrome/chrome_cleaner/zip_archiver/sandboxed_zip_archiver.h"
- #include "components/chrome_cleaner/public/constants/constants.h"
-@@ -311,8 +312,14 @@ class CleanerTest
- 
-   void ExpectExitCode(const base::CommandLine& command_line,
-                       int expected_exit_code) {
--    base::Process process(
--        base::LaunchProcess(command_line, base::LaunchOptions()));
-+    chrome_cleaner::ChildProcessLogger logger;
-+    ASSERT_TRUE(logger.Initialize());
-+
-+    base::LaunchOptions options;
-+    logger.UpdateLaunchOptions(&options);
-+    base::Process process(base::LaunchProcess(command_line, options));
-+    if (!process.IsValid())
-+      logger.DumpLogs();
-     ASSERT_TRUE(process.IsValid());
- 
-     int exit_code = -1;
-@@ -320,7 +327,8 @@ class CleanerTest
-         base::TimeDelta::FromMinutes(10), &exit_code);
-     EXPECT_TRUE(exited_within_timeout);
-     EXPECT_EQ(expected_exit_code, exit_code);
--
-+    if (!exited_within_timeout || expected_exit_code != exit_code)
-+      logger.DumpLogs();
-     if (!exited_within_timeout)
-       process.Terminate(/*exit_code=*/-1, /*wait=*/false);
-   }
-diff --git a/chrome/chrome_cleaner/test/secure_dll_loading_test.cc b/chrome/chrome_cleaner/test/secure_dll_loading_test.cc
-index fe10c44346b5e..92e2db19fde6c 100644
---- a/chrome/chrome_cleaner/test/secure_dll_loading_test.cc
-+++ b/chrome/chrome_cleaner/test/secure_dll_loading_test.cc
-@@ -8,22 +8,17 @@
- 
- #include <memory>
- #include <set>
--#include <string>
- #include <vector>
- 
- #include "base/base_paths.h"
- #include "base/command_line.h"
- #include "base/files/file_path.h"
--#include "base/files/file_util.h"
--#include "base/files/scoped_temp_dir.h"
- #include "base/logging.h"
- #include "base/path_service.h"
- #include "base/process/launch.h"
- #include "base/process/process.h"
- #include "base/strings/string16.h"
- #include "base/strings/string_number_conversions.h"
--#include "base/strings/string_piece.h"
--#include "base/strings/string_split.h"
- #include "base/strings/string_util.h"
- #include "base/synchronization/waitable_event.h"
- #include "base/test/test_timeouts.h"
-@@ -32,54 +27,16 @@
- #include "chrome/chrome_cleaner/constants/chrome_cleaner_switches.h"
- #include "chrome/chrome_cleaner/os/inheritable_event.h"
- #include "chrome/chrome_cleaner/os/process.h"
-+#include "chrome/chrome_cleaner/test/child_process_logger.h"
- #include "chrome/chrome_cleaner/test/test_util.h"
- #include "components/chrome_cleaner/public/constants/constants.h"
- #include "components/chrome_cleaner/test/test_name_helper.h"
- #include "testing/gtest/include/gtest/gtest.h"
- 
--namespace {
--
--void PrintChildProcessLogs(const base::FilePath& log_dir,
--                           base::StringPiece16 file_name) {
--  base::string16 base_name;
--  if (file_name == L"software_reporter_tool") {
--    base_name = L"software_reporter_tool";
--  } else if (file_name == L"chrome_cleanup_tool") {
--    base_name = L"chrome_cleanup";
--  } else {
--    LOG(ERROR) << "Unknown file name " << file_name.data();
--    return;
--  }
--
--  base::FilePath log_path = log_dir.Append(base_name).AddExtension(L"log");
--
--  if (!base::PathExists(log_path)) {
--    LOG(ERROR) << "Child process log file doesn't exist";
--    return;
--  }
--
--  // Collect the child process log file, and dump the contents, to help
--  // debugging failures.
--  std::string log_file_contents;
--  if (!base::ReadFileToString(log_path, &log_file_contents)) {
--    LOG(ERROR) << "Failed to read child process log file";
--    return;
--  }
--
--  std::vector<base::StringPiece> lines =
--      base::SplitStringPiece(log_file_contents, "\n", base::TRIM_WHITESPACE,
--                             base::SPLIT_WANT_NONEMPTY);
--  LOG(ERROR) << "Dumping child process logs";
--  for (const auto& line : lines) {
--    LOG(ERROR) << "Child process: " << line;
--  }
--}
--
--}  // namespace
--
- class SecureDLLLoadingTest : public testing::TestWithParam<base::string16> {
-  protected:
-   void SetUp() override {
-+    ASSERT_TRUE(child_process_logger_.Initialize());
-     base::FilePath out_dir;
-     ASSERT_TRUE(base::PathService::Get(base::DIR_EXE, &out_dir));
-     exe_path_ = out_dir.Append(GetParam() + L".exe");
-@@ -104,8 +61,6 @@ class SecureDLLLoadingTest : public testing::TestWithParam<base::string16> {
-         base::NumberToString16(
-             base::win::HandleToUint32(init_done_notifier->handle())));
-     command_line.AppendSwitch(chrome_cleaner::kLoadEmptyDLLSwitch);
--    command_line.AppendSwitchPath(chrome_cleaner::kTestLoggingPathSwitch,
--                                  log_dir.GetPath());
- 
- #if !BUILDFLAG(IS_OFFICIAL_CHROME_CLEANER_BUILD)
-     if (disable_secure_dll_loading)
-@@ -121,7 +76,12 @@ class SecureDLLLoadingTest : public testing::TestWithParam<base::string16> {
- 
-     base::LaunchOptions options;
-     options.handles_to_inherit.push_back(init_done_notifier->handle());
-+    child_process_logger_.UpdateLaunchOptions(&options);
-     base::Process process = base::LaunchProcess(command_line, options);
-+    if (!process.IsValid()) {
-+      child_process_logger_.DumpLogs();
-+      return process;
-+    }
- 
-     // Make sure the process has finished its initialization (including loading
-     // DLLs). Also check the process handle in case it exits with an error.
-@@ -136,7 +96,7 @@ class SecureDLLLoadingTest : public testing::TestWithParam<base::string16> {
-       PLOG_IF(ERROR, !::GetExitCodeProcess(process.Handle(), &exit_code));
-       ADD_FAILURE() << "Process exited with " << exit_code
-                     << " before signalling init_done_notifier";
--      PrintChildProcessLogs(log_dir.GetPath(), GetParam());
-+      child_process_logger_.DumpLogs();
-     } else {
-       EXPECT_EQ(wait_result, WAIT_OBJECT_0);
-     }
-@@ -157,6 +117,7 @@ class SecureDLLLoadingTest : public testing::TestWithParam<base::string16> {
-   }
- 
-  private:
-+  chrome_cleaner::ChildProcessLogger child_process_logger_;
-   base::FilePath exe_path_;
-   base::FilePath empty_dll_path_;
- };
diff --git a/srcpkgs/electron7/files/patches/chromium-004-upstream_use_childprocesslogger.patch.patch b/srcpkgs/electron7/files/patches/chromium-004-upstream_use_childprocesslogger.patch.patch
deleted file mode 100644
index 6a2a4893d445..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-004-upstream_use_childprocesslogger.patch.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From 890956be1496b625967df0bbf620e8fc4aefb390 Mon Sep 17 00:00:00 2001
-From: Joe Mason <joenotcharles@google.com>
-Date: Wed, 4 Dec 2019 18:22:34 +0000
-Subject: [PATCH] Use ChildProcessLogger in FileRemoverQuarantineTest and
- SandboxedShortcutParserTest
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-R=​proberge
-
-(cherry picked from commit 814583834ebf35ede5dad0ba3574343851b1a8bd)
-
-Bug: 1030333
-Change-Id: I66b9b3dc73980e8ed03ee37d89eb172b5330c913
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1948235
-Commit-Queue: Joe Mason <joenotcharles@chromium.org>
-Reviewed-by: proberge <proberge@chromium.org>
-Cr-Original-Commit-Position: refs/heads/master@{#721193}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1948102
-Reviewed-by: Joe Mason <joenotcharles@chromium.org>
-Cr-Commit-Position: refs/branch-heads/3904@{#915}
-Cr-Branched-From: 675968a8c657a3bd9c1c2c20c5d2935577bbc5e6-refs/heads/master@{#693954}
----
- .../os/file_remover_unittest.cc               | 39 ++++++++++++++++---
- .../parsers/shortcut_parser/broker/BUILD.gn   |  1 +
- .../sandboxed_shortcut_parser_unittest.cc     | 35 +++++++++++++++--
- 3 files changed, 67 insertions(+), 8 deletions(-)
-
-diff --git a/chrome/chrome_cleaner/os/file_remover_unittest.cc b/chrome/chrome_cleaner/os/file_remover_unittest.cc
-index 52c9b4f1c5089..c57983e83c6b9 100644
---- a/chrome/chrome_cleaner/os/file_remover_unittest.cc
-+++ b/chrome/chrome_cleaner/os/file_remover_unittest.cc
-@@ -30,6 +30,7 @@
- #include "chrome/chrome_cleaner/os/pre_fetched_paths.h"
- #include "chrome/chrome_cleaner/os/system_util.h"
- #include "chrome/chrome_cleaner/os/whitelisted_directory.h"
-+#include "chrome/chrome_cleaner/test/child_process_logger.h"
- #include "chrome/chrome_cleaner/test/file_remover_test_util.h"
- #include "chrome/chrome_cleaner/test/reboot_deletion_helper.h"
- #include "chrome/chrome_cleaner/test/resources/grit/test_resources.h"
-@@ -398,20 +399,47 @@ constexpr wchar_t kTestExpectArchiveName[] =
-     L"temp_file.exe_"
-     L"A591A6D40BF420404A011733CFB7B190D62C65BF0BCDA32B57B277D9AD9F146E.zip";
- 
-+class LoggedZipArchiverSandboxSetupHooks : public ZipArchiverSandboxSetupHooks {
-+ public:
-+  explicit LoggedZipArchiverSandboxSetupHooks(
-+      scoped_refptr<MojoTaskRunner> mojo_task_runner,
-+      base::OnceClosure connection_error_handler,
-+      chrome_cleaner::ChildProcessLogger* child_process_logger)
-+      : ZipArchiverSandboxSetupHooks(std::move(mojo_task_runner),
-+                                     std::move(connection_error_handler)),
-+        child_process_logger_(child_process_logger) {}
-+
-+  ResultCode UpdateSandboxPolicy(sandbox::TargetPolicy* policy,
-+                                 base::CommandLine* command_line) override {
-+    child_process_logger_->UpdateSandboxPolicy(policy);
-+    return ZipArchiverSandboxSetupHooks::UpdateSandboxPolicy(policy,
-+                                                             command_line);
-+  }
-+
-+ private:
-+  chrome_cleaner::ChildProcessLogger* child_process_logger_;
-+};
-+
- class FileRemoverQuarantineTest : public base::MultiProcessTest,
-                                   public ::testing::WithParamInterface<bool> {
-  public:
-   void SetUp() override {
-     use_reboot_removal_ = GetParam();
- 
-+    ASSERT_TRUE(child_process_logger_.Initialize());
-+
-     scoped_refptr<MojoTaskRunner> mojo_task_runner = MojoTaskRunner::Create();
--    ZipArchiverSandboxSetupHooks setup_hooks(
-+    LoggedZipArchiverSandboxSetupHooks setup_hooks(
-         mojo_task_runner.get(), base::BindOnce([] {
-           FAIL() << "ZipArchiver sandbox connection error";
--        }));
--    ASSERT_EQ(RESULT_CODE_SUCCESS,
--              StartSandboxTarget(MakeCmdLine("FileRemoverQuarantineTargetMain"),
--                                 &setup_hooks, SandboxType::kTest));
-+        }),
-+        &child_process_logger_);
-+    ResultCode result_code =
-+        StartSandboxTarget(MakeCmdLine("FileRemoverQuarantineTargetMain"),
-+                           &setup_hooks, SandboxType::kTest);
-+    if (result_code != RESULT_CODE_SUCCESS)
-+      child_process_logger_.DumpLogs();
-+    ASSERT_EQ(RESULT_CODE_SUCCESS, result_code);
- 
-     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
- 
-@@ -447,6 +475,7 @@ class FileRemoverQuarantineTest : public base::MultiProcessTest,
-   base::test::SingleThreadTaskEnvironment task_environment_;
-   base::ScopedTempDir temp_dir_;
-   std::unique_ptr<FileRemover> file_remover_;
-+  chrome_cleaner::ChildProcessLogger child_process_logger_;
- };
- 
- }  // namespace
-diff --git a/chrome/chrome_cleaner/parsers/shortcut_parser/broker/BUILD.gn b/chrome/chrome_cleaner/parsers/shortcut_parser/broker/BUILD.gn
-index bc7ba8188c83b..09ed07b761a4e 100644
---- a/chrome/chrome_cleaner/parsers/shortcut_parser/broker/BUILD.gn
-+++ b/chrome/chrome_cleaner/parsers/shortcut_parser/broker/BUILD.gn
-@@ -67,6 +67,7 @@ source_set("unittest_sources") {
-     "//chrome/chrome_cleaner/parsers/shortcut_parser:sandboxed_lnk_parser_test_util",
-     "//chrome/chrome_cleaner/parsers/shortcut_parser/target:lnk_parser",
-     "//chrome/chrome_cleaner/parsers/target:parser_sandbox_target",
-+    "//chrome/chrome_cleaner/test:test_util",
-     "//mojo/public/cpp/bindings:bindings",
-     "//sandbox/win:sandbox",
-     "//testing/gtest",
-diff --git a/chrome/chrome_cleaner/parsers/shortcut_parser/broker/sandboxed_shortcut_parser_unittest.cc b/chrome/chrome_cleaner/parsers/shortcut_parser/broker/sandboxed_shortcut_parser_unittest.cc
-index 64ac91ed92016..4c033f21c77c3 100644
---- a/chrome/chrome_cleaner/parsers/shortcut_parser/broker/sandboxed_shortcut_parser_unittest.cc
-+++ b/chrome/chrome_cleaner/parsers/shortcut_parser/broker/sandboxed_shortcut_parser_unittest.cc
-@@ -18,6 +18,7 @@
- #include "chrome/chrome_cleaner/parsers/broker/sandbox_setup_hooks.h"
- #include "chrome/chrome_cleaner/parsers/shortcut_parser/sandboxed_lnk_parser_test_util.h"
- #include "chrome/chrome_cleaner/parsers/target/sandbox_setup.h"
-+#include "chrome/chrome_cleaner/test/child_process_logger.h"
- #include "mojo/public/cpp/bindings/interface_request.h"
- #include "mojo/public/cpp/system/platform_handle.h"
- #include "sandbox/win/src/sandbox_factory.h"
-@@ -31,6 +32,26 @@ constexpr unsigned int kDirQuantity = 5;
- 
- const base::string16 kLnkArguments = L"-a -b -c -d GenericExample";
- 
-+class LoggedParserSandboxSetupHooks : public ParserSandboxSetupHooks {
-+ public:
-+  explicit LoggedParserSandboxSetupHooks(
-+      scoped_refptr<MojoTaskRunner> mojo_task_runner,
-+      base::OnceClosure connection_error_handler,
-+      chrome_cleaner::ChildProcessLogger* child_process_logger)
-+      : ParserSandboxSetupHooks(std::move(mojo_task_runner),
-+                                std::move(connection_error_handler)),
-+        child_process_logger_(child_process_logger) {}
-+
-+  ResultCode UpdateSandboxPolicy(sandbox::TargetPolicy* policy,
-+                                 base::CommandLine* command_line) override {
-+    child_process_logger_->UpdateSandboxPolicy(policy);
-+    return ParserSandboxSetupHooks::UpdateSandboxPolicy(policy, command_line);
-+  }
-+
-+ private:
-+  chrome_cleaner::ChildProcessLogger* child_process_logger_;
-+};
-+
- }  // namespace
- 
- class SandboxedShortcutParserTest : public base::MultiProcessTest {
-@@ -40,14 +61,20 @@ class SandboxedShortcutParserTest : public base::MultiProcessTest {
-         temp_dirs_with_chrome_lnk_(kDirQuantity) {}
- 
-   void SetUp() override {
-+    ASSERT_TRUE(child_process_logger_.Initialize());
-+
-     mojo_task_runner_ = MojoTaskRunner::Create();
-     ParserSandboxSetupHooks setup_hooks(
-         mojo_task_runner_.get(),
-         base::BindOnce([] { FAIL() << "Parser sandbox connection error"; }));
--    ASSERT_EQ(
--        RESULT_CODE_SUCCESS,
-+
-+    ResultCode result_code =
-         StartSandboxTarget(MakeCmdLine("SandboxedShortcutParserTargetMain"),
--                           &setup_hooks, SandboxType::kTest));
-+                           &setup_hooks, SandboxType::kTest);
-+    if (result_code != RESULT_CODE_SUCCESS)
-+      child_process_logger_.DumpLogs();
-+    ASSERT_EQ(RESULT_CODE_SUCCESS, result_code);
-+
-     parser_ptr_ = setup_hooks.TakeParserPtr();
-     shortcut_parser_ = std::make_unique<SandboxedShortcutParser>(
-         mojo_task_runner_.get(), parser_ptr_.get());
-@@ -98,6 +125,8 @@ class SandboxedShortcutParserTest : public base::MultiProcessTest {
-   base::FilePath not_lnk_file_path_;
- 
-   base::test::TaskEnvironment task_environment_;
-+
-+  chrome_cleaner::ChildProcessLogger child_process_logger_;
- };
- 
- MULTIPROCESS_TEST_MAIN(SandboxedShortcutParserTargetMain) {
diff --git a/srcpkgs/electron7/files/patches/chromium-005-upstream-chromium_version.patch.patch b/srcpkgs/electron7/files/patches/chromium-005-upstream-chromium_version.patch.patch
deleted file mode 100644
index 65b8ef4df0a5..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-005-upstream-chromium_version.patch.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c1109b707b1eda5d98eb2ed6bd74083bc352f482 Mon Sep 17 00:00:00 2001
-From: chrome-release-bot <chrome-release-bot@chromium.org>
-Date: Fri, 6 Dec 2019 01:09:50 +0000
-Subject: [PATCH] Incrementing VERSION to 78.0.3904.130
-
-TBR=govind@chromium.org
-
-Change-Id: Ib675653e2605cf2c15ebdbd1320465b08a49994d
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1954709
-Reviewed-by: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
-Cr-Commit-Position: refs/branch-heads/3904@{#917}
-Cr-Branched-From: 675968a8c657a3bd9c1c2c20c5d2935577bbc5e6-refs/heads/master@{#693954}
----
- chrome/VERSION | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/VERSION b/chrome/VERSION
-index 7a4383a1ccb7f..50f887f746227 100644
---- a/chrome/VERSION
-+++ b/chrome/VERSION
-@@ -1,4 +1,4 @@
- MAJOR=78
- MINOR=0
- BUILD=3904
--PATCH=108
-+PATCH=130
diff --git a/srcpkgs/electron7/files/patches/chromium-77-clang.patch b/srcpkgs/electron7/files/patches/chromium-77-clang.patch
deleted file mode 100644
index a57b5a458a4d..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-77-clang.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/base/location.h b/base/location.h
-index c07e747..924db1c 100644
---- a/base/location.h
-+++ b/base/location.h
-@@ -18,7 +18,7 @@
- 
- namespace base {
- 
--#if defined(__has_builtin)
-+#if defined(__clang__)
- // Clang allows detection of these builtins.
- #define SUPPORTS_LOCATION_BUILTINS                                       \
-   (__has_builtin(__builtin_FUNCTION) && __has_builtin(__builtin_FILE) && \
diff --git a/srcpkgs/electron7/files/patches/chromium-77-pulseaudio-13.patch b/srcpkgs/electron7/files/patches/chromium-77-pulseaudio-13.patch
deleted file mode 100644
index 892a3183c9da..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-77-pulseaudio-13.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 7ac85fb4cc6f44a21761a591ac497ae3d6bf966d Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Mon, 23 Sep 2019 13:49:53 +0200
-Subject: [PATCH] Fix building with pulseaudio 13
-
-The function signature changed though the ABI stayed the same.
-
-(Modified to apply on chromium sources too)
-
-Change-Id: I86ca361b5e4f0c523e1031910df438c23beee876
-Fixes: QTBUG-77037
-Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
----
-
-diff --git a/media/audio/pulse/pulse.sigs b/media/audio/pulse/pulse.sigs
-index 8b58887..daaeb14 100644
---- a/media/audio/pulse/pulse.sigs
-+++ b/media/audio/pulse/pulse.sigs
-@@ -24,11 +24,11 @@
- pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata);
- pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata);
- pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata);
--pa_context_state_t pa_context_get_state(pa_context* c);
-+pa_context_state_t pa_context_get_state(const_pa_context_ptr c);
- pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name);
- pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata);
- void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata);
--pa_operation_state_t pa_operation_get_state(pa_operation* o);
-+pa_operation_state_t pa_operation_get_state(const_pa_operation_ptr o);
- void pa_context_unref(pa_context* c);
- void pa_operation_unref(pa_operation* o);
- int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes);
-@@ -38,23 +38,23 @@
- int pa_stream_disconnect(pa_stream* s);
- int pa_stream_drop(pa_stream *p);
- pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata);
--uint32_t pa_stream_get_device_index(pa_stream* s);
-+uint32_t pa_stream_get_device_index(const_pa_stream_ptr s);
- int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative);
--pa_stream_state_t pa_stream_get_state(pa_stream* p);
-+pa_stream_state_t pa_stream_get_state(const_pa_stream_ptr p);
- pa_stream* pa_stream_new(pa_context*  c, const char*  name, const pa_sample_spec*  ss, const pa_channel_map *  map);
- pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p);
- pa_proplist* pa_proplist_new(void);
--int pa_proplist_contains(pa_proplist* p, const char* key);
-+int pa_proplist_contains(const_pa_proplist_ptr p, const char* key);
- void pa_proplist_free(pa_proplist* p);
--const char* pa_proplist_gets(pa_proplist* p, const char* key);
-+const char* pa_proplist_gets(const_pa_proplist_ptr p, const char* key);
- int pa_proplist_sets(pa_proplist* p, const char* key, const char* value);
--size_t pa_stream_readable_size(pa_stream *p);
-+size_t pa_stream_readable_size(const_pa_stream_ptr p);
- int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes);
- void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata);
- void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata);
- int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek);
- void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata);
- void pa_stream_unref(pa_stream* s);
--int pa_context_errno(pa_context *c);
-+int pa_context_errno(const_pa_context_ptr c);
- const char* pa_strerror(int error);
- pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned  channels, pa_volume_t v);
-diff --git a/chromium/media/audio/pulse/pulse_stub_header.fragment b/chromium/media/audio/pulse/pulse_stub_header.fragment
-index 2a2d3e7..cdaa841 100644
---- a/media/audio/pulse/pulse_stub_header.fragment
-+++ b/media/audio/pulse/pulse_stub_header.fragment
-@@ -5,4 +5,15 @@
- 
- #include <pulse/pulseaudio.h>
- 
-+#if PA_MAJOR > 12
-+typedef const pa_context* const_pa_context_ptr;
-+typedef const pa_operation* const_pa_operation_ptr;
-+typedef const pa_proplist* const_pa_proplist_ptr;
-+typedef const pa_stream* const_pa_stream_ptr;
-+#else
-+typedef pa_context* const_pa_context_ptr;
-+typedef pa_operation* const_pa_operation_ptr;
-+typedef pa_proplist* const_pa_proplist_ptr;
-+typedef pa_stream* const_pa_stream_ptr;
-+#endif
- }
diff --git a/srcpkgs/electron7/files/patches/chromium-77-system-icu.patch b/srcpkgs/electron7/files/patches/chromium-77-system-icu.patch
deleted file mode 100644
index 1f848d7ee2be..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-77-system-icu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/build/linux/unbundle/icu.gn b/build/linux/unbundle/icu.gn
-index 4450e40..9ca36dd 100644
---- a/build/linux/unbundle/icu.gn
-+++ b/build/linux/unbundle/icu.gn
-@@ -96,6 +96,7 @@ shim_headers("icui18n_shim") {
-     "unicode/fpositer.h",
-     "unicode/gender.h",
-     "unicode/gregocal.h",
-+    "unicode/listformatter.h",
-     "unicode/measfmt.h",
-     "unicode/measunit.h",
-     "unicode/measure.h",
-@@ -178,7 +179,6 @@ shim_headers("icuuc_shim") {
-     "unicode/icudataver.h",
-     "unicode/icuplug.h",
-     "unicode/idna.h",
--    "unicode/listformatter.h",
-     "unicode/localpointer.h",
-     "unicode/locdspnm.h",
-     "unicode/locid.h",
diff --git a/srcpkgs/electron7/files/patches/chromium-78-gcc-alignas.patch b/srcpkgs/electron7/files/patches/chromium-78-gcc-alignas.patch
deleted file mode 100644
index bce4118596bf..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-78-gcc-alignas.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 6b633c4b14850df376d5cec571699018772f358e Mon Sep 17 00:00:00 2001
-From: Tomas Popela <tomas.popela@gmail.com>
-Date: Tue, 17 Sep 2019 19:48:48 +0000
-Subject: [PATCH] GCC: Can't use alignas() together with __attribute__()
-
-It's because GCC has problems when mixing the alignas() together with
-__attribute__() (that is used to export the symbols). The best
-solution is to use ALIGNAS() macro from //base/compiler_specific.h
-together with alignof() to have the equal functionality that compiles on
-GCC as well as on clang.
-
-Bug: 819294
-Change-Id: Ieb169592a2965f17a18bfc88d28418eb723a4e5a
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1806735
-Auto-Submit: Tom     Popela <tomas.popela@gmail.com>
-Commit-Queue: Alex Clarke <alexclarke@chromium.org>
-Reviewed-by: Alex Clarke <alexclarke@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#697330}
----
-
-diff --git a/base/task/promise/dependent_list.h b/base/task/promise/dependent_list.h
-index 020bdbfc..3245c1c 100644
---- a/base/task/promise/dependent_list.h
-+++ b/base/task/promise/dependent_list.h
-@@ -59,7 +59,7 @@
- 
-   // Align Node on an 8-byte boundary to ensure the first 3 bits are 0 and can
-   // be used to store additional state (see static_asserts below).
--  class BASE_EXPORT alignas(8) Node {
-+  class BASE_EXPORT ALIGNAS(8) Node {
-    public:
-     Node();
-     explicit Node(Node&& other) noexcept;
-
-Re-use chromium alignas workaround in protobuf.
----
-
-diff --git a/third_party/protobuf/src/google/protobuf/port_def.inc b/third_party/protobuf/src/google/protobuf/port_def.inc
-index f1bd85d..9c204a1 100644
---- a/third_party/protobuf/src/google/protobuf/port_def.inc
-+++ b/third_party/protobuf/src/google/protobuf/port_def.inc
-@@ -528,6 +528,35 @@ PROTOBUF_EXPORT_TEMPLATE_TEST(DEFAULT, __declspec(dllimport));
- #undef IN
- #endif  // _MSC_VER
- 
-+// Specify memory alignment for structs, classes, etc.
-+// Use like:
-+//   class PROTOBUF_ALIGNAS(16) MyClass { ... }
-+//   PROTOBUF_ALIGNAS(16) int array[4];
-+//
-+// In most places you can use the C++11 keyword "alignas", which is preferred.
-+//
-+// But compilers have trouble mixing __attribute__((...)) syntax with
-+// alignas(...) syntax.
-+//
-+// Doesn't work in clang or gcc:
-+//   struct alignas(16) __attribute__((packed)) S { char c; };
-+// Works in clang but not gcc:
-+//   struct __attribute__((packed)) alignas(16) S2 { char c; };
-+// Works in clang and gcc:
-+//   struct alignas(16) S3 { char c; } __attribute__((packed));
-+//
-+// There are also some attributes that must be specified *before* a class
-+// definition: visibility (used for exporting functions/classes) is one of
-+// these attributes. This means that it is not possible to use alignas() with a
-+// class that is marked as exported.
-+#if defined(_MSC_VER)
-+#define PROTOBUF_ALIGNAS(byte_alignment) __declspec(align(byte_alignment))
-+#elif defined(__GNUC__)
-+#define PROTOBUF_ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment)))
-+#else
-+#define PROTOBUF_ALIGNAS(byte_alignment) alignas(byte_alignment)
-+#endif
-+
- #if defined(__clang__)
- #pragma clang diagnostic push
- // TODO(gerbens) ideally we cleanup the code. But a cursory try shows many
-diff --git a/third_party/protobuf/src/google/protobuf/arena.h b/third_party/protobuf/src/google/protobuf/arena.h
-index dedc221..a8515ce 100644
---- a/third_party/protobuf/src/google/protobuf/arena.h
-+++ b/third_party/protobuf/src/google/protobuf/arena.h
-@@ -245,7 +245,7 @@ struct ArenaOptions {
- // well as protobuf container types like RepeatedPtrField and Map. The protocol
- // is internal to protobuf and is not guaranteed to be stable. Non-proto types
- // should not rely on this protocol.
--class PROTOBUF_EXPORT alignas(8) Arena final {
-+class PROTOBUF_EXPORT PROTOBUF_ALIGNAS(8) Arena final {
-  public:
-   // Arena constructor taking custom options. See ArenaOptions below for
-   // descriptions of the options available.
-diff --git a/third_party/protobuf/src/google/protobuf/port_undef.inc b/third_party/protobuf/src/google/protobuf/port_undef.inc
-index b7e67fe..ba1fffc 100644
---- a/third_party/protobuf/src/google/protobuf/port_undef.inc
-+++ b/third_party/protobuf/src/google/protobuf/port_undef.inc
-@@ -80,6 +80,7 @@
- #undef PROTOBUF_EXPORT_TEMPLATE_STYLE_MATCH_foj3FJo5StF0OvIzl7oMxA__declspec
- #undef PROTOBUF_EXPORT_TEMPLATE_STYLE_MATCH_DECLSPEC_dllexport
- #undef PROTOBUF_EXPORT_TEMPLATE_STYLE_MATCH_DECLSPEC_dllimport
-+#undef PROTOBUF_ALIGNAS
- 
- 
- 
diff --git a/srcpkgs/electron7/files/patches/chromium-78-gcc-enum-range.patch b/srcpkgs/electron7/files/patches/chromium-78-gcc-enum-range.patch
deleted file mode 100644
index 9c15e954b4ea..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-78-gcc-enum-range.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 9662ec844017690d5fd56bf0f05ef6a540dd29c1 Mon Sep 17 00:00:00 2001
-From: Tom Anderson <thomasanderson@chromium.org>
-Date: Mon, 09 Sep 2019 19:06:01 +0000
-Subject: [PATCH] Fix GCC build error
-
-Fixes this error:
-[  375s] In file included from ../../base/task/common/intrusive_heap.h:8,
-[  375s]                  from ../../base/task/thread_pool/task_source.h:17,
-[  375s]                  from ../../base/task/thread_pool/task_tracker.h:27,
-[  375s]                  from ./../../base/task/thread_pool/service_thread.cc:14,
-[  375s]                  from gen/base/base_jumbo_28.cc:5:
-[  375s] ../../base/containers/intrusive_heap.h:152:36: error: enumerator value
-         '-1' is outside the range of underlying type 'size_t' {aka 'long unsigned int'}
-[  375s]   152 |   enum : size_t { kInvalidIndex = -1 };
-[  375s]       |
-
-Change-Id: I6044fb704931b2f8416f6b19a247ae297cd7b0d6
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1792763
-Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
-Commit-Queue: Lei Zhang <thestig@chromium.org>
-Reviewed-by: Lei Zhang <thestig@chromium.org>
-Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#694853}
----
-
-diff --git a/base/containers/intrusive_heap.h b/base/containers/intrusive_heap.h
-index 53d3909..d7626bb 100644
---- a/base/containers/intrusive_heap.h
-+++ b/base/containers/intrusive_heap.h
-@@ -131,6 +131,7 @@
- 
- #include <algorithm>
- #include <functional>
-+#include <limits>
- #include <type_traits>
- #include <utility>
- #include <vector>
-@@ -149,7 +150,7 @@
- // in place.
- class BASE_EXPORT HeapHandle {
-  public:
--  enum : size_t { kInvalidIndex = -1 };
-+  enum : size_t { kInvalidIndex = std::numeric_limits<size_t>::max() };
- 
-   constexpr HeapHandle() = default;
-   constexpr HeapHandle(const HeapHandle& other) = default;
diff --git a/srcpkgs/electron7/files/patches/chromium-78-gcc-noexcept.patch b/srcpkgs/electron7/files/patches/chromium-78-gcc-noexcept.patch
deleted file mode 100644
index 8ddb53fe82d2..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-78-gcc-noexcept.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d16cda8fc3476cc534a756873cc8aa2692a57054 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Thu, 22 Aug 2019 13:13:36 +0200
-Subject: [PATCH] GCC: declare noexcept move constructor/assign operators of V8StackTraceId
-
-blink::BlinkCloneableMessage declares default implementation of
-move operator/assign operator that requires v8_inspector::V8StackTraceId
-to declare its move constructor/assign operator too.
-
-Bug: chromium:819294
-Change-Id: Iaf626ee8245efcba372a17cdf2de448e691d41d6
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1796062
-Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
-Reviewed-by: Yang Guo <yangguo@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#63799}
----
-
-diff --git a/v8/include/v8-inspector.h b/v8/include/v8-inspector.h
-index ce5b777..ed4cdec 100644
---- a/v8/include/v8-inspector.h
-+++ b/v8/include/v8-inspector.h
-@@ -231,7 +231,10 @@ struct V8_EXPORT V8StackTraceId {
-   std::pair<int64_t, int64_t> debugger_id;
- 
-   V8StackTraceId();
-+  V8StackTraceId(const V8StackTraceId&) = default;
-   V8StackTraceId(uintptr_t id, const std::pair<int64_t, int64_t> debugger_id);
-+  V8StackTraceId& operator=(const V8StackTraceId&) = default;
-+  V8StackTraceId& operator=(V8StackTraceId&&) noexcept = default;
-   ~V8StackTraceId() = default;
- 
-   bool IsInvalid() const;
diff --git a/srcpkgs/electron7/files/patches/chromium-78-icon.patch b/srcpkgs/electron7/files/patches/chromium-78-icon.patch
deleted file mode 100644
index 2cca7f10d19c..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-78-icon.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/ui/platform_window/x11/x11_window.cc b/ui/platform_window/x11/x11_window.cc
-index 7a3a6eb..7c01534 100644
---- a/ui/platform_window/x11/x11_window.cc
-+++ b/ui/platform_window/x11/x11_window.cc
-@@ -67,6 +67,7 @@ ui::XWindow::Configuration ConvertInitPropertiesToXWindowConfig(
-   config.wm_role_name = properties.wm_role_name;
-   config.activatable = properties.activatable;
-   config.visual_id = properties.x_visual_id;
-+  config.icon = properties.icon;
-   return config;
- }
- 
diff --git a/srcpkgs/electron7/files/patches/chromium-78-include.patch b/srcpkgs/electron7/files/patches/chromium-78-include.patch
deleted file mode 100644
index 3db38eac1c96..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-78-include.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From bbfe2665923225b4a7c436ba2b6c7e5f695f2e52 Mon Sep 17 00:00:00 2001
-From: David Landell <landell@vewd.com>
-Date: Fri, 13 Sep 2019 12:24:13 +0000
-Subject: [PATCH] Add missing include for unique_ptr
-
-Change-Id: I614d2f42868d563eb6a92dfb2aae08286e20d687
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1803137
-Reviewed-by: Henrik Boström <hbos@chromium.org>
-Commit-Queue: Henrik Boström <hbos@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#696355}
----
-
-diff --git a/third_party/blink/public/platform/web_rtc_rtp_source.h b/third_party/blink/public/platform/web_rtc_rtp_source.h
-index 959440f..c3fd542 100644
---- a/third_party/blink/public/platform/web_rtc_rtp_source.h
-+++ b/third_party/blink/public/platform/web_rtc_rtp_source.h
-@@ -5,6 +5,8 @@
- #ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_RTC_RTP_SOURCE_H_
- #define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_RTC_RTP_SOURCE_H_
- 
-+#include <memory>
-+
- #include "base/optional.h"
- #include "third_party/blink/public/platform/web_common.h"
- 
-Missing include due to reverting ProfileManagerObserver
----
-
-diff --git a/chrome/browser/web_applications/extensions/bookmark_app_util.cc b/chrome/browser/web_applications/extensions/bookmark_app_util.cc
-index ee4b70a..b31e5f5 100644
---- a/chrome/browser/web_applications/extensions/bookmark_app_util.cc
-+++ b/chrome/browser/web_applications/extensions/bookmark_app_util.cc
-@@ -7,6 +7,7 @@
- #include "base/strings/string_piece.h"
- #include "base/values.h"
- #include "chrome/browser/extensions/extension_service.h"
-+#include "chrome/browser/profiles/profile.h"
- #include "chrome/browser/web_applications/components/app_registrar.h"
- #include "chrome/browser/web_applications/components/web_app_provider_base.h"
- #include "chrome/common/chrome_features.h"
diff --git a/srcpkgs/electron7/files/patches/chromium-78-pm-crash.patch b/srcpkgs/electron7/files/patches/chromium-78-pm-crash.patch
deleted file mode 100644
index ada266120dc4..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-78-pm-crash.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e73aed9a5ef15102f29ac31b70290faf5c90f9fe Mon Sep 17 00:00:00 2001
-From: Evan Stade <estade@chromium.org>
-Date: Wed, 16 Oct 2019 16:01:32 +0000
-Subject: [PATCH] Fix shutdown crash in ProfileManager.
-
-OnProfileMarkedForPermanentDeletion should move from
-ProfileManagerObserver to ProfileObserver, which would also
-fix this bug. However, changing the order of members is the
-quickest and most cherry-pick-able way to avoid the crash.
-
-Bug: 1005244
-Change-Id: If2db68c846dd418cd02864b57b9b543687fa1e03
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1863518
-Auto-Submit: Evan Stade <estade@chromium.org>
-Reviewed-by: David Roger <droger@chromium.org>
-Commit-Queue: Evan Stade <estade@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#706467}
----
-
-diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
-index b60df76d..7d02af7 100644
---- a/chrome/browser/profiles/profile_manager.h
-+++ b/chrome/browser/profiles/profile_manager.h
-@@ -409,6 +409,10 @@ class ProfileManager : public content::NotificationObserver,
-       const base::FilePath& profile_dir);
- #endif  // !defined(OS_ANDROID)
- 
-+  // Destroy after |profile_info_cache_| since Profile destruction may trigger
-+  // some observers to unregister themselves.
-+  base::ObserverList<ProfileManagerObserver> observers_;
-+
-   // Object to cache various information about profiles. Contains information
-   // about every profile which has been created for this instance of Chrome,
-   // if it has not been explicitly deleted. It must be destroyed after
-@@ -450,8 +454,6 @@ class ProfileManager : public content::NotificationObserver,
-   // Controls whether to initialize some services. Only disabled for testing.
-   bool do_final_services_init_ = true;
- 
--  base::ObserverList<ProfileManagerObserver> observers_;
--
-   // TODO(chrome/browser/profiles/OWNERS): Usage of this in profile_manager.cc
-   // should likely be turned into DCHECK_CURRENTLY_ON(BrowserThread::UI) for
-   // consistency with surrounding code in the same file but that wasn't trivial
diff --git a/srcpkgs/electron7/files/patches/chromium-78-protobuf-export.patch b/srcpkgs/electron7/files/patches/chromium-78-protobuf-export.patch
deleted file mode 100644
index ddb9e80eefe4..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-78-protobuf-export.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/third_party/protobuf/src/google/protobuf/repeated_field.h b/third_party/protobuf/src/google/protobuf/repeated_field.h
-index b5b193c..4434854 100644
---- a/third_party/protobuf/src/google/protobuf/repeated_field.h
-+++ b/third_party/protobuf/src/google/protobuf/repeated_field.h
-@@ -804,7 +804,7 @@ class StringTypeHandler {
- // RepeatedPtrField is like RepeatedField, but used for repeated strings or
- // Messages.
- template <typename Element>
--class RepeatedPtrField final : private internal::RepeatedPtrFieldBase {
-+class PROTOBUF_EXPORT RepeatedPtrField final : private internal::RepeatedPtrFieldBase {
-  public:
-   RepeatedPtrField();
-   explicit RepeatedPtrField(Arena* arena);
diff --git a/srcpkgs/electron7/files/patches/chromium-78-revert-noexcept-r1.patch b/srcpkgs/electron7/files/patches/chromium-78-revert-noexcept-r1.patch
deleted file mode 100644
index 408d618b5419..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-78-revert-noexcept-r1.patch
+++ /dev/null
@@ -1,1471 +0,0 @@
-From 37a95dd93e553888c00cf9443a5ec738ce658e65 Mon Sep 17 00:00:00 2001
-From: Zinovy Nis <zynis@yandex-team.ru>
-Date: Mon, 16 Sep 2019 13:08:17 +0000
-Subject: [PATCH] Revert "[clang-tidy] add noexcept for move ctors and operator= in blink"
-
-This reverts commit 8f3eea10fe63a64ac67dc21542ebee6b896156a3.
-
-Reason for revert: code bloating
-
-Original change's description:
-> [clang-tidy] add noexcept for move ctors and operator= in blink
->
-> Bug: 994915
-> Change-Id: I2e1bcf286a2d2fa6613e18b5268098a0d258fb2e
-> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1759163
-> Commit-Queue: Zinovy Nis <zynis@yandex-team.ru>
-> Reviewed-by: Jeremy Roman <jbroman@chromium.org>
-> Reviewed-by: Mike West <mkwst@chromium.org>
-> Cr-Commit-Position: refs/heads/master@{#688676}
-
-TBR=jbroman@chromium.org,foolip@chromium.org,mkwst@chromium.org,zynis@yandex-team.ru
-
-# Not skipping CQ checks because original CL landed > 1 day ago.
-
-Bug: 994915
-Change-Id: I12b3ecc1186e27809082dc399c6d6864109ce307
----
-
-diff --git a/third_party/blink/common/indexeddb/indexeddb_key_path.cc b/third_party/blink/common/indexeddb/indexeddb_key_path.cc
-index ec2b618..552d541 100644
---- a/third_party/blink/common/indexeddb/indexeddb_key_path.cc
-+++ b/third_party/blink/common/indexeddb/indexeddb_key_path.cc
-@@ -18,12 +18,12 @@
-     : type_(mojom::IDBKeyPathType::Array), array_(array) {}
- 
- IndexedDBKeyPath::IndexedDBKeyPath(const IndexedDBKeyPath& other) = default;
--IndexedDBKeyPath::IndexedDBKeyPath(IndexedDBKeyPath&& other) noexcept = default;
-+IndexedDBKeyPath::IndexedDBKeyPath(IndexedDBKeyPath&& other) = default;
- IndexedDBKeyPath::~IndexedDBKeyPath() = default;
- IndexedDBKeyPath& IndexedDBKeyPath::operator=(const IndexedDBKeyPath& other) =
-     default;
--IndexedDBKeyPath& IndexedDBKeyPath::operator=(
--    IndexedDBKeyPath&& other) noexcept = default;
-+IndexedDBKeyPath& IndexedDBKeyPath::operator=(IndexedDBKeyPath&& other) =
-+    default;
- 
- const std::vector<base::string16>& IndexedDBKeyPath::array() const {
-   DCHECK(type_ == blink::mojom::IDBKeyPathType::Array);
-diff --git a/third_party/blink/common/indexeddb/indexeddb_metadata.cc b/third_party/blink/common/indexeddb/indexeddb_metadata.cc
-index 50d5845..9349732 100644
---- a/third_party/blink/common/indexeddb/indexeddb_metadata.cc
-+++ b/third_party/blink/common/indexeddb/indexeddb_metadata.cc
-@@ -23,15 +23,15 @@
- 
- IndexedDBIndexMetadata::IndexedDBIndexMetadata(
-     const IndexedDBIndexMetadata& other) = default;
--IndexedDBIndexMetadata::IndexedDBIndexMetadata(
--    IndexedDBIndexMetadata&& other) noexcept = default;
-+IndexedDBIndexMetadata::IndexedDBIndexMetadata(IndexedDBIndexMetadata&& other) =
-+    default;
- 
- IndexedDBIndexMetadata::~IndexedDBIndexMetadata() = default;
- 
- IndexedDBIndexMetadata& IndexedDBIndexMetadata::operator=(
-     const IndexedDBIndexMetadata& other) = default;
- IndexedDBIndexMetadata& IndexedDBIndexMetadata::operator=(
--    IndexedDBIndexMetadata&& other) noexcept = default;
-+    IndexedDBIndexMetadata&& other) = default;
- 
- bool IndexedDBIndexMetadata::operator==(
-     const IndexedDBIndexMetadata& other) const {
-@@ -56,14 +56,14 @@
- IndexedDBObjectStoreMetadata::IndexedDBObjectStoreMetadata(
-     const IndexedDBObjectStoreMetadata& other) = default;
- IndexedDBObjectStoreMetadata::IndexedDBObjectStoreMetadata(
--    IndexedDBObjectStoreMetadata&& other) noexcept = default;
-+    IndexedDBObjectStoreMetadata&& other) = default;
- 
- IndexedDBObjectStoreMetadata::~IndexedDBObjectStoreMetadata() = default;
- 
- IndexedDBObjectStoreMetadata& IndexedDBObjectStoreMetadata::operator=(
-     const IndexedDBObjectStoreMetadata& other) = default;
- IndexedDBObjectStoreMetadata& IndexedDBObjectStoreMetadata::operator=(
--    IndexedDBObjectStoreMetadata&& other) noexcept = default;
-+    IndexedDBObjectStoreMetadata&& other) = default;
- 
- bool IndexedDBObjectStoreMetadata::operator==(
-     const IndexedDBObjectStoreMetadata& other) const {
-@@ -87,14 +87,14 @@
- IndexedDBDatabaseMetadata::IndexedDBDatabaseMetadata(
-     const IndexedDBDatabaseMetadata& other) = default;
- IndexedDBDatabaseMetadata::IndexedDBDatabaseMetadata(
--    IndexedDBDatabaseMetadata&& other) noexcept = default;
-+    IndexedDBDatabaseMetadata&& other) = default;
- 
- IndexedDBDatabaseMetadata::~IndexedDBDatabaseMetadata() = default;
- 
- IndexedDBDatabaseMetadata& IndexedDBDatabaseMetadata::operator=(
-     const IndexedDBDatabaseMetadata& other) = default;
- IndexedDBDatabaseMetadata& IndexedDBDatabaseMetadata::operator=(
--    IndexedDBDatabaseMetadata&& other) noexcept = default;
-+    IndexedDBDatabaseMetadata&& other) = default;
- 
- bool IndexedDBDatabaseMetadata::operator==(
-     const IndexedDBDatabaseMetadata& other) const {
-diff --git a/third_party/blink/common/mediastream/media_devices.cc b/third_party/blink/common/mediastream/media_devices.cc
-index 93df201..3661b4b 100644
---- a/third_party/blink/common/mediastream/media_devices.cc
-+++ b/third_party/blink/common/mediastream/media_devices.cc
-@@ -13,8 +13,7 @@
- WebMediaDeviceInfo::WebMediaDeviceInfo(const WebMediaDeviceInfo& other) =
-     default;
- 
--WebMediaDeviceInfo::WebMediaDeviceInfo(WebMediaDeviceInfo&& other) noexcept =
--    default;
-+WebMediaDeviceInfo::WebMediaDeviceInfo(WebMediaDeviceInfo&& other) = default;
- 
- WebMediaDeviceInfo::WebMediaDeviceInfo(const std::string& device_id,
-                                        const std::string& label,
-@@ -36,8 +35,8 @@
- WebMediaDeviceInfo& WebMediaDeviceInfo::operator=(
-     const WebMediaDeviceInfo& other) = default;
- 
--WebMediaDeviceInfo& WebMediaDeviceInfo::operator=(
--    WebMediaDeviceInfo&& other) noexcept = default;
-+WebMediaDeviceInfo& WebMediaDeviceInfo::operator=(WebMediaDeviceInfo&& other) =
-+    default;
- 
- bool operator==(const WebMediaDeviceInfo& first,
-                 const WebMediaDeviceInfo& second) {
-diff --git a/third_party/blink/common/messaging/cloneable_message.cc b/third_party/blink/common/messaging/cloneable_message.cc
-index 2984fd1..5c3ee7e 100644
---- a/third_party/blink/common/messaging/cloneable_message.cc
-+++ b/third_party/blink/common/messaging/cloneable_message.cc
-@@ -12,9 +12,8 @@
- namespace blink {
- 
- CloneableMessage::CloneableMessage() = default;
--CloneableMessage::CloneableMessage(CloneableMessage&&) noexcept = default;
--CloneableMessage& CloneableMessage::operator=(CloneableMessage&&) noexcept =
--    default;
-+CloneableMessage::CloneableMessage(CloneableMessage&&) = default;
-+CloneableMessage& CloneableMessage::operator=(CloneableMessage&&) = default;
- CloneableMessage::~CloneableMessage() = default;
- 
- CloneableMessage CloneableMessage::ShallowClone() const {
-diff --git a/third_party/blink/common/messaging/transferable_message.cc b/third_party/blink/common/messaging/transferable_message.cc
-index 07ac9bb..4a69d0a 100644
---- a/third_party/blink/common/messaging/transferable_message.cc
-+++ b/third_party/blink/common/messaging/transferable_message.cc
-@@ -9,10 +9,9 @@
- namespace blink {
- 
- TransferableMessage::TransferableMessage() = default;
--TransferableMessage::TransferableMessage(TransferableMessage&&) noexcept =
-+TransferableMessage::TransferableMessage(TransferableMessage&&) = default;
-+TransferableMessage& TransferableMessage::operator=(TransferableMessage&&) =
-     default;
--TransferableMessage& TransferableMessage::operator=(
--    TransferableMessage&&) noexcept = default;
- TransferableMessage::~TransferableMessage() = default;
- 
- }  // namespace blink
-diff --git a/third_party/blink/public/common/indexeddb/indexeddb_key_path.h b/third_party/blink/public/common/indexeddb/indexeddb_key_path.h
-index 8ebe10c..9f5422c 100644
---- a/third_party/blink/public/common/indexeddb/indexeddb_key_path.h
-+++ b/third_party/blink/public/common/indexeddb/indexeddb_key_path.h
-@@ -22,10 +22,10 @@
-   explicit IndexedDBKeyPath(const base::string16&);
-   explicit IndexedDBKeyPath(const std::vector<base::string16>&);
-   IndexedDBKeyPath(const IndexedDBKeyPath& other);
--  IndexedDBKeyPath(IndexedDBKeyPath&& other) noexcept;
-+  IndexedDBKeyPath(IndexedDBKeyPath&& other);
-   ~IndexedDBKeyPath();
-   IndexedDBKeyPath& operator=(const IndexedDBKeyPath& other);
--  IndexedDBKeyPath& operator=(IndexedDBKeyPath&& other) noexcept;
-+  IndexedDBKeyPath& operator=(IndexedDBKeyPath&& other);
- 
-   bool IsNull() const { return type_ == blink::mojom::IDBKeyPathType::Null; }
-   bool operator==(const IndexedDBKeyPath& other) const;
-diff --git a/third_party/blink/public/common/indexeddb/indexeddb_metadata.h b/third_party/blink/public/common/indexeddb/indexeddb_metadata.h
-index 15663f6..7bb37c9 100644
---- a/third_party/blink/public/common/indexeddb/indexeddb_metadata.h
-+++ b/third_party/blink/public/common/indexeddb/indexeddb_metadata.h
-@@ -26,10 +26,10 @@
-                          bool unique,
-                          bool multi_entry);
-   IndexedDBIndexMetadata(const IndexedDBIndexMetadata& other);
--  IndexedDBIndexMetadata(IndexedDBIndexMetadata&& other) noexcept;
-+  IndexedDBIndexMetadata(IndexedDBIndexMetadata&& other);
-   ~IndexedDBIndexMetadata();
-   IndexedDBIndexMetadata& operator=(const IndexedDBIndexMetadata& other);
--  IndexedDBIndexMetadata& operator=(IndexedDBIndexMetadata&& other) noexcept;
-+  IndexedDBIndexMetadata& operator=(IndexedDBIndexMetadata&& other);
-   bool operator==(const IndexedDBIndexMetadata& other) const;
- 
-   base::string16 name;
-@@ -50,12 +50,11 @@
-                                bool auto_increment,
-                                int64_t max_index_id);
-   IndexedDBObjectStoreMetadata(const IndexedDBObjectStoreMetadata& other);
--  IndexedDBObjectStoreMetadata(IndexedDBObjectStoreMetadata&& other) noexcept;
-+  IndexedDBObjectStoreMetadata(IndexedDBObjectStoreMetadata&& other);
-   ~IndexedDBObjectStoreMetadata();
-   IndexedDBObjectStoreMetadata& operator=(
-       const IndexedDBObjectStoreMetadata& other);
--  IndexedDBObjectStoreMetadata& operator=(
--      IndexedDBObjectStoreMetadata&& other) noexcept;
-+  IndexedDBObjectStoreMetadata& operator=(IndexedDBObjectStoreMetadata&& other);
-   bool operator==(const IndexedDBObjectStoreMetadata& other) const;
- 
-   base::string16 name;
-@@ -77,11 +76,10 @@
-                             int64_t version,
-                             int64_t max_object_store_id);
-   IndexedDBDatabaseMetadata(const IndexedDBDatabaseMetadata& other);
--  IndexedDBDatabaseMetadata(IndexedDBDatabaseMetadata&& other) noexcept;
-+  IndexedDBDatabaseMetadata(IndexedDBDatabaseMetadata&& other);
-   ~IndexedDBDatabaseMetadata();
-   IndexedDBDatabaseMetadata& operator=(const IndexedDBDatabaseMetadata& other);
--  IndexedDBDatabaseMetadata& operator=(
--      IndexedDBDatabaseMetadata&& other) noexcept;
-+  IndexedDBDatabaseMetadata& operator=(IndexedDBDatabaseMetadata&& other);
-   bool operator==(const IndexedDBDatabaseMetadata& other) const;
- 
-   base::string16 name;
-diff --git a/third_party/blink/public/common/mediastream/media_devices.h b/third_party/blink/public/common/mediastream/media_devices.h
-index 0d63e575..d87affe 100644
---- a/third_party/blink/public/common/mediastream/media_devices.h
-+++ b/third_party/blink/public/common/mediastream/media_devices.h
-@@ -27,7 +27,7 @@
- struct BLINK_COMMON_EXPORT WebMediaDeviceInfo {
-   WebMediaDeviceInfo();
-   WebMediaDeviceInfo(const WebMediaDeviceInfo& other);
--  WebMediaDeviceInfo(WebMediaDeviceInfo&& other) noexcept;
-+  WebMediaDeviceInfo(WebMediaDeviceInfo&& other);
-   WebMediaDeviceInfo(
-       const std::string& device_id,
-       const std::string& label,
-@@ -37,7 +37,7 @@
-       const media::VideoCaptureDeviceDescriptor& descriptor);
-   ~WebMediaDeviceInfo();
-   WebMediaDeviceInfo& operator=(const WebMediaDeviceInfo& other);
--  WebMediaDeviceInfo& operator=(WebMediaDeviceInfo&& other) noexcept;
-+  WebMediaDeviceInfo& operator=(WebMediaDeviceInfo&& other);
- 
-   std::string device_id;
-   std::string label;
-diff --git a/third_party/blink/public/common/messaging/cloneable_message.h b/third_party/blink/public/common/messaging/cloneable_message.h
-index de9952d..8dbd910 100644
---- a/third_party/blink/public/common/messaging/cloneable_message.h
-+++ b/third_party/blink/public/common/messaging/cloneable_message.h
-@@ -21,8 +21,8 @@
- // This type can be serialized as a blink::mojom::CloneableMessage struct.
- struct BLINK_COMMON_EXPORT CloneableMessage {
-   CloneableMessage();
--  CloneableMessage(CloneableMessage&&) noexcept;
--  CloneableMessage& operator=(CloneableMessage&&) noexcept;
-+  CloneableMessage(CloneableMessage&&);
-+  CloneableMessage& operator=(CloneableMessage&&);
-   ~CloneableMessage();
- 
-   // Returns a shallow clone of this message. |encoded_message| in the clone
-diff --git a/third_party/blink/public/common/messaging/transferable_message.h b/third_party/blink/public/common/messaging/transferable_message.h
-index 5eef63c..2d87363 100644
---- a/third_party/blink/public/common/messaging/transferable_message.h
-+++ b/third_party/blink/public/common/messaging/transferable_message.h
-@@ -22,8 +22,8 @@
- // type can be serialized as a blink::mojom::TransferableMessage struct.
- struct BLINK_COMMON_EXPORT TransferableMessage : public CloneableMessage {
-   TransferableMessage();
--  TransferableMessage(TransferableMessage&&) noexcept;
--  TransferableMessage& operator=(TransferableMessage&&) noexcept;
-+  TransferableMessage(TransferableMessage&&);
-+  TransferableMessage& operator=(TransferableMessage&&);
-   ~TransferableMessage();
- 
-   // Any ports being transferred as part of this message.
-diff --git a/third_party/blink/public/platform/scheduler/web_scoped_virtual_time_pauser.h b/third_party/blink/public/platform/scheduler/web_scoped_virtual_time_pauser.h
-index 75f3ae16..81edd69 100644
---- a/third_party/blink/public/platform/scheduler/web_scoped_virtual_time_pauser.h
-+++ b/third_party/blink/public/platform/scheduler/web_scoped_virtual_time_pauser.h
-@@ -42,9 +42,8 @@
-   WebScopedVirtualTimePauser();
-   ~WebScopedVirtualTimePauser();
- 
--  WebScopedVirtualTimePauser(WebScopedVirtualTimePauser&& other) noexcept;
--  WebScopedVirtualTimePauser& operator=(
--      WebScopedVirtualTimePauser&& other) noexcept;
-+  WebScopedVirtualTimePauser(WebScopedVirtualTimePauser&& other);
-+  WebScopedVirtualTimePauser& operator=(WebScopedVirtualTimePauser&& other);
- 
-   WebScopedVirtualTimePauser(const WebScopedVirtualTimePauser&) = delete;
-   WebScopedVirtualTimePauser& operator=(const WebScopedVirtualTimePauser&) =
-diff --git a/third_party/blink/public/platform/web_string.h b/third_party/blink/public/platform/web_string.h
-index e4fda4f..ffd1da0 100644
---- a/third_party/blink/public/platform/web_string.h
-+++ b/third_party/blink/public/platform/web_string.h
-@@ -102,10 +102,10 @@
-   BLINK_PLATFORM_EXPORT WebString(const WebUChar* data, size_t len);
- 
-   BLINK_PLATFORM_EXPORT WebString(const WebString&);
--  BLINK_PLATFORM_EXPORT WebString(WebString&&) noexcept;
-+  BLINK_PLATFORM_EXPORT WebString(WebString&&);
- 
-   BLINK_PLATFORM_EXPORT WebString& operator=(const WebString&);
--  BLINK_PLATFORM_EXPORT WebString& operator=(WebString&&) noexcept;
-+  BLINK_PLATFORM_EXPORT WebString& operator=(WebString&&);
- 
-   BLINK_PLATFORM_EXPORT void Reset();
- 
-diff --git a/third_party/blink/public/web/modules/mediastream/media_stream_constraints_util.h b/third_party/blink/public/web/modules/mediastream/media_stream_constraints_util.h
-index 99f47f5..8451b86 100644
---- a/third_party/blink/public/web/modules/mediastream/media_stream_constraints_util.h
-+++ b/third_party/blink/public/web/modules/mediastream/media_stream_constraints_util.h
-@@ -73,8 +73,8 @@
- 
-   VideoCaptureSettings(const VideoCaptureSettings& other);
-   VideoCaptureSettings& operator=(const VideoCaptureSettings& other);
--  VideoCaptureSettings(VideoCaptureSettings&& other) noexcept;
--  VideoCaptureSettings& operator=(VideoCaptureSettings&& other) noexcept;
-+  VideoCaptureSettings(VideoCaptureSettings&& other);
-+  VideoCaptureSettings& operator=(VideoCaptureSettings&& other);
-   ~VideoCaptureSettings();
- 
-   bool HasValue() const { return !failed_constraint_name_; }
-@@ -193,8 +193,8 @@
-       const AudioProcessingProperties& audio_processing_properties);
-   AudioCaptureSettings(const AudioCaptureSettings& other);
-   AudioCaptureSettings& operator=(const AudioCaptureSettings& other);
--  AudioCaptureSettings(AudioCaptureSettings&& other) noexcept;
--  AudioCaptureSettings& operator=(AudioCaptureSettings&& other) noexcept;
-+  AudioCaptureSettings(AudioCaptureSettings&& other);
-+  AudioCaptureSettings& operator=(AudioCaptureSettings&& other);
- 
-   bool HasValue() const { return !failed_constraint_name_; }
- 
-diff --git a/third_party/blink/public/web/modules/mediastream/media_stream_constraints_util_sets.h b/third_party/blink/public/web/modules/mediastream/media_stream_constraints_util_sets.h
-index 199bdeb..c89e6e9 100644
---- a/third_party/blink/public/web/modules/mediastream/media_stream_constraints_util_sets.h
-+++ b/third_party/blink/public/web/modules/mediastream/media_stream_constraints_util_sets.h
-@@ -159,8 +159,8 @@
- 
-   DiscreteSet(const DiscreteSet& other) = default;
-   DiscreteSet& operator=(const DiscreteSet& other) = default;
--  DiscreteSet(DiscreteSet&& other) noexcept = default;
--  DiscreteSet& operator=(DiscreteSet&& other) noexcept = default;
-+  DiscreteSet(DiscreteSet&& other) = default;
-+  DiscreteSet& operator=(DiscreteSet&& other) = default;
-   ~DiscreteSet() = default;
- 
-   bool Contains(const T& value) const {
-diff --git a/third_party/blink/public/web/modules/mediastream/media_stream_video_source.h b/third_party/blink/public/web/modules/mediastream/media_stream_video_source.h
-index 5e50d1b..ed5967f 100644
---- a/third_party/blink/public/web/modules/mediastream/media_stream_video_source.h
-+++ b/third_party/blink/public/web/modules/mediastream/media_stream_video_source.h
-@@ -285,8 +285,8 @@
-         const VideoTrackFormatCallback& format_callback,
-         std::unique_ptr<VideoTrackAdapterSettings> adapter_settings,
-         const ConstraintsCallback& callback);
--    PendingTrackInfo(PendingTrackInfo&& other) noexcept;
--    PendingTrackInfo& operator=(PendingTrackInfo&& other) noexcept;
-+    PendingTrackInfo(PendingTrackInfo&& other);
-+    PendingTrackInfo& operator=(PendingTrackInfo&& other);
-     ~PendingTrackInfo();
- 
-     MediaStreamVideoTrack* track;
-diff --git a/third_party/blink/renderer/core/animation/interpolation_value.h b/third_party/blink/renderer/core/animation/interpolation_value.h
-index 75c5d35..17ccf02 100644
---- a/third_party/blink/renderer/core/animation/interpolation_value.h
-+++ b/third_party/blink/renderer/core/animation/interpolation_value.h
-@@ -27,11 +27,11 @@
- 
-   InterpolationValue(std::nullptr_t) {}
- 
--  InterpolationValue(InterpolationValue&& other) noexcept
-+  InterpolationValue(InterpolationValue&& other)
-       : interpolable_value(std::move(other.interpolable_value)),
-         non_interpolable_value(std::move(other.non_interpolable_value)) {}
- 
--  void operator=(InterpolationValue&& other) noexcept {
-+  void operator=(InterpolationValue&& other) {
-     interpolable_value = std::move(other.interpolable_value);
-     non_interpolable_value = std::move(other.non_interpolable_value);
-   }
-diff --git a/third_party/blink/renderer/core/animation/pairwise_interpolation_value.h b/third_party/blink/renderer/core/animation/pairwise_interpolation_value.h
-index 39e6c57..87bb431 100644
---- a/third_party/blink/renderer/core/animation/pairwise_interpolation_value.h
-+++ b/third_party/blink/renderer/core/animation/pairwise_interpolation_value.h
-@@ -28,7 +28,7 @@
- 
-   PairwiseInterpolationValue(std::nullptr_t) {}
- 
--  PairwiseInterpolationValue(PairwiseInterpolationValue&& other) noexcept
-+  PairwiseInterpolationValue(PairwiseInterpolationValue&& other)
-       : start_interpolable_value(std::move(other.start_interpolable_value)),
-         end_interpolable_value(std::move(other.end_interpolable_value)),
-         non_interpolable_value(std::move(other.non_interpolable_value)) {}
-diff --git a/third_party/blink/renderer/core/css/css_selector_list.h b/third_party/blink/renderer/core/css/css_selector_list.h
-index 4d38b09..51f354b 100644
---- a/third_party/blink/renderer/core/css/css_selector_list.h
-+++ b/third_party/blink/renderer/core/css/css_selector_list.h
-@@ -67,8 +67,7 @@
-  public:
-   CSSSelectorList() : selector_array_(nullptr) {}
- 
--  CSSSelectorList(CSSSelectorList&& o) noexcept
--      : selector_array_(o.selector_array_) {
-+  CSSSelectorList(CSSSelectorList&& o) : selector_array_(o.selector_array_) {
-     o.selector_array_ = nullptr;
-   }
- 
-@@ -82,7 +81,7 @@
-   bool HasPseudoWhere() const;
-   bool RequiresExpansion() const;
- 
--  CSSSelectorList& operator=(CSSSelectorList&& o) noexcept {
-+  CSSSelectorList& operator=(CSSSelectorList&& o) {
-     DCHECK(this != &o);
-     DeleteSelectorsIfNeeded();
-     selector_array_ = o.selector_array_;
-diff --git a/third_party/blink/renderer/core/display_lock/display_lock_context.cc b/third_party/blink/renderer/core/display_lock/display_lock_context.cc
-index 0e6b6cb..79f281a 100644
---- a/third_party/blink/renderer/core/display_lock/display_lock_context.cc
-+++ b/third_party/blink/renderer/core/display_lock/display_lock_context.cc
-@@ -1033,7 +1033,7 @@
-     : context_(context) {}
- 
- DisplayLockContext::ScopedForcedUpdate::ScopedForcedUpdate(
--    ScopedForcedUpdate&& other) noexcept
-+    ScopedForcedUpdate&& other)
-     : context_(other.context_) {
-   other.context_ = nullptr;
- }
-diff --git a/third_party/blink/renderer/core/display_lock/display_lock_context.h b/third_party/blink/renderer/core/display_lock/display_lock_context.h
-index 1a38b2af..f890b432 100644
---- a/third_party/blink/renderer/core/display_lock/display_lock_context.h
-+++ b/third_party/blink/renderer/core/display_lock/display_lock_context.h
-@@ -76,7 +76,7 @@
-     DISALLOW_NEW();
- 
-    public:
--    ScopedForcedUpdate(ScopedForcedUpdate&&) noexcept;
-+    ScopedForcedUpdate(ScopedForcedUpdate&&);
-     ~ScopedForcedUpdate();
- 
-    private:
-diff --git a/third_party/blink/renderer/core/editing/layout_selection.cc b/third_party/blink/renderer/core/editing/layout_selection.cc
-index 00040d2..73cfe0f 100644
---- a/third_party/blink/renderer/core/editing/layout_selection.cc
-+++ b/third_party/blink/renderer/core/editing/layout_selection.cc
-@@ -178,7 +178,7 @@
-  public:
-   OldSelectedNodes()
-       : paint_range(MakeGarbageCollected<SelectionPaintRange>()) {}
--  OldSelectedNodes(OldSelectedNodes&& other) noexcept {
-+  OldSelectedNodes(OldSelectedNodes&& other) {
-     paint_range = other.paint_range;
-     selected_map = std::move(other.selected_map);
-   }
-@@ -205,8 +205,7 @@
-       HeapHashSet<Member<const Node>>&& passed_selected_objects)
-       : paint_range(passed_paint_range),
-         selected_objects(std::move(passed_selected_objects)) {}
--  NewPaintRangeAndSelectedNodes(
--      NewPaintRangeAndSelectedNodes&& other) noexcept {
-+  NewPaintRangeAndSelectedNodes(NewPaintRangeAndSelectedNodes&& other) {
-     paint_range = other.paint_range;
-     selected_objects = std::move(other.selected_objects);
-   }
-diff --git a/third_party/blink/renderer/core/frame/local_frame_ukm_aggregator.cc b/third_party/blink/renderer/core/frame/local_frame_ukm_aggregator.cc
-index f0ac3c4..81f47ab 100644
---- a/third_party/blink/renderer/core/frame/local_frame_ukm_aggregator.cc
-+++ b/third_party/blink/renderer/core/frame/local_frame_ukm_aggregator.cc
-@@ -24,7 +24,7 @@
-       start_time_(clock_->NowTicks()) {}
- 
- LocalFrameUkmAggregator::ScopedUkmHierarchicalTimer::ScopedUkmHierarchicalTimer(
--    ScopedUkmHierarchicalTimer&& other) noexcept
-+    ScopedUkmHierarchicalTimer&& other)
-     : aggregator_(other.aggregator_),
-       metric_index_(other.metric_index_),
-       clock_(other.clock_),
-diff --git a/third_party/blink/renderer/core/frame/local_frame_ukm_aggregator.h b/third_party/blink/renderer/core/frame/local_frame_ukm_aggregator.h
-index 44c3f87..dc06091 100644
---- a/third_party/blink/renderer/core/frame/local_frame_ukm_aggregator.h
-+++ b/third_party/blink/renderer/core/frame/local_frame_ukm_aggregator.h
-@@ -195,7 +195,7 @@
-     STACK_ALLOCATED();
- 
-    public:
--    ScopedUkmHierarchicalTimer(ScopedUkmHierarchicalTimer&&) noexcept;
-+    ScopedUkmHierarchicalTimer(ScopedUkmHierarchicalTimer&&);
-     ~ScopedUkmHierarchicalTimer();
- 
-    private:
-diff --git a/third_party/blink/renderer/core/layout/ng/inline/ng_line_box_fragment_builder.h b/third_party/blink/renderer/core/layout/ng/inline/ng_line_box_fragment_builder.h
-index 2af19ca..498e42e 100644
---- a/third_party/blink/renderer/core/layout/ng/inline/ng_line_box_fragment_builder.h
-+++ b/third_party/blink/renderer/core/layout/ng/inline/ng_line_box_fragment_builder.h
-@@ -181,7 +181,7 @@
- 
-    public:
-     ChildList() = default;
--    void operator=(ChildList&& other) noexcept {
-+    void operator=(ChildList&& other) {
-       children_ = std::move(other.children_);
-     }
- 
-diff --git a/third_party/blink/renderer/core/layout/ng/ng_constraint_space.h b/third_party/blink/renderer/core/layout/ng/ng_constraint_space.h
-index 8f77b90..833b0d2 100644
---- a/third_party/blink/renderer/core/layout/ng/ng_constraint_space.h
-+++ b/third_party/blink/renderer/core/layout/ng/ng_constraint_space.h
-@@ -86,7 +86,7 @@
-     else
-       bfc_offset_ = other.bfc_offset_;
-   }
--  NGConstraintSpace(NGConstraintSpace&& other) noexcept
-+  NGConstraintSpace(NGConstraintSpace&& other)
-       : available_size_(other.available_size_),
-         exclusion_space_(std::move(other.exclusion_space_)),
-         bitfields_(other.bitfields_) {
-@@ -110,7 +110,7 @@
-     bitfields_ = other.bitfields_;
-     return *this;
-   }
--  NGConstraintSpace& operator=(NGConstraintSpace&& other) noexcept {
-+  NGConstraintSpace& operator=(NGConstraintSpace&& other) {
-     available_size_ = other.available_size_;
-     if (HasRareData())
-       delete rare_data_;
-diff --git a/third_party/blink/renderer/core/messaging/blink_cloneable_message.cc b/third_party/blink/renderer/core/messaging/blink_cloneable_message.cc
-index b6c8768..7423930 100644
---- a/third_party/blink/renderer/core/messaging/blink_cloneable_message.cc
-+++ b/third_party/blink/renderer/core/messaging/blink_cloneable_message.cc
-@@ -9,9 +9,8 @@
- BlinkCloneableMessage::BlinkCloneableMessage() = default;
- BlinkCloneableMessage::~BlinkCloneableMessage() = default;
- 
--BlinkCloneableMessage::BlinkCloneableMessage(BlinkCloneableMessage&&) noexcept =
--    default;
-+BlinkCloneableMessage::BlinkCloneableMessage(BlinkCloneableMessage&&) = default;
- BlinkCloneableMessage& BlinkCloneableMessage::operator=(
--    BlinkCloneableMessage&&) noexcept = default;
-+    BlinkCloneableMessage&&) = default;
- 
- }  // namespace blink
-diff --git a/third_party/blink/renderer/core/messaging/blink_cloneable_message.h b/third_party/blink/renderer/core/messaging/blink_cloneable_message.h
-index 337b0f8..a51e888 100644
---- a/third_party/blink/renderer/core/messaging/blink_cloneable_message.h
-+++ b/third_party/blink/renderer/core/messaging/blink_cloneable_message.h
-@@ -21,8 +21,8 @@
-   BlinkCloneableMessage();
-   ~BlinkCloneableMessage();
- 
--  BlinkCloneableMessage(BlinkCloneableMessage&&) noexcept;
--  BlinkCloneableMessage& operator=(BlinkCloneableMessage&&) noexcept;
-+  BlinkCloneableMessage(BlinkCloneableMessage&&);
-+  BlinkCloneableMessage& operator=(BlinkCloneableMessage&&);
- 
-   scoped_refptr<blink::SerializedScriptValue> message;
-   v8_inspector::V8StackTraceId sender_stack_trace_id;
-diff --git a/third_party/blink/renderer/core/messaging/blink_transferable_message.cc b/third_party/blink/renderer/core/messaging/blink_transferable_message.cc
-index 909ddb0..b5cdfda 100644
---- a/third_party/blink/renderer/core/messaging/blink_transferable_message.cc
-+++ b/third_party/blink/renderer/core/messaging/blink_transferable_message.cc
-@@ -16,10 +16,10 @@
- BlinkTransferableMessage::BlinkTransferableMessage() = default;
- BlinkTransferableMessage::~BlinkTransferableMessage() = default;
- 
--BlinkTransferableMessage::BlinkTransferableMessage(
--    BlinkTransferableMessage&&) noexcept = default;
-+BlinkTransferableMessage::BlinkTransferableMessage(BlinkTransferableMessage&&) =
-+    default;
- BlinkTransferableMessage& BlinkTransferableMessage::operator=(
--    BlinkTransferableMessage&&) noexcept = default;
-+    BlinkTransferableMessage&&) = default;
- 
- scoped_refptr<blink::StaticBitmapImage> ToStaticBitmapImage(
-     const SkBitmap& sk_bitmap) {
-diff --git a/third_party/blink/renderer/core/messaging/blink_transferable_message.h b/third_party/blink/renderer/core/messaging/blink_transferable_message.h
-index edf4fab..3957bed 100644
---- a/third_party/blink/renderer/core/messaging/blink_transferable_message.h
-+++ b/third_party/blink/renderer/core/messaging/blink_transferable_message.h
-@@ -24,8 +24,8 @@
-   BlinkTransferableMessage();
-   ~BlinkTransferableMessage();
- 
--  BlinkTransferableMessage(BlinkTransferableMessage&&) noexcept;
--  BlinkTransferableMessage& operator=(BlinkTransferableMessage&&) noexcept;
-+  BlinkTransferableMessage(BlinkTransferableMessage&&);
-+  BlinkTransferableMessage& operator=(BlinkTransferableMessage&&);
- 
-   Vector<MessagePortChannel> ports;
- 
-diff --git a/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.h b/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.h
-index 85b46e1..f050a85 100644
---- a/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.h
-+++ b/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.h
-@@ -92,10 +92,10 @@
-       std::move(destruction_callback_).Run(std::move(callbacks_));
-   }
- 
--  ScopedWebCallbacks(ScopedWebCallbacks&& other) noexcept = default;
-+  ScopedWebCallbacks(ScopedWebCallbacks&& other) = default;
-   ScopedWebCallbacks(const ScopedWebCallbacks& other) = delete;
- 
--  ScopedWebCallbacks& operator=(ScopedWebCallbacks&& other) noexcept = default;
-+  ScopedWebCallbacks& operator=(ScopedWebCallbacks&& other) = default;
-   ScopedWebCallbacks& operator=(const ScopedWebCallbacks& other) = delete;
- 
-   std::unique_ptr<CallbacksType> PassCallbacks() {
-diff --git a/third_party/blink/renderer/modules/indexeddb/idb_request.h b/third_party/blink/renderer/modules/indexeddb/idb_request.h
-index f85b864..d3f1132 100644
---- a/third_party/blink/renderer/modules/indexeddb/idb_request.h
-+++ b/third_party/blink/renderer/modules/indexeddb/idb_request.h
-@@ -110,13 +110,13 @@
-     ~AsyncTraceState();
- 
-     // Used to transfer the trace end event state to an IDBRequest.
--    AsyncTraceState(AsyncTraceState&& other) noexcept {
-+    AsyncTraceState(AsyncTraceState&& other) {
-       DCHECK(IsEmpty());
-       this->trace_event_name_ = other.trace_event_name_;
-       this->id_ = other.id_;
-       other.trace_event_name_ = nullptr;
-     }
--    AsyncTraceState& operator=(AsyncTraceState&& rhs) noexcept {
-+    AsyncTraceState& operator=(AsyncTraceState&& rhs) {
-       DCHECK(IsEmpty());
-       this->trace_event_name_ = rhs.trace_event_name_;
-       this->id_ = rhs.id_;
-diff --git a/third_party/blink/renderer/modules/indexeddb/idb_request_test.cc b/third_party/blink/renderer/modules/indexeddb/idb_request_test.cc
-index 84de726..2d3d4de5 100644
---- a/third_party/blink/renderer/modules/indexeddb/idb_request_test.cc
-+++ b/third_party/blink/renderer/modules/indexeddb/idb_request_test.cc
-@@ -434,10 +434,9 @@
- class AsyncTraceStateForTesting : public IDBRequest::AsyncTraceState {
-  public:
-   AsyncTraceStateForTesting() : IDBRequest::AsyncTraceState() {}
--  AsyncTraceStateForTesting(AsyncTraceStateForTesting&& other) noexcept
-+  AsyncTraceStateForTesting(AsyncTraceStateForTesting&& other)
-       : IDBRequest::AsyncTraceState(std::move(other)) {}
--  AsyncTraceStateForTesting& operator=(
--      AsyncTraceStateForTesting&& rhs) noexcept {
-+  AsyncTraceStateForTesting& operator=(AsyncTraceStateForTesting&& rhs) {
-     AsyncTraceState::operator=(std::move(rhs));
-     return *this;
-   }
-diff --git a/third_party/blink/renderer/modules/mediastream/media_stream_constraints_util.cc b/third_party/blink/renderer/modules/mediastream/media_stream_constraints_util.cc
-index 24499bd..3bf00e9 100644
---- a/third_party/blink/renderer/modules/mediastream/media_stream_constraints_util.cc
-+++ b/third_party/blink/renderer/modules/mediastream/media_stream_constraints_util.cc
-@@ -134,13 +134,13 @@
- 
- VideoCaptureSettings::VideoCaptureSettings(const VideoCaptureSettings& other) =
-     default;
--VideoCaptureSettings::VideoCaptureSettings(
--    VideoCaptureSettings&& other) noexcept = default;
-+VideoCaptureSettings::VideoCaptureSettings(VideoCaptureSettings&& other) =
-+    default;
- VideoCaptureSettings::~VideoCaptureSettings() = default;
- VideoCaptureSettings& VideoCaptureSettings::operator=(
-     const VideoCaptureSettings& other) = default;
- VideoCaptureSettings& VideoCaptureSettings::operator=(
--    VideoCaptureSettings&& other) noexcept = default;
-+    VideoCaptureSettings&& other) = default;
- 
- AudioCaptureSettings::AudioCaptureSettings() : AudioCaptureSettings("") {}
- 
-@@ -166,10 +166,10 @@
-     default;
- AudioCaptureSettings& AudioCaptureSettings::operator=(
-     const AudioCaptureSettings& other) = default;
--AudioCaptureSettings::AudioCaptureSettings(
--    AudioCaptureSettings&& other) noexcept = default;
-+AudioCaptureSettings::AudioCaptureSettings(AudioCaptureSettings&& other) =
-+    default;
- AudioCaptureSettings& AudioCaptureSettings::operator=(
--    AudioCaptureSettings&& other) noexcept = default;
-+    AudioCaptureSettings&& other) = default;
- 
- bool GetConstraintValueAsBoolean(
-     const WebMediaConstraints& constraints,
-diff --git a/third_party/blink/renderer/modules/mediastream/media_stream_constraints_util_video_device.cc b/third_party/blink/renderer/modules/mediastream/media_stream_constraints_util_video_device.cc
-index 96992217..67c8bab 100644
---- a/third_party/blink/renderer/modules/mediastream/media_stream_constraints_util_video_device.cc
-+++ b/third_party/blink/renderer/modules/mediastream/media_stream_constraints_util_video_device.cc
-@@ -529,9 +529,9 @@
-       facing_mode(facing_mode) {}
- 
- VideoInputDeviceCapabilities::VideoInputDeviceCapabilities(
--    VideoInputDeviceCapabilities&& other) noexcept = default;
-+    VideoInputDeviceCapabilities&& other) = default;
- VideoInputDeviceCapabilities& VideoInputDeviceCapabilities::operator=(
--    VideoInputDeviceCapabilities&& other) noexcept = default;
-+    VideoInputDeviceCapabilities&& other) = default;
- 
- VideoInputDeviceCapabilities::~VideoInputDeviceCapabilities() = default;
- 
-@@ -557,10 +557,10 @@
- 
- VideoDeviceCaptureCapabilities::VideoDeviceCaptureCapabilities() = default;
- VideoDeviceCaptureCapabilities::VideoDeviceCaptureCapabilities(
--    VideoDeviceCaptureCapabilities&& other) noexcept = default;
-+    VideoDeviceCaptureCapabilities&& other) = default;
- VideoDeviceCaptureCapabilities::~VideoDeviceCaptureCapabilities() = default;
- VideoDeviceCaptureCapabilities& VideoDeviceCaptureCapabilities::operator=(
--    VideoDeviceCaptureCapabilities&& other) noexcept = default;
-+    VideoDeviceCaptureCapabilities&& other) = default;
- 
- VideoCaptureSettings SelectSettingsVideoDeviceCapture(
-     const VideoDeviceCaptureCapabilities& capabilities,
-diff --git a/third_party/blink/renderer/modules/mediastream/media_stream_constraints_util_video_device.h b/third_party/blink/renderer/modules/mediastream/media_stream_constraints_util_video_device.h
-index 66ae103..94d8ed9 100644
---- a/third_party/blink/renderer/modules/mediastream/media_stream_constraints_util_video_device.h
-+++ b/third_party/blink/renderer/modules/mediastream/media_stream_constraints_util_video_device.h
-@@ -34,9 +34,8 @@
-                                Vector<media::VideoCaptureFormat> formats,
-                                media::VideoFacingMode facing_mode);
-   VideoInputDeviceCapabilities();
--  VideoInputDeviceCapabilities(VideoInputDeviceCapabilities&& other) noexcept;
--  VideoInputDeviceCapabilities& operator=(
--      VideoInputDeviceCapabilities&& other) noexcept;
-+  VideoInputDeviceCapabilities(VideoInputDeviceCapabilities&& other);
-+  VideoInputDeviceCapabilities& operator=(VideoInputDeviceCapabilities&& other);
-   ~VideoInputDeviceCapabilities();
- 
-   String device_id;
-@@ -47,11 +46,10 @@
- 
- struct MODULES_EXPORT VideoDeviceCaptureCapabilities {
-   VideoDeviceCaptureCapabilities();
--  VideoDeviceCaptureCapabilities(
--      VideoDeviceCaptureCapabilities&& other) noexcept;
-+  VideoDeviceCaptureCapabilities(VideoDeviceCaptureCapabilities&& other);
-   ~VideoDeviceCaptureCapabilities();
-   VideoDeviceCaptureCapabilities& operator=(
--      VideoDeviceCaptureCapabilities&& other) noexcept;
-+      VideoDeviceCaptureCapabilities&& other);
- 
-   // Each capabilities field is independent of each other.
-   // TODO(crbug.com/704136): Replace VideoInputDeviceCapabilities in the
-diff --git a/third_party/blink/renderer/modules/mediastream/media_stream_video_source.cc b/third_party/blink/renderer/modules/mediastream/media_stream_video_source.cc
-index 7651e47..99759c1 100644
---- a/third_party/blink/renderer/modules/mediastream/media_stream_video_source.cc
-+++ b/third_party/blink/renderer/modules/mediastream/media_stream_video_source.cc
-@@ -461,10 +461,10 @@
-       callback(callback) {}
- 
- MediaStreamVideoSource::PendingTrackInfo::PendingTrackInfo(
--    PendingTrackInfo&& other) noexcept = default;
-+    PendingTrackInfo&& other) = default;
- MediaStreamVideoSource::PendingTrackInfo&
- MediaStreamVideoSource::PendingTrackInfo::operator=(
--    MediaStreamVideoSource::PendingTrackInfo&& other) noexcept = default;
-+    MediaStreamVideoSource::PendingTrackInfo&& other) = default;
- 
- MediaStreamVideoSource::PendingTrackInfo::~PendingTrackInfo() {}
- 
-diff --git a/third_party/blink/renderer/platform/bindings/dom_data_store.h b/third_party/blink/renderer/platform/bindings/dom_data_store.h
-index d660b67..0660dd18 100644
---- a/third_party/blink/renderer/platform/bindings/dom_data_store.h
-+++ b/third_party/blink/renderer/platform/bindings/dom_data_store.h
-@@ -230,12 +230,11 @@
-         : TraceWrapperV8Reference(isolate, handle) {}
- 
-     // Move support without write barrier.
--    DOMWorldWrapperReference(DOMWorldWrapperReference&& other) noexcept
-+    DOMWorldWrapperReference(DOMWorldWrapperReference&& other)
-         : TraceWrapperV8Reference() {
-       handle_ = std::move(other.handle_);
-     }
--    DOMWorldWrapperReference& operator=(
--        DOMWorldWrapperReference&& rhs) noexcept {
-+    DOMWorldWrapperReference& operator=(DOMWorldWrapperReference&& rhs) {
-       handle_ = std::move(rhs.handle_);
-       return *this;
-     }
-diff --git a/third_party/blink/renderer/platform/exported/web_string.cc b/third_party/blink/renderer/platform/exported/web_string.cc
-index 71d4c07..fbe4828 100644
---- a/third_party/blink/renderer/platform/exported/web_string.cc
-+++ b/third_party/blink/renderer/platform/exported/web_string.cc
-@@ -51,9 +51,9 @@
- WebString::~WebString() = default;
- WebString::WebString() = default;
- WebString::WebString(const WebString&) = default;
--WebString::WebString(WebString&&) noexcept = default;
-+WebString::WebString(WebString&&) = default;
- WebString& WebString::operator=(const WebString&) = default;
--WebString& WebString::operator=(WebString&&) noexcept = default;
-+WebString& WebString::operator=(WebString&&) = default;
- 
- WebString::WebString(const WebUChar* data, size_t len)
-     : impl_(StringImpl::Create8BitIfPossible(data, len)) {}
-diff --git a/third_party/blink/renderer/platform/graphics/contiguous_container.cc b/third_party/blink/renderer/platform/graphics/contiguous_container.cc
-index fd01c00..19cb6f2 100644
---- a/third_party/blink/renderer/platform/graphics/contiguous_container.cc
-+++ b/third_party/blink/renderer/platform/graphics/contiguous_container.cc
-@@ -69,7 +69,7 @@
-     : end_index_(0), max_object_size_(max_object_size) {}
- 
- ContiguousContainerBase::ContiguousContainerBase(
--    ContiguousContainerBase&& source) noexcept
-+    ContiguousContainerBase&& source)
-     : ContiguousContainerBase(source.max_object_size_) {
-   Swap(source);
- }
-@@ -77,7 +77,7 @@
- ContiguousContainerBase::~ContiguousContainerBase() = default;
- 
- ContiguousContainerBase& ContiguousContainerBase::operator=(
--    ContiguousContainerBase&& source) noexcept {
-+    ContiguousContainerBase&& source) {
-   Swap(source);
-   return *this;
- }
-diff --git a/third_party/blink/renderer/platform/graphics/contiguous_container.h b/third_party/blink/renderer/platform/graphics/contiguous_container.h
-index 867e59c..3eee558 100644
---- a/third_party/blink/renderer/platform/graphics/contiguous_container.h
-+++ b/third_party/blink/renderer/platform/graphics/contiguous_container.h
-@@ -42,10 +42,10 @@
- 
-  protected:
-   explicit ContiguousContainerBase(size_t max_object_size);
--  ContiguousContainerBase(ContiguousContainerBase&&) noexcept;
-+  ContiguousContainerBase(ContiguousContainerBase&&);
-   ~ContiguousContainerBase();
- 
--  ContiguousContainerBase& operator=(ContiguousContainerBase&&) noexcept;
-+  ContiguousContainerBase& operator=(ContiguousContainerBase&&);
- 
-   size_t size() const { return elements_.size(); }
-   bool IsEmpty() const { return !size(); }
-@@ -147,7 +147,7 @@
-                            WTF_HEAP_PROFILER_TYPE_NAME(BaseElementType));
-   }
- 
--  ContiguousContainer(ContiguousContainer&& source) noexcept
-+  ContiguousContainer(ContiguousContainer&& source)
-       : ContiguousContainerBase(std::move(source)) {}
- 
-   ~ContiguousContainer() {
-@@ -157,7 +157,7 @@
-     }
-   }
- 
--  ContiguousContainer& operator=(ContiguousContainer&& source) noexcept {
-+  ContiguousContainer& operator=(ContiguousContainer&& source) {
-     // Must clear in the derived class to ensure that element destructors
-     // care called.
-     Clear();
-diff --git a/third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc b/third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc
-index ad10c54..4edbf7f 100644
---- a/third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc
-+++ b/third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc
-@@ -247,9 +247,9 @@
- }
- 
- ImageLayerBridge::RegisteredBitmap::RegisteredBitmap() = default;
--ImageLayerBridge::RegisteredBitmap::RegisteredBitmap(
--    RegisteredBitmap&& other) noexcept = default;
-+ImageLayerBridge::RegisteredBitmap::RegisteredBitmap(RegisteredBitmap&& other) =
-+    default;
- ImageLayerBridge::RegisteredBitmap& ImageLayerBridge::RegisteredBitmap::
--operator=(RegisteredBitmap&& other) noexcept = default;
-+operator=(RegisteredBitmap&& other) = default;
- 
- }  // namespace blink
-diff --git a/third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.h b/third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.h
-index bea81dfb..b6879f9 100644
---- a/third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.h
-+++ b/third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.h
-@@ -65,8 +65,8 @@
-   // only with software compositing.
-   struct RegisteredBitmap {
-     RegisteredBitmap();
--    RegisteredBitmap(RegisteredBitmap&& other) noexcept;
--    RegisteredBitmap& operator=(RegisteredBitmap&& other) noexcept;
-+    RegisteredBitmap(RegisteredBitmap&& other);
-+    RegisteredBitmap& operator=(RegisteredBitmap&& other);
- 
-     scoped_refptr<cc::CrossThreadSharedBitmap> bitmap;
-     cc::SharedBitmapIdRegistration registration;
-diff --git a/third_party/blink/renderer/platform/graphics/paint/display_item_list.h b/third_party/blink/renderer/platform/graphics/paint/display_item_list.h
-index cd3ed2f..9ee2571 100644
---- a/third_party/blink/renderer/platform/graphics/paint/display_item_list.h
-+++ b/third_party/blink/renderer/platform/graphics/paint/display_item_list.h
-@@ -28,10 +28,10 @@
-  public:
-   DisplayItemList(size_t initial_size_bytes)
-       : ContiguousContainer(kMaximumDisplayItemSize, initial_size_bytes) {}
--  DisplayItemList(DisplayItemList&& source) noexcept
-+  DisplayItemList(DisplayItemList&& source)
-       : ContiguousContainer(std::move(source)) {}
- 
--  DisplayItemList& operator=(DisplayItemList&& source) noexcept {
-+  DisplayItemList& operator=(DisplayItemList&& source) {
-     ContiguousContainer::operator=(std::move(source));
-     return *this;
-   }
-diff --git a/third_party/blink/renderer/platform/heap/heap_test.cc b/third_party/blink/renderer/platform/heap/heap_test.cc
-index dad0ca0..e94cbc95 100644
---- a/third_party/blink/renderer/platform/heap/heap_test.cc
-+++ b/third_party/blink/renderer/platform/heap/heap_test.cc
-@@ -145,7 +145,7 @@
-   }
-   KeyWithCopyingMoveConstructor(const KeyWithCopyingMoveConstructor&) = default;
-   // The move constructor delegates to the copy constructor intentionally.
--  KeyWithCopyingMoveConstructor(KeyWithCopyingMoveConstructor&& x) noexcept
-+  KeyWithCopyingMoveConstructor(KeyWithCopyingMoveConstructor&& x)
-       : KeyWithCopyingMoveConstructor(x) {}
-   KeyWithCopyingMoveConstructor& operator=(
-       const KeyWithCopyingMoveConstructor&) = default;
-diff --git a/third_party/blink/renderer/platform/image-decoders/segment_stream.cc b/third_party/blink/renderer/platform/image-decoders/segment_stream.cc
-index 4024f9c..5a98701 100644
---- a/third_party/blink/renderer/platform/image-decoders/segment_stream.cc
-+++ b/third_party/blink/renderer/platform/image-decoders/segment_stream.cc
-@@ -10,10 +10,10 @@
- 
- SegmentStream::SegmentStream() = default;
- 
--SegmentStream::SegmentStream(SegmentStream&& rhs) noexcept
-+SegmentStream::SegmentStream(SegmentStream&& rhs)
-     : reader_(std::move(rhs.reader_)), position_(rhs.position_) {}
- 
--SegmentStream& SegmentStream::operator=(SegmentStream&& rhs) noexcept {
-+SegmentStream& SegmentStream::operator=(SegmentStream&& rhs) {
-   reader_ = std::move(rhs.reader_);
-   position_ = rhs.position_;
- 
-diff --git a/third_party/blink/renderer/platform/image-decoders/segment_stream.h b/third_party/blink/renderer/platform/image-decoders/segment_stream.h
-index f49f551..fa1ccf2 100644
---- a/third_party/blink/renderer/platform/image-decoders/segment_stream.h
-+++ b/third_party/blink/renderer/platform/image-decoders/segment_stream.h
-@@ -19,8 +19,8 @@
-   SegmentStream();
-   SegmentStream(const SegmentStream&) = delete;
-   SegmentStream& operator=(const SegmentStream&) = delete;
--  SegmentStream(SegmentStream&&) noexcept;
--  SegmentStream& operator=(SegmentStream&&) noexcept;
-+  SegmentStream(SegmentStream&&);
-+  SegmentStream& operator=(SegmentStream&&);
- 
-   ~SegmentStream() override;
- 
-diff --git a/third_party/blink/renderer/platform/mojo/revocable_interface_ptr.h b/third_party/blink/renderer/platform/mojo/revocable_interface_ptr.h
-index 555be28..34bad3f 100644
---- a/third_party/blink/renderer/platform/mojo/revocable_interface_ptr.h
-+++ b/third_party/blink/renderer/platform/mojo/revocable_interface_ptr.h
-@@ -41,7 +41,7 @@
-   RevocableInterfacePtr(std::nullptr_t) {}
- 
-   // Takes over the binding of another RevocableInterfacePtr.
--  RevocableInterfacePtr(RevocableInterfacePtr&& other) noexcept {
-+  RevocableInterfacePtr(RevocableInterfacePtr&& other) {
-     interface_ptr_ = std::move(other.interface_ptr_);
-     SetInvalidator(other.invalidator_.get());
-     // Reset the other interface ptr to remove it as an observer of the
-@@ -58,7 +58,7 @@
- 
-   // Takes over the binding of another RevocableInterfacePtr, and closes any
-   // message pipe already bound to this pointer.
--  RevocableInterfacePtr& operator=(RevocableInterfacePtr&& other) noexcept {
-+  RevocableInterfacePtr& operator=(RevocableInterfacePtr&& other) {
-     reset();
-     interface_ptr_ = std::move(other.interface_ptr_);
-     SetInvalidator(other.invalidator_.get());
-diff --git a/third_party/blink/renderer/platform/network/encoded_form_data.cc b/third_party/blink/renderer/platform/network/encoded_form_data.cc
-index bc4ec14..1b660e6 100644
---- a/third_party/blink/renderer/platform/network/encoded_form_data.cc
-+++ b/third_party/blink/renderer/platform/network/encoded_form_data.cc
-@@ -61,11 +61,10 @@
-     : type_(kDataPipe), data_pipe_getter_(std::move(data_pipe_getter)) {}
- 
- FormDataElement::FormDataElement(const FormDataElement&) = default;
--FormDataElement::FormDataElement(FormDataElement&&) noexcept = default;
-+FormDataElement::FormDataElement(FormDataElement&&) = default;
- FormDataElement::~FormDataElement() = default;
- FormDataElement& FormDataElement::operator=(const FormDataElement&) = default;
--FormDataElement& FormDataElement::operator=(FormDataElement&&) noexcept =
--    default;
-+FormDataElement& FormDataElement::operator=(FormDataElement&&) = default;
- 
- bool operator==(const FormDataElement& a, const FormDataElement& b) {
-   if (&a == &b)
-diff --git a/third_party/blink/renderer/platform/network/encoded_form_data.h b/third_party/blink/renderer/platform/network/encoded_form_data.h
-index 48f84c8..865f664 100644
---- a/third_party/blink/renderer/platform/network/encoded_form_data.h
-+++ b/third_party/blink/renderer/platform/network/encoded_form_data.h
-@@ -61,12 +61,12 @@
-   explicit FormDataElement(scoped_refptr<WrappedDataPipeGetter>);
- 
-   FormDataElement(const FormDataElement&);
--  FormDataElement(FormDataElement&&) noexcept;
-+  FormDataElement(FormDataElement&&);
- 
-   ~FormDataElement();
- 
-   FormDataElement& operator=(const FormDataElement&);
--  FormDataElement& operator=(FormDataElement&&) noexcept;
-+  FormDataElement& operator=(FormDataElement&&);
- 
-   bool IsSafeToSendToAnotherThread() const;
- 
-diff --git a/third_party/blink/renderer/platform/scheduler/common/frame_or_worker_scheduler.cc b/third_party/blink/renderer/platform/scheduler/common/frame_or_worker_scheduler.cc
-index ebe99ff..e971856 100644
---- a/third_party/blink/renderer/platform/scheduler/common/frame_or_worker_scheduler.cc
-+++ b/third_party/blink/renderer/platform/scheduler/common/frame_or_worker_scheduler.cc
-@@ -28,15 +28,14 @@
- }
- 
- FrameOrWorkerScheduler::SchedulingAffectingFeatureHandle::
--    SchedulingAffectingFeatureHandle(
--        SchedulingAffectingFeatureHandle&& other) noexcept
-+    SchedulingAffectingFeatureHandle(SchedulingAffectingFeatureHandle&& other)
-     : feature_(other.feature_), scheduler_(std::move(other.scheduler_)) {
-   other.scheduler_ = nullptr;
- }
- 
- FrameOrWorkerScheduler::SchedulingAffectingFeatureHandle&
- FrameOrWorkerScheduler::SchedulingAffectingFeatureHandle::operator=(
--    SchedulingAffectingFeatureHandle&& other) noexcept {
-+    SchedulingAffectingFeatureHandle&& other) {
-   feature_ = other.feature_;
-   policy_ = std::move(other.policy_);
-   scheduler_ = std::move(other.scheduler_);
-diff --git a/third_party/blink/renderer/platform/scheduler/common/post_cancellable_task.cc b/third_party/blink/renderer/platform/scheduler/common/post_cancellable_task.cc
-index 2c84d70..fad56ee1 100644
---- a/third_party/blink/renderer/platform/scheduler/common/post_cancellable_task.cc
-+++ b/third_party/blink/renderer/platform/scheduler/common/post_cancellable_task.cc
-@@ -103,9 +103,9 @@
-   Cancel();
- }
- 
--TaskHandle::TaskHandle(TaskHandle&&) noexcept = default;
-+TaskHandle::TaskHandle(TaskHandle&&) = default;
- 
--TaskHandle& TaskHandle::operator=(TaskHandle&& other) noexcept {
-+TaskHandle& TaskHandle::operator=(TaskHandle&& other) {
-   TaskHandle tmp(std::move(other));
-   runner_.swap(tmp.runner_);
-   return *this;
-diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/web_scoped_virtual_time_pauser.cc b/third_party/blink/renderer/platform/scheduler/main_thread/web_scoped_virtual_time_pauser.cc
-index f55730a..b64ec9d 100644
---- a/third_party/blink/renderer/platform/scheduler/main_thread/web_scoped_virtual_time_pauser.cc
-+++ b/third_party/blink/renderer/platform/scheduler/main_thread/web_scoped_virtual_time_pauser.cc
-@@ -28,7 +28,7 @@
- }
- 
- WebScopedVirtualTimePauser::WebScopedVirtualTimePauser(
--    WebScopedVirtualTimePauser&& other) noexcept {
-+    WebScopedVirtualTimePauser&& other) {
-   virtual_time_when_paused_ = other.virtual_time_when_paused_;
-   paused_ = other.paused_;
-   duration_ = other.duration_;
-@@ -39,7 +39,7 @@
- }
- 
- WebScopedVirtualTimePauser& WebScopedVirtualTimePauser::operator=(
--    WebScopedVirtualTimePauser&& other) noexcept {
-+    WebScopedVirtualTimePauser&& other) {
-   if (scheduler_ && paused_)
-     DecrementVirtualTimePauseCount();
-   virtual_time_when_paused_ = other.virtual_time_when_paused_;
-diff --git a/third_party/blink/renderer/platform/scheduler/public/frame_or_worker_scheduler.h b/third_party/blink/renderer/platform/scheduler/public/frame_or_worker_scheduler.h
-index 56915ee..3fdb8cf 100644
---- a/third_party/blink/renderer/platform/scheduler/public/frame_or_worker_scheduler.h
-+++ b/third_party/blink/renderer/platform/scheduler/public/frame_or_worker_scheduler.h
-@@ -57,12 +57,11 @@
- 
-    public:
-     SchedulingAffectingFeatureHandle() = default;
--    SchedulingAffectingFeatureHandle(
--        SchedulingAffectingFeatureHandle&&) noexcept;
-+    SchedulingAffectingFeatureHandle(SchedulingAffectingFeatureHandle&&);
-     inline ~SchedulingAffectingFeatureHandle() { reset(); }
- 
-     SchedulingAffectingFeatureHandle& operator=(
--        SchedulingAffectingFeatureHandle&&) noexcept;
-+        SchedulingAffectingFeatureHandle&&);
- 
-     inline void reset() {
-       if (scheduler_)
-diff --git a/third_party/blink/renderer/platform/scheduler/public/post_cancellable_task.h b/third_party/blink/renderer/platform/scheduler/public/post_cancellable_task.h
-index 38cbf63..ae66c73 100644
---- a/third_party/blink/renderer/platform/scheduler/public/post_cancellable_task.h
-+++ b/third_party/blink/renderer/platform/scheduler/public/post_cancellable_task.h
-@@ -28,8 +28,8 @@
-   TaskHandle();
-   ~TaskHandle();
- 
--  TaskHandle(TaskHandle&&) noexcept;
--  TaskHandle& operator=(TaskHandle&&) noexcept;
-+  TaskHandle(TaskHandle&&);
-+  TaskHandle& operator=(TaskHandle&&);
- 
-   // Returns true if the task will run later. Returns false if the task is
-   // cancelled or the task is run already.
-diff --git a/third_party/blink/renderer/platform/weborigin/origin_access_entry.cc b/third_party/blink/renderer/platform/weborigin/origin_access_entry.cc
-index 2e9a9d1..c9d777e7 100644
---- a/third_party/blink/renderer/platform/weborigin/origin_access_entry.cc
-+++ b/third_party/blink/renderer/platform/weborigin/origin_access_entry.cc
-@@ -59,8 +59,7 @@
-                network::mojom::CorsPortMatchMode::kAllowOnlySpecifiedPort,
-                priority) {}
- 
--OriginAccessEntry::OriginAccessEntry(OriginAccessEntry&& from) noexcept =
--    default;
-+OriginAccessEntry::OriginAccessEntry(OriginAccessEntry&& from) = default;
- 
- network::cors::OriginAccessEntry::MatchResult OriginAccessEntry::MatchesOrigin(
-     const SecurityOrigin& origin) const {
-diff --git a/third_party/blink/renderer/platform/weborigin/origin_access_entry.h b/third_party/blink/renderer/platform/weborigin/origin_access_entry.h
-index b3e5674..5113a40 100644
---- a/third_party/blink/renderer/platform/weborigin/origin_access_entry.h
-+++ b/third_party/blink/renderer/platform/weborigin/origin_access_entry.h
-@@ -58,7 +58,7 @@
-       network::mojom::CorsDomainMatchMode,
-       network::mojom::CorsOriginAccessMatchPriority priority =
-           network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
--  OriginAccessEntry(OriginAccessEntry&& from) noexcept;
-+  OriginAccessEntry(OriginAccessEntry&& from);
- 
-   network::cors::OriginAccessEntry::MatchResult MatchesOrigin(
-       const SecurityOrigin&) const;
-diff --git a/third_party/blink/renderer/platform/wtf/deque.h b/third_party/blink/renderer/platform/wtf/deque.h
-index c6fe1b9..4a98ffb 100644
---- a/third_party/blink/renderer/platform/wtf/deque.h
-+++ b/third_party/blink/renderer/platform/wtf/deque.h
-@@ -64,8 +64,8 @@ class Deque {
-   Deque();
-   Deque(const Deque&);
-   Deque& operator=(const Deque&);
--  Deque(Deque&&) noexcept;
--  Deque& operator=(Deque&&) noexcept;
-+  Deque(Deque&&);
-+  Deque& operator=(Deque&&);
-   ~Deque();
- 
-   void FinalizeGarbageCollectedObject() { NOTREACHED(); }
-@@ -343,14 +343,14 @@
- }
- 
- template <typename T, wtf_size_t inlineCapacity, typename Allocator>
--inline Deque<T, inlineCapacity, Allocator>::Deque(Deque&& other) noexcept
-+inline Deque<T, inlineCapacity, Allocator>::Deque(Deque&& other)
-     : start_(0), end_(0) {
-   Swap(other);
- }
- 
- template <typename T, wtf_size_t inlineCapacity, typename Allocator>
- inline Deque<T, inlineCapacity, Allocator>&
--Deque<T, inlineCapacity, Allocator>::operator=(Deque&& other) noexcept {
-+Deque<T, inlineCapacity, Allocator>::operator=(Deque&& other) {
-   Swap(other);
-   return *this;
- }
-diff --git a/third_party/blink/renderer/platform/wtf/functional.h b/third_party/blink/renderer/platform/wtf/functional.h
-index 2c5aeea..5e4b373 100644
---- a/third_party/blink/renderer/platform/wtf/functional.h
-+++ b/third_party/blink/renderer/platform/wtf/functional.h
-@@ -117,8 +117,7 @@
- class PassedWrapper final {
-  public:
-   explicit PassedWrapper(T&& scoper) : scoper_(std::move(scoper)) {}
--  PassedWrapper(PassedWrapper&& other) noexcept
--      : scoper_(std::move(other.scoper_)) {}
-+  PassedWrapper(PassedWrapper&& other) : scoper_(std::move(other.scoper_)) {}
-   T MoveOut() const { return std::move(scoper_); }
- 
-  private:
-@@ -319,9 +318,8 @@
-   CrossThreadFunction(const CrossThreadFunction&) = delete;
-   CrossThreadFunction& operator=(const CrossThreadFunction&) = delete;
- 
--  CrossThreadFunction(CrossThreadFunction&& other) noexcept = default;
--  CrossThreadFunction& operator=(CrossThreadFunction&& other) noexcept =
--      default;
-+  CrossThreadFunction(CrossThreadFunction&& other) = default;
-+  CrossThreadFunction& operator=(CrossThreadFunction&& other) = default;
- 
-   R Run(Args... args) const & {
-     return callback_.Run(std::forward<Args>(args)...);
-@@ -356,9 +354,8 @@
-   CrossThreadOnceFunction(const CrossThreadOnceFunction&) = delete;
-   CrossThreadOnceFunction& operator=(const CrossThreadOnceFunction&) = delete;
- 
--  CrossThreadOnceFunction(CrossThreadOnceFunction&& other) noexcept = default;
--  CrossThreadOnceFunction& operator=(CrossThreadOnceFunction&& other) noexcept =
--      default;
-+  CrossThreadOnceFunction(CrossThreadOnceFunction&& other) = default;
-+  CrossThreadOnceFunction& operator=(CrossThreadOnceFunction&& other) = default;
- 
-   R Run(Args... args) && {
-     return std::move(callback_).Run(std::forward<Args>(args)...);
-diff --git a/third_party/blink/renderer/platform/wtf/hash_map.h b/third_party/blink/renderer/platform/wtf/hash_map.h
-index 8a002a8..46b39e0 100644
---- a/third_party/blink/renderer/platform/wtf/hash_map.h
-+++ b/third_party/blink/renderer/platform/wtf/hash_map.h
-@@ -106,8 +106,8 @@
- #endif
-   HashMap(const HashMap&) = default;
-   HashMap& operator=(const HashMap&) = default;
--  HashMap(HashMap&&) noexcept = default;
--  HashMap& operator=(HashMap&&) noexcept = default;
-+  HashMap(HashMap&&) = default;
-+  HashMap& operator=(HashMap&&) = default;
- 
-   // For example, HashMap<int, int>({{1, 11}, {2, 22}, {3, 33}}) will give you
-   // a HashMap containing a mapping {1 -> 11, 2 -> 22, 3 -> 33}.
-diff --git a/third_party/blink/renderer/platform/wtf/hash_set.h b/third_party/blink/renderer/platform/wtf/hash_set.h
-index c79e45f1..d7cdeed 100644
---- a/third_party/blink/renderer/platform/wtf/hash_set.h
-+++ b/third_party/blink/renderer/platform/wtf/hash_set.h
-@@ -74,8 +74,8 @@
-   }
-   HashSet(const HashSet&) = default;
-   HashSet& operator=(const HashSet&) = default;
--  HashSet(HashSet&&) noexcept = default;
--  HashSet& operator=(HashSet&&) noexcept = default;
-+  HashSet(HashSet&&) = default;
-+  HashSet& operator=(HashSet&&) = default;
- 
-   HashSet(std::initializer_list<ValueType> elements);
-   HashSet& operator=(std::initializer_list<ValueType> elements);
-diff --git a/third_party/blink/renderer/platform/wtf/hash_table.h b/third_party/blink/renderer/platform/wtf/hash_table.h
-index 373280f..52483ec5 100644
---- a/third_party/blink/renderer/platform/wtf/hash_table.h
-+++ b/third_party/blink/renderer/platform/wtf/hash_table.h
-@@ -747,10 +747,10 @@
-   }
- 
-   HashTable(const HashTable&);
--  HashTable(HashTable&&) noexcept;
-+  HashTable(HashTable&&);
-   void swap(HashTable&);
-   HashTable& operator=(const HashTable&);
--  HashTable& operator=(HashTable&&) noexcept;
-+  HashTable& operator=(HashTable&&);
- 
-   // When the hash table is empty, just return the same iterator for end as
-   // for begin.  This is more efficient because we don't have to skip all the
-@@ -1929,7 +1929,7 @@
-           typename KeyTraits,
-           typename Allocator>
- HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits, Allocator>::
--    HashTable(HashTable&& other) noexcept
-+    HashTable(HashTable&& other)
-     : table_(nullptr),
-       table_size_(0),
-       key_count_(0),
-@@ -2008,7 +2008,7 @@
-           typename Allocator>
- HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits, Allocator>&
- HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits, Allocator>::
--operator=(HashTable&& other) noexcept {
-+operator=(HashTable&& other) {
-   swap(other);
-   return *this;
- }
-diff --git a/third_party/blink/renderer/platform/wtf/linked_hash_set.h b/third_party/blink/renderer/platform/wtf/linked_hash_set.h
-index 79c3d76d..71ef37a 100644
---- a/third_party/blink/renderer/platform/wtf/linked_hash_set.h
-+++ b/third_party/blink/renderer/platform/wtf/linked_hash_set.h
-@@ -121,7 +121,7 @@
-   LinkedHashSetNodeBase(const LinkedHashSetNodeBase& other)
-       : prev_(nullptr), next_(nullptr) {}
- 
--  LinkedHashSetNodeBase(LinkedHashSetNodeBase&& other) noexcept
-+  LinkedHashSetNodeBase(LinkedHashSetNodeBase&& other)
-       : prev_(other.prev_), next_(other.next_) {
-     other.prev_ = nullptr;
-     other.next_ = nullptr;
-@@ -151,7 +151,7 @@
-                     LinkedHashSetNodeBase* next)
-       : LinkedHashSetNodeBase(prev, next), value_(std::move(value)) {}
- 
--  LinkedHashSetNode(LinkedHashSetNode&& other) noexcept
-+  LinkedHashSetNode(LinkedHashSetNode&& other)
-       : LinkedHashSetNodeBase(std::move(other)),
-         value_(std::move(other.value_)) {}
- 
-@@ -214,9 +214,9 @@
- 
-   LinkedHashSet();
-   LinkedHashSet(const LinkedHashSet&);
--  LinkedHashSet(LinkedHashSet&&) noexcept;
-+  LinkedHashSet(LinkedHashSet&&);
-   LinkedHashSet& operator=(const LinkedHashSet&);
--  LinkedHashSet& operator=(LinkedHashSet&&) noexcept;
-+  LinkedHashSet& operator=(LinkedHashSet&&);
- 
-   // Needs finalization. The anchor needs to unlink itself from the chain.
-   ~LinkedHashSet();
-@@ -748,7 +748,7 @@
- }
- 
- template <typename T, typename U, typename V, typename W>
--inline LinkedHashSet<T, U, V, W>::LinkedHashSet(LinkedHashSet&& other) noexcept
-+inline LinkedHashSet<T, U, V, W>::LinkedHashSet(LinkedHashSet&& other)
-     : anchor_() {
-   Swap(other);
- }
-@@ -763,7 +763,7 @@
- 
- template <typename T, typename U, typename V, typename W>
- inline LinkedHashSet<T, U, V, W>& LinkedHashSet<T, U, V, W>::operator=(
--    LinkedHashSet&& other) noexcept {
-+    LinkedHashSet&& other) {
-   Swap(other);
-   return *this;
- }
-diff --git a/third_party/blink/renderer/platform/wtf/list_hash_set.h b/third_party/blink/renderer/platform/wtf/list_hash_set.h
-index ead6a87..78bd279 100644
---- a/third_party/blink/renderer/platform/wtf/list_hash_set.h
-+++ b/third_party/blink/renderer/platform/wtf/list_hash_set.h
-@@ -145,9 +145,9 @@ class ListHashSet {
- 
-   ListHashSet();
-   ListHashSet(const ListHashSet&);
--  ListHashSet(ListHashSet&&) noexcept;
-+  ListHashSet(ListHashSet&&);
-   ListHashSet& operator=(const ListHashSet&);
--  ListHashSet& operator=(ListHashSet&&) noexcept;
-+  ListHashSet& operator=(ListHashSet&&);
-   ~ListHashSet();
- 
-   void Swap(ListHashSet&);
-@@ -780,8 +780,7 @@
- }
- 
- template <typename T, size_t inlineCapacity, typename U, typename V>
--inline ListHashSet<T, inlineCapacity, U, V>::ListHashSet(
--    ListHashSet&& other) noexcept
-+inline ListHashSet<T, inlineCapacity, U, V>::ListHashSet(ListHashSet&& other)
-     : head_(nullptr), tail_(nullptr) {
-   Swap(other);
- }
-@@ -796,7 +795,7 @@
- 
- template <typename T, size_t inlineCapacity, typename U, typename V>
- inline ListHashSet<T, inlineCapacity, U, V>&
--ListHashSet<T, inlineCapacity, U, V>::operator=(ListHashSet&& other) noexcept {
-+ListHashSet<T, inlineCapacity, U, V>::operator=(ListHashSet&& other) {
-   Swap(other);
-   return *this;
- }
-diff --git a/third_party/blink/renderer/platform/wtf/type_traits_test.cc b/third_party/blink/renderer/platform/wtf/type_traits_test.cc
-index 0930b73..1b45d55 100644
---- a/third_party/blink/renderer/platform/wtf/type_traits_test.cc
-+++ b/third_party/blink/renderer/platform/wtf/type_traits_test.cc
-@@ -158,7 +158,7 @@
-   STACK_ALLOCATED();
- 
-  public:
--  CopyAssignmentDeleted& operator=(CopyAssignmentDeleted&&) noexcept;
-+  CopyAssignmentDeleted& operator=(CopyAssignmentDeleted&&);
- 
-  private:
-   CopyAssignmentDeleted& operator=(const CopyAssignmentDeleted&) = delete;
-@@ -173,7 +173,7 @@
-   STACK_ALLOCATED();
- 
-  public:
--  CopyAssignmentPrivate& operator=(CopyAssignmentPrivate&&) noexcept;
-+  CopyAssignmentPrivate& operator=(CopyAssignmentPrivate&&);
- 
-  private:
-   CopyAssignmentPrivate& operator=(const CopyAssignmentPrivate&);
-@@ -188,7 +188,7 @@
-   STACK_ALLOCATED();
- 
-  public:
--  CopyAssignmentUndeclared& operator=(CopyAssignmentUndeclared&&) noexcept;
-+  CopyAssignmentUndeclared& operator=(CopyAssignmentUndeclared&&);
- };
- 
- static_assert(!std::is_copy_assignable<CopyAssignmentUndeclared>::value,
-diff --git a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
-index 3f44cd2..ee7c89a 100644
---- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
-+++ b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
-@@ -68,7 +68,7 @@
-           deleter_(deleter),
-           deleter_info_(deleter_info) {}
-     // Move constructor
--    DataHandle(DataHandle&& other) noexcept { *this = std::move(other); }
-+    DataHandle(DataHandle&& other) { *this = std::move(other); }
-     ~DataHandle() {
-       if (!data_)
-         return;
-diff --git a/third_party/blink/renderer/platform/wtf/vector.h b/third_party/blink/renderer/platform/wtf/vector.h
-index 2783c2b..43a27f7 100644
---- a/third_party/blink/renderer/platform/wtf/vector.h
-+++ b/third_party/blink/renderer/platform/wtf/vector.h
-@@ -1018,8 +1018,8 @@
-   Vector& operator=(const Vector<T, otherCapacity, Allocator>&);
- 
-   // Moving.
--  Vector(Vector&&) noexcept;
--  Vector& operator=(Vector&&) noexcept;
-+  Vector(Vector&&);
-+  Vector& operator=(Vector&&);
- 
-   // Construct with an initializer list. You can do e.g.
-   //     Vector<int> v({1, 2, 3});
-@@ -1459,7 +1459,7 @@
- 
- template <typename T, wtf_size_t inlineCapacity, typename Allocator>
- Vector<T, inlineCapacity, Allocator>::Vector(
--    Vector<T, inlineCapacity, Allocator>&& other) noexcept {
-+    Vector<T, inlineCapacity, Allocator>&& other) {
-   size_ = 0;
-   // It's a little weird to implement a move constructor using swap but this
-   // way we don't have to add a move constructor to VectorBuffer.
-@@ -1468,7 +1468,7 @@
- 
- template <typename T, wtf_size_t inlineCapacity, typename Allocator>
- Vector<T, inlineCapacity, Allocator>& Vector<T, inlineCapacity, Allocator>::
--operator=(Vector<T, inlineCapacity, Allocator>&& other) noexcept {
-+operator=(Vector<T, inlineCapacity, Allocator>&& other) {
-   swap(other);
-   return *this;
- }
-diff --git a/third_party/blink/renderer/platform/wtf/vector_test.cc b/third_party/blink/renderer/platform/wtf/vector_test.cc
-index aa8a138..788cc2bb 100644
---- a/third_party/blink/renderer/platform/wtf/vector_test.cc
-+++ b/third_party/blink/renderer/platform/wtf/vector_test.cc
-@@ -420,8 +420,8 @@
- class MojoMoveOnlyType final {
-  public:
-   MojoMoveOnlyType();
--  MojoMoveOnlyType(MojoMoveOnlyType&&) noexcept;
--  MojoMoveOnlyType& operator=(MojoMoveOnlyType&&) noexcept;
-+  MojoMoveOnlyType(MojoMoveOnlyType&&);
-+  MojoMoveOnlyType& operator=(MojoMoveOnlyType&&);
-   ~MojoMoveOnlyType();
- 
-  private:
-diff --git a/third_party/blink/renderer/platform/wtf/wtf_test_helper.h b/third_party/blink/renderer/platform/wtf/wtf_test_helper.h
-index e797445..8f31365 100644
---- a/third_party/blink/renderer/platform/wtf/wtf_test_helper.h
-+++ b/third_party/blink/renderer/platform/wtf/wtf_test_helper.h
-@@ -36,9 +36,9 @@
-  public:
-   explicit MoveOnly(int i = 0) : i_(i) {}
- 
--  MoveOnly(MoveOnly&& other) noexcept : i_(other.i_) { other.i_ = 0; }
-+  MoveOnly(MoveOnly&& other) : i_(other.i_) { other.i_ = 0; }
- 
--  MoveOnly& operator=(MoveOnly&& other) noexcept {
-+  MoveOnly& operator=(MoveOnly&& other) {
-     if (this != &other) {
-       i_ = other.i_;
-       other.i_ = 0;
-@@ -62,12 +62,12 @@
- 
-   explicit MoveOnlyHashValue(int value = kEmpty, int id = 0)
-       : value_(value), id_(id) {}
--  MoveOnlyHashValue(MoveOnlyHashValue&& other) noexcept
-+  MoveOnlyHashValue(MoveOnlyHashValue&& other)
-       : value_(other.value_), id_(other.id_) {
-     other.value_ = kMovedOut;
-     other.id_ = 0;
-   }
--  MoveOnlyHashValue& operator=(MoveOnlyHashValue&& other) noexcept {
-+  MoveOnlyHashValue& operator=(MoveOnlyHashValue&& other) {
-     value_ = other.value_;
-     id_ = other.id_;
-     other.value_ = kMovedOut;
diff --git a/srcpkgs/electron7/files/patches/chromium-79-gcc-ambiguous-nodestructor.patch b/srcpkgs/electron7/files/patches/chromium-79-gcc-ambiguous-nodestructor.patch
deleted file mode 100644
index d43a091b9718..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-79-gcc-ambiguous-nodestructor.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From af77dc4014ead3d898fdc8a7a70fe5063ac9b102 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Fri, 25 Oct 2019 19:01:29 +0000
-Subject: [PATCH] GCC: use brace-initializer for DohUpgrade vector
-
-Constructing NoDestructor with parenthesis constructor is ambiguous
-in GCC. Use brace-initializer to avoid that problem. This fixes this
-build error:
-
-Bug: 819294
-Change-Id: I00dda42daa1794d11e022f26ac07f92e599d106d
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879910
-Reviewed-by: Eric Orth <ericorth@chromium.org>
-Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
-Cr-Commit-Position: refs/heads/master@{#709569}
----
-
-diff --git a/net/dns/dns_util.cc b/net/dns/dns_util.cc
-index 14997c4..637b6f2 100644
---- a/net/dns/dns_util.cc
-+++ b/net/dns/dns_util.cc
-@@ -144,7 +144,7 @@
-   // DohProviderId histogram suffix list in
-   // tools/metrics/histograms/histograms.xml.
-   static const base::NoDestructor<std::vector<DohUpgradeEntry>>
--      upgradable_servers({
-+      upgradable_servers{{
-           DohUpgradeEntry(
-               "CleanBrowsingAdult",
-               {"185.228.168.10", "185.228.169.11", "2a0d:2a00:1::1",
-@@ -215,7 +215,7 @@
-               {"9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9"},
-               {"dns.quad9.net", "dns9.quad9.net"} /* DoT hostname */,
-               {"https://dns.quad9.net/dns-query", true /* use_post */}),
--      });
-+      }};
-   return *upgradable_servers;
- }
- 
diff --git a/srcpkgs/electron7/files/patches/chromium-79-gcc-includes.patch b/srcpkgs/electron7/files/patches/chromium-79-gcc-includes.patch
deleted file mode 100644
index 05cb1e9b6345..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-79-gcc-includes.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From cf2022b11cd3e28f1f3777b060fd509f665ff8e1 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Mon, 6 Jul 2020 10:21:27 -0700
-Subject: [PATCH] GCC 10 Fixes
-
----
- base/trace_event/trace_event_memory_overhead.h           | 1 +
- third_party/angle/include/platform/Platform.h            | 1 +
- third_party/perfetto/include/perfetto/base/task_runner.h | 2 ++
- third_party/webrtc/call/rtx_receive_stream.h             | 1 +
- 4 files changed, 5 insertions(+)
-
-diff --git a/base/trace_event/trace_event_memory_overhead.h b/base/trace_event/trace_event_memory_overhead.h
-index 69468d4..e10a3ec 100644
---- a/base/trace_event/trace_event_memory_overhead.h
-+++ b/base/trace_event/trace_event_memory_overhead.h
-@@ -8,6 +8,7 @@
- #include <stddef.h>
- #include <stdint.h>
- 
-+#include <string>
- #include <unordered_map>
- 
- #include "base/base_export.h"
-diff --git a/third_party/angle/include/platform/Platform.h b/third_party/angle/include/platform/Platform.h
-index cea6070..0fbd64f 100644
---- a/third_party/angle/include/platform/Platform.h
-+++ b/third_party/angle/include/platform/Platform.h
-@@ -9,6 +9,7 @@
- #ifndef ANGLE_PLATFORM_H
- #define ANGLE_PLATFORM_H
- 
-+#include <stddef.h>
- #include <stdint.h>
- #include <array>
- 
-diff --git a/third_party/perfetto/include/perfetto/base/task_runner.h b/third_party/perfetto/include/perfetto/base/task_runner.h
-index cf60401..040aab2 100644
---- a/third_party/perfetto/include/perfetto/base/task_runner.h
-+++ b/third_party/perfetto/include/perfetto/base/task_runner.h
-@@ -17,6 +17,8 @@
- #ifndef INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
- #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
- 
-+#include <stdint.h>
-+
- #include <functional>
- 
- #include "perfetto/base/export.h"
-diff --git a/third_party/webrtc/call/rtx_receive_stream.h b/third_party/webrtc/call/rtx_receive_stream.h
-index 8ffa440..fb2f9f4 100644
---- a/third_party/webrtc/call/rtx_receive_stream.h
-+++ b/third_party/webrtc/call/rtx_receive_stream.h
-@@ -11,6 +11,8 @@
- #ifndef CALL_RTX_RECEIVE_STREAM_H_
- #define CALL_RTX_RECEIVE_STREAM_H_
-
-+#include <stdint.h>
-+
- #include <map>
-
- #include "call/rtp_packet_sink_interface.h"
-diff --git a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-index 22528c9..2ba90bb 100644
---- a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-+++ b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-@@ -11,6 +11,8 @@
- #ifndef MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
- #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
-
-+#include <stddef.h>
-+
- #include <array>
-
- namespace webrtc {
-diff --git a/media/cdm/supported_cdm_versions.h b/media/cdm/supported_cdm_versions.h
-index 3f220da..c54e3bb 100644
---- a/media/cdm/supported_cdm_versions.h
-+++ b/media/cdm/supported_cdm_versions.h
-@@ -6,6 +6,7 @@
- #define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_
-
- #include <array>
-+#include <cstddef>
-
- #include "media/base/media_export.h"
- #include "media/cdm/api/content_decryption_module.h"
-diff --git a/third_party/webrtc/modules/video_coding/decoding_state.h b/third_party/webrtc/modules/video_coding/decoding_state.h
-index b87fb2d..ec97294 100644
---- a/third_party/webrtc/modules/video_coding/decoding_state.h
-+++ b/third_party/webrtc/modules/video_coding/decoding_state.h
-@@ -11,6 +11,7 @@
- #ifndef MODULES_VIDEO_CODING_DECODING_STATE_H_
- #define MODULES_VIDEO_CODING_DECODING_STATE_H_
-
-+#include <cstdint>
- #include <map>
- #include <set>
- #include <vector>
--- 
-2.26.2
-
diff --git a/srcpkgs/electron7/files/patches/chromium-79-gcc-status-enum.patch b/srcpkgs/electron7/files/patches/chromium-79-gcc-status-enum.patch
deleted file mode 100644
index ef57ce774a96..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-79-gcc-status-enum.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d48486507d6b4ed130696721a758e2a231066cf7 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Mon, 6 Jul 2020 16:33:14 -0700
-Subject: [PATCH] GCC-X11-Success-enum
-
----
- components/viz/host/host_display_client.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/components/viz/host/host_display_client.h b/components/viz/host/host_display_client.h
-index 72a807e..257bc86 100644
---- a/components/viz/host/host_display_client.h
-+++ b/components/viz/host/host_display_client.h
-@@ -13,7 +13,14 @@
- #include "build/build_config.h"
- #include "components/viz/host/viz_host_export.h"
- #include "mojo/public/cpp/bindings/binding.h"
-+#ifdef Success
-+#undef Success
-+#define __X11_SUCCESS
-+#endif
- #include "services/viz/privileged/mojom/compositing/display_private.mojom.h"
-+#ifdef __X11_SUCCESS
-+#define Success 0
-+#endif
- #include "ui/gfx/native_widget_types.h"
- 
- namespace viz {
--- 
-2.26.2
-
diff --git a/srcpkgs/electron7/files/patches/chromium-79-icu-65.patch b/srcpkgs/electron7/files/patches/chromium-79-icu-65.patch
deleted file mode 100644
index e0732b6ace24..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-79-icu-65.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
-index 5a62770..1fae2aa 100644
---- a/third_party/blink/renderer/core/dom/document.cc
-+++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -6192,7 +6192,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal(
- 
-   for (unsigned i = 0; i < length;) {
-     UChar32 c;
--    U16_NEXT(characters, i, length, c)
-+    U16_NEXT(characters, i, length, c);
-     if (c == ':') {
-       if (saw_colon)
-         return ParseQualifiedNameResult(kQNMultipleColons);
diff --git a/srcpkgs/electron7/files/patches/chromium-79-icu-67.patch b/srcpkgs/electron7/files/patches/chromium-79-icu-67.patch
deleted file mode 100644
index c18b3ed5c511..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-79-icu-67.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 64b8ee6fc65bcce07bcaa4bba5f61f29c5495253 Mon Sep 17 00:00:00 2001
-From: Frank Tang <ftang@chromium.org>
-Date: Fri, 3 Apr 2020 23:13:54 -0700
-Subject: [PATCH] [intl] Remove soon-to-be removed getAllFieldPositions
-
-Needed to land ICU67.1 soon.
-
-Bug: v8:10393
-Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489
-Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
-Commit-Queue: Frank Tang <ftang@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#67027}
----
- v8/src/objects/js-number-format.cc | 76 +++++++++++++++++----------------
- 1 file changed, 40 insertions(+), 36 deletions(-)
-
-diff --git a/v8/src/objects/js-number-format.cc b/v8/src/objects/js-number-format.cc
-index ff564975d6..ad8e173b59 100644
---- a/v8/src/objects/js-number-format.cc
-+++ b/v8/src/objects/js-number-format.cc
-@@ -1257,42 +1257,33 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
- }
-
- namespace {
--Maybe<icu::UnicodeString> IcuFormatNumber(
-+Maybe<bool> IcuFormatNumber(
-     Isolate* isolate,
-     const icu::number::LocalizedNumberFormatter& number_format,
--    Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) {
-+    Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) {
-   // If it is BigInt, handle it differently.
-   UErrorCode status = U_ZERO_ERROR;
--  icu::number::FormattedNumber formatted;
-   if (numeric_obj->IsBigInt()) {
-     Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj);
-     Handle<String> big_int_string;
-     ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string,
-                                      BigInt::ToString(isolate, big_int),
--                                     Nothing<icu::UnicodeString>());
--    formatted = number_format.formatDecimal(
-+                                     Nothing<bool>());
-+    *formatted = number_format.formatDecimal(
-         {big_int_string->ToCString().get(), big_int_string->length()}, status);
-   } else {
--    double number = numeric_obj->Number();
--    formatted = number_format.formatDouble(number, status);
-+    double number = numeric_obj->IsNaN()
-+                        ? std::numeric_limits<double>::quiet_NaN()
-+                        : numeric_obj->Number();
-+    *formatted = number_format.formatDouble(number, status);
-   }
-   if (U_FAILURE(status)) {
-     // This happen because of icu data trimming trim out "unit".
-     // See https://bugs.chromium.org/p/v8/issues/detail?id=8641
--    THROW_NEW_ERROR_RETURN_VALUE(isolate,
--                                 NewTypeError(MessageTemplate::kIcuError),
--                                 Nothing<icu::UnicodeString>());
--  }
--  if (fp_iter) {
--    formatted.getAllFieldPositions(*fp_iter, status);
-+    THROW_NEW_ERROR_RETURN_VALUE(
-+        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>());
-   }
--  icu::UnicodeString result = formatted.toString(status);
--  if (U_FAILURE(status)) {
--    THROW_NEW_ERROR_RETURN_VALUE(isolate,
--                                 NewTypeError(MessageTemplate::kIcuError),
--                                 Nothing<icu::UnicodeString>());
--  }
--  return Just(result);
-+  return Just(true);
- }
-
- }  // namespace
-@@ -1303,10 +1294,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric(
-     Handle<Object> numeric_obj) {
-   DCHECK(numeric_obj->IsNumeric());
-
--  Maybe<icu::UnicodeString> maybe_format =
--      IcuFormatNumber(isolate, number_format, numeric_obj, nullptr);
-+  icu::number::FormattedNumber formatted;
-+  Maybe<bool> maybe_format =
-+      IcuFormatNumber(isolate, number_format, numeric_obj, &formatted);
-   MAYBE_RETURN(maybe_format, Handle<String>());
--  return Intl::ToString(isolate, maybe_format.FromJust());
-+  UErrorCode status = U_ZERO_ERROR;
-+  icu::UnicodeString result = formatted.toString(status);
-+  if (U_FAILURE(status)) {
-+    THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String);
-+  }
-+  return Intl::ToString(isolate, result);
- }
-
- namespace {
-@@ -1419,12 +1416,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts(
- }
-
- namespace {
--Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
--                          icu::FieldPositionIterator* fp_iter,
-+Maybe<int> ConstructParts(Isolate* isolate,
-+                          icu::number::FormattedNumber* formatted,
-                           Handle<JSArray> result, int start_index,
-                           Handle<Object> numeric_obj, bool style_is_unit) {
-+  UErrorCode status = U_ZERO_ERROR;
-+  icu::UnicodeString formatted_text = formatted->toString(status);
-+  if (U_FAILURE(status)) {
-+    THROW_NEW_ERROR_RETURN_VALUE(
-+        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>());
-+  }
-   DCHECK(numeric_obj->IsNumeric());
--  int32_t length = formatted.length();
-+  int32_t length = formatted_text.length();
-   int index = start_index;
-   if (length == 0) return Just(index);
-
-@@ -1433,13 +1436,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
-   // other region covers some part of the formatted string. It's possible
-   // there's another field with exactly the same begin and end as this backdrop,
-   // in which case the backdrop's field_id of -1 will give it lower priority.
--  regions.push_back(NumberFormatSpan(-1, 0, formatted.length()));
-+  regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length()));
-
-   {
--    icu::FieldPosition fp;
--    while (fp_iter->next(fp)) {
--      regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(),
--                                         fp.getEndIndex()));
-+    icu::ConstrainedFieldPosition cfp;
-+    cfp.constrainCategory(UFIELD_CATEGORY_NUMBER);
-+    while (formatted->nextPosition(cfp, status)) {
-+      regions.push_back(
-+          NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit()));
-     }
-   }
-
-@@ -1461,7 +1465,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
-     Handle<String> substring;
-     ASSIGN_RETURN_ON_EXCEPTION_VALUE(
-         isolate, substring,
--        Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos),
-+        Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos),
-         Nothing<int>());
-     Intl::AddElement(isolate, result, index, field_type_string, substring);
-     ++index;
-@@ -1481,14 +1485,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts(
-       number_format->icu_number_formatter().raw();
-   CHECK_NOT_NULL(fmt);
-
--  icu::FieldPositionIterator fp_iter;
--  Maybe<icu::UnicodeString> maybe_format =
--      IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter);
-+  icu::number::FormattedNumber formatted;
-+  Maybe<bool> maybe_format =
-+      IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted);
-   MAYBE_RETURN(maybe_format, Handle<JSArray>());
-
-   Handle<JSArray> result = factory->NewJSArray(0);
-   Maybe<int> maybe_format_to_parts = ConstructParts(
--      isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj,
-+      isolate, &formatted, result, 0, numeric_obj,
-       number_format->style() == JSNumberFormat::Style::UNIT);
-   MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>());
-
---
-2.26.2
diff --git a/srcpkgs/electron7/files/patches/chromium-chromium_atk_optional.patch.patch b/srcpkgs/electron7/files/patches/chromium-chromium_atk_optional.patch.patch
deleted file mode 100644
index 27b56251ec38..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-chromium_atk_optional.patch.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/build/config/ui.gni b/build/config/ui.gni
-index 547b42f..966b00c 100644
---- a/build/config/ui.gni
-+++ b/build/config/ui.gni
-@@ -51,8 +51,10 @@ if (use_ozone) {
-   use_glib = false
- }
-
--# Whether to use atk, the Accessibility ToolKit library
--use_atk = is_desktop_linux && use_x11
-+declare_args() {
-+  # Whether to use atk, the Accessibility ToolKit library
-+  use_atk = is_desktop_linux && use_x11
-+}
- # =============================================
- #   PLEASE DO NOT ADD MORE FLAGS TO THIS FILE
- # =============================================
diff --git a/srcpkgs/electron7/files/patches/chromium-clang10_glslang.patch.patch b/srcpkgs/electron7/files/patches/chromium-clang10_glslang.patch.patch
deleted file mode 100644
index 91ef84ca7e61..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-clang10_glslang.patch.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 24b3e8384e93f3e73b6aa14ea00a30574112f9ba Mon Sep 17 00:00:00 2001
-From: Reid Kleckner <rnk@google.com>
-Date: Wed, 4 Dec 2019 14:09:03 -0800
-Subject: [PATCH] Remove glslang::pool_allocator::setAllocator
-
-TPoolAllocator is not copy assignable, so this setter could never have
-been used. After a recent change (878a24ee2), new versions of Clang
-reject this code outright.
----
- glslang/Include/PoolAlloc.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/glslang/Include/PoolAlloc.h b/glslang/Include/PoolAlloc.h
-index 0e237a6a2..b8eccb883 100644
---- a/third_party/glslang/src/glslang/Include/PoolAlloc.h
-+++ b/third_party/glslang/src/glslang/Include/PoolAlloc.h
-@@ -304,7 +304,6 @@ class pool_allocator {
-     size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
-     size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
- 
--    void setAllocator(TPoolAllocator* a) { allocator = *a; }
-     TPoolAllocator& getAllocator() const { return allocator; }
- 
- protected:
-
diff --git a/srcpkgs/electron7/files/patches/chromium-compiler-r10.patch b/srcpkgs/electron7/files/patches/chromium-compiler-r10.patch
deleted file mode 100644
index f2ecdc3f32b4..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-compiler-r10.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From a1207cc75454e653030716948d27ec27412f6fe8 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 16 Jun 2019 15:43:27 +0100
-Subject: [PATCH] Disable various compiler configs
-
----
- build/config/compiler/BUILD.gn | 64 +++++++++++++---------------------
- 1 file changed, 25 insertions(+), 39 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index a3f21b7..0a7bec6 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -230,8 +230,6 @@ config("compiler") {
- 
-   configs += [
-     # See the definitions below.
--    ":clang_revision",
--    ":compiler_cpu_abi",
-     ":compiler_codegen",
-     ":compiler_deterministic",
-   ]
-@@ -471,20 +469,6 @@ config("compiler") {
-     }
-   }
- 
--  if (is_clang && !is_nacl && !use_xcode_clang) {
--    cflags += [ "-fcrash-diagnostics-dir=" +
--                rebase_path("//tools/clang/crashreports", root_build_dir) ]
--
--    cflags += [
--      # TODO(hans): Remove this once Clang generates better optimized debug info
--      # by default. https://crbug.com/765793
--      "-Xclang",
--      "-mllvm",
--      "-Xclang",
--      "-instcombine-lower-dbg-declare=0",
--    ]
--  }
--
-   # C11/C++11 compiler flags setup.
-   # ---------------------------
-   if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
-@@ -1431,6 +1415,12 @@ config("default_warnings") {
-         "-Wno-narrowing",
-       ]
- 
-+      # -Wno-class-memaccess warns about hash table and vector in blink.
-+      # But the violation is intentional.
-+      if (!is_nacl) {
-+        cflags_cc += [ "-Wno-class-memaccess" ]
-+      }
-+
-       # -Wunused-local-typedefs is broken in gcc,
-       # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63872
-       cflags += [ "-Wno-unused-local-typedefs" ]
-@@ -1525,7 +1515,7 @@ config("chromium_code") {
-       defines = [ "_HAS_NODISCARD" ]
-     }
-   } else {
--    cflags = [ "-Wall" ]
-+    cflags = []
-     if (treat_warnings_as_errors) {
-       cflags += [ "-Werror" ]
- 
-@@ -1534,10 +1524,6 @@ config("chromium_code") {
-       # well.
-       ldflags = [ "-Werror" ]
-     }
--    if (is_clang) {
--      # Enable extra warnings for chromium_code when we control the compiler.
--      cflags += [ "-Wextra" ]
--    }
- 
-     # In Chromium code, we define __STDC_foo_MACROS in order to get the
-     # C99 macros on Mac and Linux.
-@@ -1546,15 +1532,6 @@ config("chromium_code") {
-       "__STDC_FORMAT_MACROS",
-     ]
- 
--    if (!is_debug && !using_sanitizer && current_cpu != "s390x" &&
--        current_cpu != "s390" && current_cpu != "ppc64" &&
--        current_cpu != "mips" && current_cpu != "mips64") {
--      # Non-chromium code is not guaranteed to compile cleanly with
--      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
--      # disabled, so only do that for Release build.
--      defines += [ "_FORTIFY_SOURCE=2" ]
--    }
--
-     if (is_mac) {
-       cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
-       cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -1943,7 +1920,8 @@ config("default_stack_frames") {
- }
- 
- # Default "optimization on" config.
--config("optimize") {
-+config("optimize") { }
-+config("xoptimize") {
-   if (is_win) {
-     # TODO(thakis): Remove is_clang here, https://crbug.com/598772
-     if (is_official_build && full_wpo_on_official && !is_clang) {
-@@ -1977,7 +1955,8 @@ config("optimize") {
- }
- 
- # Same config as 'optimize' but without the WPO flag.
--config("optimize_no_wpo") {
-+config("optimize_no_wpo") { }
-+config("xoptimize_no_wpo") {
-   if (is_win) {
-     # Favor size over speed, /O1 must be before the common flags. The GYP
-     # build also specifies /Os and /GF but these are implied by /O1.
-@@ -2000,7 +1979,8 @@ config("optimize_no_wpo") {
- }
- 
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
-   if (is_win) {
-     cflags = [
-       "/Od",  # Disable optimization.
-@@ -2028,7 +2008,8 @@ config("no_optimize") {
- # Turns up the optimization level. On Windows, this implies whole program
- # optimization and link-time code generation which is very expensive and should
- # be used sparingly.
--config("optimize_max") {
-+config("optimize_max") { }
-+config("xoptimize_max") {
-   if (is_nacl && is_nacl_irt) {
-     # The NaCl IRT is a special case and always wants its own config.
-     # Various components do:
-@@ -2075,7 +2056,8 @@ config("optimize_max") {
- #
- # TODO(crbug.com/621335) - rework how all of these configs are related
- # so that we don't need this disclaimer.
--config("optimize_speed") {
-+config("optimize_speed") { }
-+config("xoptimize_speed") {
-   if (is_nacl && is_nacl_irt) {
-     # The NaCl IRT is a special case and always wants its own config.
-     # Various components do:
-@@ -2113,7 +2095,8 @@ config("optimize_speed") {
-   }
- }
- 
--config("optimize_fuzzing") {
-+config("optimize_fuzzing") { }
-+config("xoptimize_fuzzing") {
-   cflags = [ "-O1" ] + common_optimize_on_cflags
-   ldflags = common_optimize_on_ldflags
-   visibility = [ ":default_optimization" ]
-@@ -2215,7 +2198,8 @@ config("win_pdbaltpath") {
- }
- 
- # Full symbols.
--config("symbols") {
-+config("symbols") { }
-+config("xsymbols") {
-   if (is_win) {
-     if (use_goma || is_clang) {
-       # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
-@@ -2325,7 +2309,8 @@ config("symbols") {
- # Minimal symbols.
- # This config guarantees to hold symbol for stack trace which are shown to user
- # when crash happens in unittests running on buildbot.
--config("minimal_symbols") {
-+config("minimal_symbols") { }
-+config("xminimal_symbols") {
-   if (is_win) {
-     # Linker symbols for backtraces only.
-     cflags = []
-@@ -2382,7 +2367,8 @@ config("minimal_symbols") {
- }
- 
- # No symbols.
--config("no_symbols") {
-+config("no_symbols") { }
-+config("xno_symbols") {
-   if (!is_win) {
-     cflags = [ "-g0" ]
-     asmflags = cflags
--- 
-2.21.0
-
diff --git a/srcpkgs/electron7/files/patches/chromium-fix-char_traits.patch b/srcpkgs/electron7/files/patches/chromium-fix-char_traits.patch
deleted file mode 100644
index 4cb9503a93f4..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-fix-char_traits.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/base/strings/char_traits.h
-+++ b/base/strings/char_traits.h
-@@ -67,9 +67,9 @@
-   return __builtin_memcmp(s1, s2, n);
- #else
-   for (; n; --n, ++s1, ++s2) {
--    if (*s1 < *s2)
-+    if ((unsigned char)*s1 < (unsigned char)*s2)
-       return -1;
--    if (*s1 > *s2)
-+    if ((unsigned char)*s1 > (unsigned char)*s2)
-       return 1;
-   }
-   return 0;
diff --git a/srcpkgs/electron7/files/patches/chromium-fix-commandline-include.patch b/srcpkgs/electron7/files/patches/chromium-fix-commandline-include.patch
deleted file mode 100644
index 15da794cbba7..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-fix-commandline-include.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Electron patches the file to use base::CommandLine, but forgot to include
-the necessary header for it.
---- a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc.orig	2020-04-27 13:49:41.408592941 +0200
-+++ b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc	2020-04-27 13:49:53.841071830 +0200
-@@ -4,6 +4,7 @@
- 
- #include "third_party/blink/renderer/platform/graphics/canvas_color_params.h"
- 
-+#include "base/command_line.h"
- #include "cc/paint/skia_paint_canvas.h"
- #include "components/viz/common/resources/resource_format_utils.h"
- #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
---- a/third_party/blink/public/platform/web_rtc_rtp_source.h.orig	2020-04-27 14:16:05.323085814 +0200
-+++ b/third_party/blink/public/platform/web_rtc_rtp_source.h	2020-04-27 14:16:17.279480838 +0200
-@@ -7,6 +7,7 @@
- 
- #include "base/optional.h"
- #include "third_party/blink/public/platform/web_common.h"
-+#include <memory>
- 
- namespace base {
- class TimeTicks;
---- a/chrome/browser/chrome_content_browser_client.cc.orig	2020-04-27 16:16:27.291208394 +0200
-+++ b/chrome/browser/chrome_content_browser_client.cc	2020-04-27 16:16:49.283984217 +0200
-@@ -2896,6 +2896,8 @@
-     const std::string& frame_name,
-     WindowOpenDisposition disposition,
-     const blink::mojom::WindowFeatures& features,
-+    const std::vector<std::string>& additional_features,
-+    const scoped_refptr<network::ResourceRequestBody>& body,
-     bool user_gesture,
-     bool opener_suppressed,
-     bool* no_javascript_access) {
---- a/chrome/browser/chrome_content_browser_client.h.orig	2020-04-27 16:15:41.932359753 +0200
-+++ b/chrome/browser/chrome_content_browser_client.h	2020-04-27 16:16:09.798318845 +0200
-@@ -303,6 +303,8 @@
-                        const std::string& frame_name,
-                        WindowOpenDisposition disposition,
-                        const blink::mojom::WindowFeatures& features,
-+                       const std::vector<std::string>& additional_features,
-+                       const scoped_refptr<network::ResourceRequestBody>& body,
-                        bool user_gesture,
-                        bool opener_suppressed,
-                        bool* no_javascript_access) override;
diff --git a/srcpkgs/electron7/files/patches/chromium-fix-sucess-definition.patch b/srcpkgs/electron7/files/patches/chromium-fix-sucess-definition.patch
deleted file mode 100644
index 4dc024693e68..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-fix-sucess-definition.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-X11.h defines a macro called "Success", which is 0. This breaks an enum
-that is generated in Chromium that has a member "Success", so undefine
-it.
---- a/chrome/browser/ui/libgtkui/select_file_dialog_impl_kde.cc.orig	2020-04-27 18:42:15.457297544 +0200
-+++ b/chrome/browser/ui/libgtkui/select_file_dialog_impl_kde.cc	2020-04-27 18:42:21.760454304 +0200
-@@ -24,7 +24,9 @@
- #include "base/task/post_task.h"
- #include "base/task/task_traits.h"
- #include "base/threading/thread_restrictions.h"
-+#undef Success
- #include "chrome/browser/ui/libgtkui/select_file_dialog_impl.h"
-+#define Success 0
- #include "content/public/browser/browser_thread.h"
- #include "ui/aura/window_tree_host.h"
- #include "ui/base/l10n/l10n_util.h"
diff --git a/srcpkgs/electron7/files/patches/chromium-gcc-lto.patch b/srcpkgs/electron7/files/patches/chromium-gcc-lto.patch
deleted file mode 100644
index 1e09cb8044c2..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-gcc-lto.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 15d9b2515631cedcbd427e4c6de2dd4e7a0bfa36 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Sat, 4 Jan 2020 16:03:03 -0500
-Subject: [PATCH] GCC LTO Support
-
----
- build/config/BUILD.gn              |  6 +++++-
- build/config/compiler/BUILD.gn     | 30 ++++++++++++++++++++++--------
- build/config/compiler/compiler.gni |  2 +-
- sandbox/linux/BUILD.gn             |  3 +++
- 4 files changed, 31 insertions(+), 10 deletions(-)
-
-diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
-index 514ab7b..f8d36fe 100644
---- a/build/config/BUILD.gn
-+++ b/build/config/BUILD.gn
-@@ -260,9 +260,13 @@ config("default_libs") {
-   } else if (is_linux) {
-     libs = [
-       "dl",
--      "pthread",
-       "rt",
-     ]
-+    ldflags = [
-+      "-Wl,--no-as-needed",
-+      "-lpthread",
-+      "-Wl,--as-needed"
-+    ]
-   }
- }
- 
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index a3f21b7..48747f7 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -558,12 +558,13 @@ config("compiler") {
-   # TODO(pcc): Make this conditional on is_official_build rather than on gn
-   # flags for specific features.
-   if (!is_debug && use_thin_lto && is_a_target_toolchain) {
--    assert(use_lld || target_os == "chromeos",
--           "gold plugin only supported with ChromeOS")
--
--    cflags += [ "-flto=thin" ]
-+    if (is_clang) {
-+      cflags += [ "-flto=thin" ]
-+    } else {
-+      cflags += [ "-flto=2", "-fno-fat-lto-objects", "-fuse-linker-plugin" ]
-+    }
- 
--    if (target_os != "chromeos") {
-+    if (target_os != "chromeos" && is_clang) {
-       cflags += [ "-fsplit-lto-unit" ]
-     }
- 
-@@ -586,7 +587,11 @@ config("compiler") {
-         "-mllvm:-import-instr-limit=10",
-       ]
-     } else {
--      ldflags += [ "-flto=thin" ]
-+      if (is_clang) {
-+        ldflags += [ "-flto=thin" ]
-+      } else {
-+        ldflags += [ "-flto=8", "-fno-fat-lto-objects", "-fuse-linker-plugin" ]
-+      }
- 
-       # Limit the parallelism to avoid too aggressive competition between
-       # linker jobs. This is still suboptimal to a potential dynamic
-@@ -607,7 +612,7 @@ config("compiler") {
-             "-Wl,--thinlto-cache-policy,$cache_policy",
-           ]
-         }
--      } else {
-+      } else if (is_clang) {
-         ldflags += [ "-Wl,-plugin-opt,jobs=8" ]
-       }
- 
-@@ -630,7 +635,7 @@ config("compiler") {
- 
-     # TODO(pcc): Re-enable this flag on Android. This will require libc++ to be
-     # built with ThinLTO (see https://crbug.com/767901) as well as the GVR shim.
--    if (!is_android) {
-+    if (!is_android && is_clang) {
-       cflags += [ "-fwhole-program-vtables" ]
-       if (!is_win) {
-         ldflags += [ "-fwhole-program-vtables" ]
-@@ -697,6 +702,15 @@ config("compiler") {
-   }
- }
- 
-+config("compiler_no_lto") {
-+  cflags = []
-+  ldflags = []
-+  if (!is_debug && use_thin_lto && is_a_target_toolchain) {
-+    cflags += ["-fno-lto"]
-+    ldflags += ["-fno-lto"]
-+  }
-+}
-+
- # This provides the basic options to select the target CPU and ABI.
- # It is factored out of "compiler" so that special cases can use this
- # without using everything that "compiler" brings in.  Options that
-diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
-index c351d6b..e567372 100644
---- a/build/config/compiler/compiler.gni
-+++ b/build/config/compiler/compiler.gni
-@@ -57,7 +57,7 @@ declare_args() {
- 
-   # Enables support for ThinLTO, which links 3x-10x faster than full LTO. See
-   # also http://blog.llvm.org/2016/06/thinlto-scalable-and-incremental-lto.html
--  use_thin_lto = is_cfi || (is_android && is_official_build)
-+  use_thin_lto = false
- 
-   # Tell VS to create a PDB that references information in .obj files rather
-   # than copying it all. This should improve linker performance. mspdbcmf.exe
-diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
-index b00a88c..e4615c0 100644
---- a/sandbox/linux/BUILD.gn
-+++ b/sandbox/linux/BUILD.gn
-@@ -256,6 +256,9 @@ component("seccomp_bpf") {
-     "//base",
-     "//base/third_party/dynamic_annotations",
-   ]
-+  configs += [
-+    "//build/config/compiler:compiler_no_lto"
-+  ]
- 
-   if (is_nacl_nonsfi) {
-     cflags = [ "-fgnu-inline-asm" ]
--- 
-2.24.1
-
diff --git a/srcpkgs/electron7/files/patches/chromium-gcc-shared.patch b/srcpkgs/electron7/files/patches/chromium-gcc-shared.patch
deleted file mode 100644
index 098b68322422..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-gcc-shared.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/build/toolchain/gcc_toolchain.gni	2019-11-19 02:27:43.000000000 +0100
-+++ -	2020-07-21 00:59:09.201421469 +0200
-@@ -371,7 +371,7 @@
-       # .TOC file, overwrite it, otherwise, don't change it.
-       tocfile = sofile + ".TOC"
- 
--      link_command = "$ld -shared -Wl,-soname=\"$soname\" {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" @\"$rspfile\""
-+      link_command = "$ld -shared -Wl,-soname=\"$soname\" {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" -shared @\"$rspfile\""
- 
-       # Generate a map file to be used for binary size analysis.
-       # Map file adds ~10% to the link time on a z620.
-@@ -450,7 +450,7 @@
-         unstripped_sofile = sofile
-       }
- 
--      command = "$ld -shared {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" -Wl,-soname=\"$soname\" @\"$rspfile\""
-+      command = "$ld -shared {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" -Wl,-soname=\"$soname\" -shared @\"$rspfile\""
- 
-       if (defined(invoker.strip)) {
-         strip_command = "${invoker.strip} -o \"$sofile\" \"$unstripped_sofile\""
diff --git a/srcpkgs/electron7/files/patches/chromium-gn_bootstrap_ninja.patch b/srcpkgs/electron7/files/patches/chromium-gn_bootstrap_ninja.patch
deleted file mode 100644
index e9f95f09cae9..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-gn_bootstrap_ninja.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Patch by Michael Forney <mforney@mforney.org>
-
-Already merged https://chromium-review.googlesource.com/c/chromium/src/+/1975453
-
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -70,6 +70,7 @@
-   out_dir = os.path.join(SRC_ROOT, build_rel)
-   gn_path = options.output or os.path.join(out_dir, 'gn')
-   gn_build_dir = os.path.join(out_dir, 'gn_build')
-+  ninja_binary = os.environ.get('NINJA', 'ninja')
- 
-   # TODO(thomasanderson): Remove this once Ubuntu Trusty reaches EOL, or when
-   # Chromium's infrastructure is upgraded from Trusty to Xenial, whichever comes
-@@ -90,7 +91,7 @@
-               os.environ.get('CFLAGS', '').split() +
-               os.environ.get('CXXFLAGS', '').split()),
-       ]) + '\n')
--    subprocess.check_call(['ninja', '-C', libcxx_dir])
-+    subprocess.check_call([ninja_binary, '-C', libcxx_dir])
-     shutil.copy2(os.path.join(gn_build_dir, 'libc++.gn.so'), out_dir)
- 
-     def append_to_env(var, vals):
-@@ -120,7 +121,7 @@
-   shutil.copy2(
-       os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir)
-   subprocess.check_call(
--      ['ninja', '-C', gn_build_dir, 'gn', '-w', 'dupbuild=err'])
-+      [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn'])
-   shutil.copy2(os.path.join(gn_build_dir, 'gn'), gn_path)
- 
-   if not options.skip_generate_buildfiles:
diff --git a/srcpkgs/electron7/files/patches/chromium-libc_malloc.patch b/srcpkgs/electron7/files/patches/chromium-libc_malloc.patch
deleted file mode 100644
index 27cd2cefc46d..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-libc_malloc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/base/process/memory_linux.cc.orig	2017-09-15 08:41:43.000000000 +0000
-+++ b/base/process/memory_linux.cc	2017-09-15 08:44:39.804995469 +0000
-@@ -21,6 +21,12 @@
- #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
- #endif
- 
-+#if defined(LIBC_GLIBC)
-+extern "C" {
-+extern void *__libc_malloc(size_t size);
-+}
-+#endif
-+
- namespace base {
- 
- size_t g_oom_size = 0U;
---- a/base/process/memory_linux.cc.orig	2017-09-15 08:46:55.000000000 +0000
-+++ b/base/process/memory_linux.cc	2017-09-15 08:51:34.422016858 +0000
-@@ -107,7 +107,7 @@
-     (!defined(LIBC_GLIBC) && !defined(USE_TCMALLOC))
-   *result = malloc(size);
- #elif defined(LIBC_GLIBC) && !defined(USE_TCMALLOC)
--  *result = __libc_malloc(size);
-+  *result = ::__libc_malloc(size);
- #elif defined(USE_TCMALLOC)
-   *result = tc_malloc_skip_new_handler(size);
- #endif
diff --git a/srcpkgs/electron7/files/patches/chromium-toolchain-host.patch b/srcpkgs/electron7/files/patches/chromium-toolchain-host.patch
deleted file mode 100644
index 0dace261a08c..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-toolchain-host.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/build/toolchain/linux/unbundle/BUILD.gn	2020-07-21 17:36:34.064748261 +0200
-+++ -	2020-07-21 17:39:03.115740522 +0200
-@@ -35,7 +35,7 @@
-   extra_ldflags = getenv("BUILD_LDFLAGS")
- 
-   toolchain_args = {
--    current_cpu = current_cpu
-+    current_cpu = host_cpu
-     current_os = current_os
-   }
- }
diff --git a/srcpkgs/electron7/files/patches/chromium-unbundle-zlib-r1.patch b/srcpkgs/electron7/files/patches/chromium-unbundle-zlib-r1.patch
deleted file mode 100644
index 951a2adb196a..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-unbundle-zlib-r1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/third_party/perfetto/gn/BUILD.gn b/third_party/perfetto/gn/BUILD.gn
-index 3bc618a..e0ddf6d 100644
---- a/third_party/perfetto/gn/BUILD.gn
-+++ b/third_party/perfetto/gn/BUILD.gn
-@@ -244,7 +244,7 @@ if (enable_perfetto_trace_processor || perfetto_build_standalone ||
-         "//buildtools:zlib",
-       ]
-     } else {
--      public_configs = [ "//third_party/zlib:zlib_config" ]
-+      public_configs = [ "//third_party/zlib:system_zlib" ]
-       public_deps = [
-         "//third_party/zlib",
-       ]
diff --git a/srcpkgs/electron7/files/patches/chromium-upstream-force-mp3-files-to-have-a-start-time-of-zero.patch b/srcpkgs/electron7/files/patches/chromium-upstream-force-mp3-files-to-have-a-start-time-of-zero.patch
deleted file mode 100644
index d018a87094dc..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-upstream-force-mp3-files-to-have-a-start-time-of-zero.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 192fc3899f76e9487d77895f31df8d2d13bf9619 Mon Sep 17 00:00:00 2001
-From: Dale Curtis <dalecurtis@chromium.org>
-Date: Fri, 26 Jun 2020 01:10:55 +0000
-Subject: [PATCH] Force mp3 files to have a start time of zero.
-
-This will allow us to remove our custom patch which breaks upstream
-ffmpeg functionality for unknown reasons.
-
-R=sandersd
-
-Fixed: 1062037
-Change-Id: I253011843dee4dd6a8c958b14990ad836a9f1dca
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2268221
-Auto-Submit: Dale Curtis <dalecurtis@chromium.org>
-Reviewed-by: Dan Sanders <sandersd@chromium.org>
-Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#782792}
----
- media/filters/ffmpeg_demuxer.cc | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index 01266e1a072..a7ed542b5fc 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -1522,6 +1522,12 @@ void FFmpegDemuxer::OnFindStreamInfoDone(int result) {
-   if (glue_->container() == container_names::CONTAINER_AVI)
-     format_context->flags |= AVFMT_FLAG_GENPTS;
- 
-+  // FFmpeg will incorrectly adjust the start time of MP3 files into the future
-+  // based on discard samples. We were unable to fix this upstream without
-+  // breaking ffmpeg functionality. https://crbug.com/1062037
-+  if (glue_->container() == container_names::CONTAINER_MP3)
-+    start_time_ = base::TimeDelta();
-+
-   // For testing purposes, don't overwrite the timeline offset if set already.
-   if (timeline_offset_.is_null()) {
-     timeline_offset_ =
diff --git a/srcpkgs/electron7/files/patches/chromium-xxx-ppc64le.patch b/srcpkgs/electron7/files/patches/chromium-xxx-ppc64le.patch
deleted file mode 100644
index 2bd500257153..000000000000
--- a/srcpkgs/electron7/files/patches/chromium-xxx-ppc64le.patch
+++ /dev/null
@@ -1,4141 +0,0 @@
-From 240f0be5fdf851bd1256a30d4af1a7127b2bf47a Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Sat, 12 Sep 2020 05:52:04 +0200
-Subject: [PATCH] ppc64le support
-
----
- build/download_nacl_toolchains.py             |   4 +
- chrome/installer/linux/BUILD.gn               |   3 -
- sandbox/features.gni                          |   2 +-
- sandbox/linux/BUILD.gn                        |   2 +
- sandbox/linux/bpf_dsl/linux_syscall_ranges.h  |   7 +
- sandbox/linux/bpf_dsl/seccomp_macros.h        |  48 ++++
- .../seccomp-bpf-helpers/baseline_policy.cc    |  10 +-
- .../baseline_policy_unittest.cc               |   2 +
- .../syscall_parameters_restrictions.cc        |  36 ++-
- .../syscall_parameters_restrictions.h         |   2 +-
- .../linux/seccomp-bpf-helpers/syscall_sets.cc | 140 +++++++-----
- .../linux/seccomp-bpf-helpers/syscall_sets.h  |  11 +-
- sandbox/linux/seccomp-bpf/syscall.cc          |  62 ++++-
- sandbox/linux/seccomp-bpf/trap.cc             |  14 ++
- sandbox/linux/services/credentials.cc         |   2 +-
- sandbox/linux/services/syscall_wrappers.cc    |   2 +-
- .../linux/syscall_broker/broker_process.cc    |   2 +-
- sandbox/linux/system_headers/linux_seccomp.h  |   9 +
- sandbox/linux/system_headers/linux_signal.h   |   2 +-
- sandbox/linux/system_headers/linux_syscalls.h |   4 +
- sandbox/linux/system_headers/linux_ucontext.h |   2 +
- .../system_headers/ppc64_linux_syscalls.h     |  12 +
- .../system_headers/ppc64_linux_ucontext.h     |  12 +
- script/list_patch_targets.py                  |  23 ++
- .../linux/bpf_renderer_policy_linux.cc        |   5 +
- .../angle/src/compiler/translator/InfoSink.h  |  11 +-
- third_party/angle/src/libANGLE/Constants.h    |   1 +
- third_party/boringssl/BUILD.gn                |   7 +
- .../dump_writer_common/raw_context_cpu.h      |   2 +
- .../linux/dump_writer_common/thread_info.cc   |  56 ++++-
- .../linux/dump_writer_common/thread_info.h    |   9 +
- .../dump_writer_common/ucontext_reader.cc     |  42 ++++
- .../dump_writer_common/ucontext_reader.h      |   3 +
- .../client/linux/handler/exception_handler.cc |  22 +-
- .../client/linux/handler/exception_handler.h  |   6 +-
- .../handler/exception_handler_unittest.cc     |   8 +-
- .../microdump_writer/microdump_writer.cc      |  14 +-
- .../microdump_writer_unittest.cc              |  15 +-
- .../minidump_writer/linux_core_dumper.cc      |   8 +-
- .../linux/minidump_writer/linux_dumper.cc     |   4 +-
- .../linux/minidump_writer/linux_dumper.h      |   3 +-
- .../linux_dumper_unittest_helper.cc           |   2 +
- .../minidump_writer/linux_ptrace_dumper.cc    |  19 +-
- .../linux_ptrace_dumper_unittest.cc           |   5 +
- .../linux/minidump_writer/minidump_writer.cc  |  18 +-
- .../linux/minidump_writer/minidump_writer.h   |   2 +
- .../minidump_writer_unittest.cc               |   3 +
- .../src/common/linux/memory_mapped_file.cc    |   3 +-
- .../linux/memory_mapped_file_unittest.cc      |   7 +-
- .../src/processor/exploitability_linux.cc     |   2 +
- .../src/processor/exploitability_unittest.cc  |  15 +-
- .../tools/linux/md2core/minidump-2-core.cc    |  45 ++++
- third_party/crashpad/crashpad/CONTRIBUTORS    |   1 +
- .../crashpad/crashpad/compat/linux/sys/user.h |   1 +
- .../crashpad/minidump/minidump_context.h      |  64 ++++++
- .../minidump/minidump_context_writer.cc       |  50 +++++
- .../minidump/minidump_context_writer.h        |  39 ++++
- .../minidump/minidump_context_writer_test.cc  |  15 ++
- .../minidump/minidump_misc_info_writer.cc     |   2 +
- .../crashpad/snapshot/capture_memory.cc       |   5 +
- .../crashpad/snapshot/cpu_architecture.h      |   5 +-
- .../crashpad/crashpad/snapshot/cpu_context.cc |   5 +
- .../crashpad/crashpad/snapshot/cpu_context.h  |  19 ++
- .../snapshot/linux/cpu_context_linux.h        |  73 ++++++
- .../snapshot/linux/debug_rendezvous_test.cc   |   4 +-
- .../linux/exception_snapshot_linux.cc         |  63 ++++++
- .../snapshot/linux/exception_snapshot_linux.h |   2 +
- .../linux/exception_snapshot_linux_test.cc    |  21 ++
- .../snapshot/linux/process_reader_linux.cc    |   2 +
- .../linux/process_reader_linux_test.cc        |   2 +
- .../crashpad/snapshot/linux/signal_context.h  |  83 +++++++
- .../snapshot/linux/system_snapshot_linux.cc   |  11 +
- .../snapshot/linux/thread_snapshot_linux.cc   |   8 +
- .../snapshot/linux/thread_snapshot_linux.h    |   2 +
- .../crashpad/util/linux/auxiliary_vector.cc   |   5 +
- .../crashpad/util/linux/ptrace_broker.cc      |   4 +-
- .../crashpad/crashpad/util/linux/ptracer.cc   |  61 +++++
- .../crashpad/util/linux/thread_info.h         |  55 +++++
- .../crashpad/util/misc/capture_context.h      |   1 +
- .../util/misc/capture_context_linux.S         | 212 +++++++++++++++++-
- .../util/misc/capture_context_test.cc         |   2 +-
- .../misc/capture_context_test_util_linux.cc   |   6 +
- .../crashpad/util/posix/signals_test.cc       |  12 +-
- third_party/dav1d/BUILD.gn                    |  17 ++
- third_party/dav1d/config/linux/ppc64/config.h |  35 +++
- third_party/libvpx/BUILD.gn                   |   4 +
- third_party/lss/linux_syscall_support.h       |   4 +-
- third_party/pffft/src/pffft.c                 |   1 +
- third_party/skia/src/sksl/SkSLString.cpp      |   7 +-
- third_party/sqlite/amalgamation/sqlite3.c     |   3 +-
- third_party/sqlite/patched/ext/rtree/rtree.c  |   2 +-
- third_party/sqlite/patched/src/sqliteInt.h    |   3 +-
- .../sqlite-src-3290000/ext/rtree/rtree.c      |   2 +-
- .../sqlite/sqlite-src-3290000/src/sqliteInt.h |   3 +-
- third_party/swiftshader/src/Yarn/BUILD.gn     |   3 +
- .../swiftshader/src/Yarn/OSFiber_asm.hpp      |   2 +
- .../swiftshader/src/Yarn/OSFiber_asm_ppc64.S  | 196 ++++++++++++++++
- .../swiftshader/src/Yarn/OSFiber_asm_ppc64.h  | 133 +++++++++++
- .../swiftshader/src/Yarn/OSFiber_ppc64.c      |  42 ++++
- .../modules/desktop_capture/differ_block.cc   |  10 +-
- third_party/webrtc/rtc_base/system/arch.h     |  12 +
- ui/gl/BUILD.gn                                |   3 +-
- v8/BUILD.gn                                   |   6 +
- v8/test/BUILD.gn                              |   6 +-
- 104 files changed, 1941 insertions(+), 138 deletions(-)
- create mode 100644 sandbox/linux/system_headers/ppc64_linux_syscalls.h
- create mode 100644 sandbox/linux/system_headers/ppc64_linux_ucontext.h
- create mode 100755 script/list_patch_targets.py
- create mode 100644 third_party/dav1d/config/linux/ppc64/config.h
- create mode 100644 third_party/swiftshader/src/Yarn/OSFiber_asm_ppc64.S
- create mode 100644 third_party/swiftshader/src/Yarn/OSFiber_asm_ppc64.h
- create mode 100644 third_party/swiftshader/src/Yarn/OSFiber_ppc64.c
-
-diff --git a/build/download_nacl_toolchains.py b/build/download_nacl_toolchains.py
-index 286a92a27e..ec36a85d31 100755
---- a/build/download_nacl_toolchains.py
-+++ b/build/download_nacl_toolchains.py
-@@ -13,6 +13,10 @@ import sys
- 
- 
- def Main(args):
-+  # If `disable_nacl=1` is in GYP_DEFINES, exit
-+  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
-+    return 0
-+
-   script_dir = os.path.dirname(os.path.abspath(__file__))
-   src_dir = os.path.dirname(script_dir)
-   nacl_dir = os.path.join(src_dir, 'native_client')
-diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn
-index 709552f186..c3cbed6a84 100644
---- a/chrome/installer/linux/BUILD.gn
-+++ b/chrome/installer/linux/BUILD.gn
-@@ -62,8 +62,6 @@ packaging_files = packaging_files_binaries + [
-                     "$root_out_dir/xdg-mime",
-                     "$root_out_dir/xdg-settings",
-                     "$root_out_dir/locales/en-US.pak",
--                    "$root_out_dir/MEIPreload/manifest.json",
--                    "$root_out_dir/MEIPreload/preloaded_data.pb",
-                   ]
- 
- action_foreach("calculate_deb_dependencies") {
-@@ -350,7 +348,6 @@ group("installer_deps") {
-     ":theme_files",
-     "//chrome",
-     "//chrome:packed_resources",
--    "//chrome/browser/resources/media/mei_preload:component",
-     "//sandbox/linux:chrome_sandbox",
-   ]
-   if (enable_nacl) {
-diff --git a/sandbox/features.gni b/sandbox/features.gni
-index 89693c54c4..6017c7eea9 100644
---- a/sandbox/features.gni
-+++ b/sandbox/features.gni
-@@ -12,6 +12,6 @@ use_seccomp_bpf =
-     (is_linux || is_android) &&
-     (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" ||
-      current_cpu == "arm64" || current_cpu == "mipsel" ||
--     current_cpu == "mips64el")
-+     current_cpu == "mips64el" || current_cpu == "ppc64")
- 
- use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
-diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
-index e4615c0fee..1b021a8720 100644
---- a/sandbox/linux/BUILD.gn
-+++ b/sandbox/linux/BUILD.gn
-@@ -419,6 +419,8 @@ component("sandbox_services") {
- 
- source_set("sandbox_services_headers") {
-   sources = [
-+    "system_headers/ppc64_linux_syscalls.h",
-+    "system_headers/ppc64_linux_ucontext.h",
-     "system_headers/arm64_linux_syscalls.h",
-     "system_headers/arm_linux_syscalls.h",
-     "system_headers/arm_linux_ucontext.h",
-diff --git a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-index 73c26c4ba6..e312589dcd 100644
---- a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-+++ b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-@@ -55,6 +55,13 @@
- #define MAX_PUBLIC_SYSCALL 279u
- #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
- 
-+#elif defined(__powerpc64__)
-+
-+#include <asm/unistd.h>
-+#define MIN_SYSCALL 0u
-+#define MAX_PUBLIC_SYSCALL 386u
-+#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
-+
- #else
- #error "Unsupported architecture"
- #endif
-diff --git a/sandbox/linux/bpf_dsl/seccomp_macros.h b/sandbox/linux/bpf_dsl/seccomp_macros.h
-index 1a407b9523..a6aec544e0 100644
---- a/sandbox/linux/bpf_dsl/seccomp_macros.h
-+++ b/sandbox/linux/bpf_dsl/seccomp_macros.h
-@@ -16,6 +16,9 @@
- #if defined(__mips__)
- // sys/user.h in eglibc misses size_t definition
- #include <stddef.h>
-+#elif defined(__powerpc64__)
-+// Manually define greg_t on ppc64
-+typedef unsigned long long greg_t;
- #endif
- #endif
- 
-@@ -346,6 +349,51 @@ struct regs_struct {
- #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
- #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
- #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
-+
-+#elif defined(__powerpc64__)
-+#include <asm/ptrace.h>
-+
-+typedef struct pt_regs regs_struct;
-+
-+#ifdef ARCH_CPU_LITTLE_ENDIAN
-+#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
-+#else
-+#define SECCOMP_ARCH AUDIT_ARCH_PPC64
-+#endif
-+
-+#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
-+
-+#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
-+#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
-+#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
-+#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
-+#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
-+#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
-+#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
-+#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
-+#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
-+
-+#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
-+#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
-+#define SECCOMP_IP_MSB_IDX \
-+  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
-+#define SECCOMP_IP_LSB_IDX \
-+  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
-+#define SECCOMP_ARG_MSB_IDX(nr) \
-+  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
-+#define SECCOMP_ARG_LSB_IDX(nr) \
-+  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
-+
-+#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
-+#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
-+#define SECCOMP_PT_IP(_regs) (_regs).nip
-+#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
-+#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
-+#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
-+#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
-+#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
-+#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
-+
- #else
- #error Unsupported target platform
- 
-diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-index 806d13c1a8..f7f59621a3 100644
---- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-@@ -88,7 +88,8 @@ bool IsBaselinePolicyWatched(int sysno) {
-          SyscallSets::IsPrctl(sysno) ||
-          SyscallSets::IsProcessGroupOrSession(sysno) ||
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-          SyscallSets::IsSocketCall(sysno) ||
- #endif
- #if defined(__arm__)
-@@ -210,7 +211,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
-   }
- 
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-   if (sysno == __NR_mmap)
-     return RestrictMmapFlags();
- #endif
-@@ -228,7 +229,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
-     return RestrictPrctl();
- 
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-   if (sysno == __NR_socketpair) {
-     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
-     static_assert(AF_UNIX == PF_UNIX,
-@@ -268,7 +269,8 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
-   }
- 
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-   if (SyscallSets::IsSocketCall(sysno))
-     return RestrictSocketcallCommand();
- #endif
-diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-index 060181bd42..5b5b7913b5 100644
---- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-@@ -290,8 +290,10 @@ TEST_BASELINE_SIGSYS(__NR_timer_create)
- #if !defined(__aarch64__)
- TEST_BASELINE_SIGSYS(__NR_eventfd)
- TEST_BASELINE_SIGSYS(__NR_inotify_init)
-+#if !defined(__powerpc64__)
- TEST_BASELINE_SIGSYS(__NR_vserver)
- #endif
-+#endif
- 
- #if defined(LIBC_GLIBC) && !defined(OS_CHROMEOS)
- BPF_TEST_C(BaselinePolicy, FutexEINVAL, BaselinePolicy) {
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-index 348ab6e8c5..f3555ba3bd 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -36,7 +36,8 @@
- #include <sys/ioctl.h>
- #include <sys/ptrace.h>
- #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(__arm__) && \
--    !defined(__aarch64__) && !defined(PTRACE_GET_THREAD_AREA)
-+    !defined(__aarch64__) && !defined(PTRACE_GET_THREAD_AREA) && \
-+    !defined(__powerpc64__)
- // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
- // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
- // asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
-@@ -45,6 +46,11 @@
- #endif
- #endif  // !OS_NACL_NONSFI
- 
-+// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
-+#ifdef __powerpc64__
-+#include <termios.h>
-+#endif
-+
- #if defined(OS_ANDROID)
- 
- #if !defined(F_DUPFD_CLOEXEC)
-@@ -107,6 +113,15 @@ inline bool IsArchitectureMips() {
- #endif
- }
- 
-+inline bool IsArchitecturePPC64() {
-+#if defined(__powerpc64__)
-+  return true;
-+#else
-+  return false;
-+#endif
-+}
-+
-+
- // Ubuntu's version of glibc has a race condition in sem_post that can cause
- // it to call futex(2) with bogus op arguments. To workaround this, we need
- // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
-@@ -248,6 +263,8 @@ ResultExpr RestrictFcntlCommands() {
-   uint64_t kOLargeFileFlag = O_LARGEFILE;
-   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
-     kOLargeFileFlag = 0100000;
-+  else if (IsArchitecturePPC64())
-+    kOLargeFileFlag = 0200000;
- 
-   const Arg<int> cmd(1);
-   const Arg<long> long_arg(2);
-@@ -262,14 +279,23 @@ ResultExpr RestrictFcntlCommands() {
-               F_SETLKW,
-               F_GETLK,
-               F_DUPFD,
--              F_DUPFD_CLOEXEC),
--             Allow())
-+              F_DUPFD_CLOEXEC
-+#if defined(__powerpc64__)
-+// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
-+// but glibc will sometimes still use the 32-bit versions. Allow both.
-+              ,
-+              5, /* F_GETLK (32) */
-+              6, /* F_SETLK (32) */
-+              7  /* F_SETLKW (32) */
-+#endif
-+              ),
-+            Allow())
-       .Case(F_SETFL,
-             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
-       .Default(CrashSIGSYS());
- }
- 
--#if defined(__i386__) || defined(__mips__)
-+#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
- ResultExpr RestrictSocketcallCommand() {
-   // Unfortunately, we are unable to restrict the first parameter to
-   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
-@@ -410,7 +436,7 @@ ResultExpr RestrictPrlimit(pid_t target_pid) {
- ResultExpr RestrictPtrace() {
-   const Arg<int> request(0);
-   return Switch(request).CASES((
--#if !defined(__aarch64__)
-+#if !defined(__aarch64__) && !defined(__powerpc64__)
-         PTRACE_GETREGS,
-         PTRACE_GETFPREGS,
-         PTRACE_GET_THREAD_AREA,
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
-index cb563dfc55..2b17800d4f 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
-@@ -48,7 +48,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictMprotectFlags();
- // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
- SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
- 
--#if defined(__i386__) || defined(__mips__)
-+#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
- // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
- // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
- SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-index 816c0d63de..70a5873434 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -29,7 +29,8 @@ bool SyscallSets::IsAllowedGettime(int sysno) {
-   switch (sysno) {
-     case __NR_gettimeofday:
- #if defined(__i386__) || defined(__x86_64__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_time:
- #endif
-       return true;
-@@ -40,12 +41,14 @@ bool SyscallSets::IsAllowedGettime(int sysno) {
-     case __NR_clock_nanosleep:  // Could be allowed.
-     case __NR_clock_settime:    // Privileged.
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_ftime:  // Obsolete.
- #endif
-     case __NR_settimeofday:  // Privileged.
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_stime:
- #endif
-     default:
-@@ -111,7 +114,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
-     case __NR_faccessat:  // EPERM not a valid errno.
-     case __NR_fchmodat:
-     case __NR_fchownat:  // Should be called chownat ?
--#if defined(__x86_64__) || defined(__aarch64__)
-+#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
- #elif defined(__i386__) || defined(__arm__) || \
-     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-@@ -130,7 +133,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
-     case __NR_memfd_create:
-     case __NR_mkdirat:
-     case __NR_mknodat:
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__powerpc64__)
-     case __NR_oldlstat:
-     case __NR_oldstat:
- #endif
-@@ -144,7 +147,8 @@ bool SyscallSets::IsFileSystem(int sysno) {
- #endif
-     case __NR_statfs:  // EPERM not a valid errno.
- #if defined(__i386__) || defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_statfs64:
- #endif
-     case __NR_symlinkat:
-@@ -154,7 +158,8 @@ bool SyscallSets::IsFileSystem(int sysno) {
-     case __NR_truncate64:
- #endif
-     case __NR_unlinkat:
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__powerpc64__)
-     case __NR_utime:
- #endif
-     case __NR_utimensat:  // New.
-@@ -173,7 +178,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
- #endif
-       return true;
- // TODO(jln): these should be denied gracefully as well (moved below).
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__powerpc64__)
-     case __NR_fadvise64:  // EPERM not a valid errno.
- #endif
- #if defined(__i386__)
-@@ -186,11 +192,12 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
-     case __NR_flock:      // EPERM not a valid errno.
-     case __NR_fstatfs:    // Give information about the whole filesystem.
- #if defined(__i386__) || defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_fstatfs64:
- #endif
-     case __NR_fsync:  // EPERM not a valid errno.
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__powerpc64__)
-     case __NR_oldfstat:
- #endif
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-@@ -198,6 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
-     case __NR_sync_file_range:  // EPERM not a valid errno.
- #elif defined(__arm__)
-     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
-+#elif defined(__powerpc64__)
-+    case __NR_sync_file_range2: // EPERM not a valid errno.
- #endif
-     default:
-       return false;
-@@ -223,7 +232,8 @@ bool SyscallSets::IsDeniedFileSystemAccessViaFd(int sysno) {
- #endif
-     case __NR_getdents64:  // EPERM not a valid errno.
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_readdir:
- #endif
-       return true;
-@@ -264,7 +274,7 @@ bool SyscallSets::IsGetSimpleId(int sysno) {
- bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
-   switch (sysno) {
-     case __NR_capset:
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
-     case __NR_ioperm:  // Intel privilege.
-     case __NR_iopl:    // Intel privilege.
- #endif
-@@ -315,7 +325,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
-     case __NR_rt_sigreturn:
-     case __NR_rt_sigtimedwait:
- #if defined(__i386__) || defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_sigaction:
-     case __NR_sigprocmask:
-     case __NR_sigreturn:
-@@ -331,7 +342,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
- #endif
-     case __NR_signalfd4:
- #if defined(__i386__) || defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_sigpending:
-     case __NR_sigsuspend:
- #endif
-@@ -355,7 +367,7 @@ bool SyscallSets::IsAllowedOperationOnFd(int sysno) {
- #endif
-     case __NR_dup3:
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_shutdown:
- #endif
-       return true;
-@@ -388,7 +400,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
-     case __NR_exit_group:
-     case __NR_wait4:
-     case __NR_waitid:
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__powerpc64__)
-     case __NR_waitpid:
- #endif
-       return true;
-@@ -405,7 +417,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #endif
-     case __NR_set_tid_address:
-     case __NR_unshare:
--#if !defined(__mips__) && !defined(__aarch64__)
-+#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_vfork:
- #endif
-     default:
-@@ -454,7 +466,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) {
-       return true;
-     default:
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_socketpair:  // We will want to inspect its argument.
- #endif
-       return false;
-@@ -464,7 +476,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) {
- bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
-   switch (sysno) {
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_accept:
-     case __NR_accept4:
-     case __NR_bind:
-@@ -479,7 +491,8 @@ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
- }
- 
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
- // Big multiplexing system call for sockets.
- bool SyscallSets::IsSocketCall(int sysno) {
-   switch (sysno) {
-@@ -493,7 +506,8 @@ bool SyscallSets::IsSocketCall(int sysno) {
- }
- #endif
- 
--#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
-+#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-+    defined(__powerpc64__)
- bool SyscallSets::IsNetworkSocketInformation(int sysno) {
-   switch (sysno) {
-     case __NR_getpeername:
-@@ -518,7 +532,7 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
-     case __NR_mincore:
-     case __NR_mlockall:
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_mmap:
- #endif
- #if defined(__i386__) || defined(__arm__) || \
-@@ -548,7 +562,8 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
-   switch (sysno) {
-     case __NR_lseek:
- #if defined(__i386__) || defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR__llseek:
- #endif
- #if !defined(__aarch64__)
-@@ -560,26 +575,28 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
-     case __NR_readv:
-     case __NR_pread64:
- #if defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_recv:
- #endif
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_recvfrom:  // Could specify source.
-     case __NR_recvmsg:   // Could specify source.
- #endif
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
-     case __NR_select:
- #endif
--#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-+#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
-     case __NR__newselect:
- #endif
- #if defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_send:
- #endif
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_sendmsg:  // Could specify destination.
-     case __NR_sendto:   // Could specify destination.
- #endif
-@@ -636,7 +653,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
-       return true;
-     case __NR_getpriority:
- #if defined(__i386__) || defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_nice:
- #endif
-     case __NR_setpriority:
-@@ -648,7 +666,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
- bool SyscallSets::IsAdminOperation(int sysno) {
-   switch (sysno) {
- #if defined(__i386__) || defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_bdflush:
- #endif
-     case __NR_kexec_load:
-@@ -664,7 +683,8 @@ bool SyscallSets::IsAdminOperation(int sysno) {
- 
- bool SyscallSets::IsKernelModule(int sysno) {
-   switch (sysno) {
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__powerpc64__)
-     case __NR_create_module:
-     case __NR_get_kernel_syms:  // Should ENOSYS.
-     case __NR_query_module:
-@@ -697,7 +717,8 @@ bool SyscallSets::IsFsControl(int sysno) {
-     case __NR_swapoff:
-     case __NR_swapon:
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_umount:
- #endif
-     case __NR_umount2:
-@@ -713,7 +734,7 @@ bool SyscallSets::IsNuma(int sysno) {
-     case __NR_getcpu:
-     case __NR_mbind:
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_migrate_pages:
- #endif
-     case __NR_move_pages:
-@@ -742,14 +763,15 @@ bool SyscallSets::IsGlobalProcessEnvironment(int sysno) {
-   switch (sysno) {
-     case __NR_acct:  // Privileged.
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_getrlimit:
- #endif
--#if defined(__i386__) || defined(__arm__)
-+#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
-     case __NR_ugetrlimit:
- #endif
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_ulimit:
- #endif
-     case __NR_getrusage:
-@@ -783,7 +805,7 @@ bool SyscallSets::IsGlobalSystemStatus(int sysno) {
- #endif
-     case __NR_sysinfo:
-     case __NR_uname:
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__powerpc64__)
-     case __NR_olduname:
-     case __NR_oldolduname:
- #endif
-@@ -845,8 +867,17 @@ bool SyscallSets::IsSystemVSemaphores(int sysno) {
- }
- #endif
- 
-+/* shitty hack around Void's 4.19 kernel headers missing those numbers */
-+#if defined(__powerpc64__) && !defined(__NR_shmget)
-+#define __NR_shmget 395
-+#define __NR_shmctl 396
-+#define __NR_shmat 397
-+#define __NR_shmdt 398
-+#endif
-+
- #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS)) || \
-+    defined(__powerpc64__)
- // These give a lot of ambient authority and bypass the setuid sandbox.
- bool SyscallSets::IsSystemVSharedMemory(int sysno) {
-   switch (sysno) {
-@@ -877,7 +908,8 @@ bool SyscallSets::IsSystemVMessageQueue(int sysno) {
- #endif
- 
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
- // Big system V multiplexing system call.
- bool SyscallSets::IsSystemVIpc(int sysno) {
-   switch (sysno) {
-@@ -897,7 +929,8 @@ bool SyscallSets::IsAnySystemV(int sysno) {
-   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
-          IsSystemVSharedMemory(sysno);
- #elif defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-   return IsSystemVIpc(sysno);
- #endif
- }
-@@ -950,7 +983,8 @@ bool SyscallSets::IsFaNotify(int sysno) {
- bool SyscallSets::IsTimer(int sysno) {
-   switch (sysno) {
-     case __NR_getitimer:
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__powerpc64__)
-     case __NR_alarm:
- #endif
-     case __NR_setitimer:
-@@ -1009,18 +1043,22 @@ bool SyscallSets::IsMisc(int sysno) {
-     case __NR_syncfs:
-     case __NR_vhangup:
- // The system calls below are not implemented.
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__powerpc64__)
-     case __NR_afs_syscall:
- #endif
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_break:
- #endif
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__powerpc64__)
-     case __NR_getpmsg:
- #endif
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_gtty:
-     case __NR_idle:
-     case __NR_lock:
-@@ -1028,20 +1066,22 @@ bool SyscallSets::IsMisc(int sysno) {
-     case __NR_prof:
-     case __NR_profil:
- #endif
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__powerpc64__)
-     case __NR_putpmsg:
- #endif
- #if defined(__x86_64__)
-     case __NR_security:
- #endif
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_stty:
- #endif
--#if defined(__x86_64__)
-+#if defined(__x86_64__) || defined(__powerpc64__)
-     case __NR_tuxcall:
- #endif
--#if !defined(__aarch64__)
-+#if !defined(__aarch64__) && !defined(__powerpc64__)
-     case __NR_vserver:
- #endif
-       return true;
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-index acd92da395..3412873d07 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
-   static bool IsDeniedGetOrModifySocket(int sysno);
- 
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-   // Big multiplexing system call for sockets.
-   static bool IsSocketCall(int sysno);
- #endif
- 
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-   static bool IsNetworkSocketInformation(int sysno);
- #endif
- 
-@@ -76,7 +77,8 @@ class SANDBOX_EXPORT SyscallSets {
-   static bool IsSystemVSemaphores(int sysno);
- #endif
- #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS)) || \
-+    defined(__powerpc64__)
-   // These give a lot of ambient authority and bypass the setuid sandbox.
-   static bool IsSystemVSharedMemory(int sysno);
- #endif
-@@ -87,7 +89,8 @@ class SANDBOX_EXPORT SyscallSets {
- #endif
- 
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-   // Big system V multiplexing system call.
-   static bool IsSystemVIpc(int sysno);
- #endif
-diff --git a/sandbox/linux/seccomp-bpf/syscall.cc b/sandbox/linux/seccomp-bpf/syscall.cc
-index 34edabd2b8..10fa5fd070 100644
---- a/sandbox/linux/seccomp-bpf/syscall.cc
-+++ b/sandbox/linux/seccomp-bpf/syscall.cc
-@@ -16,7 +16,7 @@ namespace sandbox {
- namespace {
- 
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
--    defined(ARCH_CPU_MIPS_FAMILY)
-+    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
- // Number that's not currently used by any Linux kernel ABIs.
- const int kInvalidSyscallNumber = 0x351d3;
- #else
-@@ -308,12 +308,56 @@ asm(// We need to be able to tell the kernel exactly where we made a
-     // Enter the kernel
-     "svc 0\n"
-     "2:ret\n"
-+    ".cfi_endproc\n"
-+    ".size SyscallAsm, .-SyscallAsm\n"
-+#elif defined(__powerpc64__)
-+    ".text\n"
-+    ".align 4\n"
-+    ".type SyscallAsm @function\n"
-+    "SyscallAsm:\n"
-+    ".cfi_startproc\n"
-+
-+    // Check if r3 is negative
-+    "cmpdi 3, 0\n"
-+    "bgt 2f\n"
-+
-+    // Load address of 3f into r3 and return
-+    "mflr 10\n"
-+    "bl 1f\n"
-+    "1: mflr 3\n"
-+    "mtlr 10\n"
-+    "addi 3, 3, 4*13\n"
-+    "blr\n"
-+
-+    // Load arguments from array into r3-8
-+    // save param 3 in r10
-+    "2:\n"
-+    "mr 0, 3\n"
-+    "ld 3, 0(4)\n"
-+    "ld 5, 16(4)\n"
-+    "ld 6, 24(4)\n"
-+    "ld 7, 32(4)\n"
-+    "ld 8, 40(4)\n"
-+    "ld 4, 8(4)\n"
-+    "li 9, 0\n"
-+
-+    // Enter kernel
-+    "sc\n"
-+
-+    // Magic return address
-+    "3:\n"
-+    // Like MIPS, ppc64 return values are always positive.
-+    // Check for error in cr0.SO and negate upon error
-+    "bc 4, 3, 4f\n"
-+    "neg 3, 3\n"
-+    "4: blr\n"
-+
-     ".cfi_endproc\n"
-     ".size SyscallAsm, .-SyscallAsm\n"
- #endif
-     );  // asm
- 
--#if defined(__x86_64__)
-+#if defined(__x86_64__) || defined(__powerpc64__)
- extern "C" {
- intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
- }
-@@ -427,6 +471,8 @@ intptr_t Syscall::Call(int nr,
-     ret = inout;
-   }
- 
-+#elif defined(__powerpc64__)
-+  intptr_t ret = SyscallAsm(nr, args);
- #else
- #error "Unimplemented architecture"
- #endif
-@@ -443,8 +489,18 @@ void Syscall::PutValueInUcontext(intptr_t ret_val, ucontext_t* ctx) {
-     // needs to be changed back.
-     ret_val = -ret_val;
-     SECCOMP_PARM4(ctx) = 1;
--  } else
-+  } else {
-     SECCOMP_PARM4(ctx) = 0;
-+  }
-+#endif
-+#if defined(__powerpc64__)
-+  // Same as MIPS, need to invert ret and set error register (cr0.SO)
-+  if (ret_val <= -1 && ret_val >= -4095) {
-+    ret_val = -ret_val;
-+    ctx->uc_mcontext.regs->ccr |= (1 << 28);
-+  } else {
-+    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
-+  }
- #endif
-   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
- }
-diff --git a/sandbox/linux/seccomp-bpf/trap.cc b/sandbox/linux/seccomp-bpf/trap.cc
-index 003708d2c8..8f9b3af4e2 100644
---- a/sandbox/linux/seccomp-bpf/trap.cc
-+++ b/sandbox/linux/seccomp-bpf/trap.cc
-@@ -225,6 +225,20 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) {
-       SetIsInSigHandler();
-     }
- 
-+#if defined(__powerpc64__)
-+    // On ppc64+glibc, some syscalls seem to accidentally negate the first
-+    // parameter which causes checks against it to fail. For now, manually
-+    // negate them back.
-+    // TODO(shawn@anastas.io): investigate this issue further
-+    auto nr = SECCOMP_SYSCALL(ctx);
-+    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
-+        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
-+        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
-+            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
-+        }
-+    }
-+#endif
-+
-     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
-     // is what we are showing to TrapFnc callbacks that the system call
-     // evaluator registered with the sandbox.
-diff --git a/sandbox/linux/services/credentials.cc b/sandbox/linux/services/credentials.cc
-index 542567f3ee..31d493c264 100644
---- a/sandbox/linux/services/credentials.cc
-+++ b/sandbox/linux/services/credentials.cc
-@@ -79,7 +79,7 @@ bool ChrootToSafeEmptyDir() {
-   pid_t pid = -1;
-   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
--    defined(ARCH_CPU_MIPS_FAMILY)
-+    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
-   // The stack grows downward.
-   void* stack = stack_buf + sizeof(stack_buf);
- #else
-diff --git a/sandbox/linux/services/syscall_wrappers.cc b/sandbox/linux/services/syscall_wrappers.cc
-index fcfd2aa129..f6eb32fb76 100644
---- a/sandbox/linux/services/syscall_wrappers.cc
-+++ b/sandbox/linux/services/syscall_wrappers.cc
-@@ -58,7 +58,7 @@ long sys_clone(unsigned long flags,
- #if defined(ARCH_CPU_X86_64)
-   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
- #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
--    defined(ARCH_CPU_MIPS_FAMILY)
-+    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
-   // CONFIG_CLONE_BACKWARDS defined.
-   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
- #endif
-diff --git a/sandbox/linux/syscall_broker/broker_process.cc b/sandbox/linux/syscall_broker/broker_process.cc
-index 56d4964cfd..a2e94eada5 100644
---- a/sandbox/linux/syscall_broker/broker_process.cc
-+++ b/sandbox/linux/syscall_broker/broker_process.cc
-@@ -151,7 +151,7 @@ bool BrokerProcess::IsSyscallAllowed(int sysno) const {
- #if defined(__NR_fstatat)
-     case __NR_fstatat:
- #endif
--#if defined(__x86_64__) || defined(__aarch64__)
-+#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_newfstatat:
- #endif
-       return !fast_check_in_client_ || allowed_command_set_.test(COMMAND_STAT);
-diff --git a/sandbox/linux/system_headers/linux_seccomp.h b/sandbox/linux/system_headers/linux_seccomp.h
-index a60fe2ad3d..9dccdb51d0 100644
---- a/sandbox/linux/system_headers/linux_seccomp.h
-+++ b/sandbox/linux/system_headers/linux_seccomp.h
-@@ -29,6 +29,9 @@
- #ifndef EM_AARCH64
- #define EM_AARCH64 183
- #endif
-+#ifndef EM_PPC64
-+#define EM_PPC64 21
-+#endif
- 
- #ifndef __AUDIT_ARCH_64BIT
- #define __AUDIT_ARCH_64BIT 0x80000000
-@@ -54,6 +57,12 @@
- #ifndef AUDIT_ARCH_AARCH64
- #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
- #endif
-+#ifndef AUDIT_ARCH_PPC64
-+#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
-+#endif
-+#ifndef AUDIT_ARCH_PPC64LE
-+#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
-+#endif
- 
- // For prctl.h
- #ifndef PR_SET_SECCOMP
-diff --git a/sandbox/linux/system_headers/linux_signal.h b/sandbox/linux/system_headers/linux_signal.h
-index f5a7367617..515b21a5fd 100644
---- a/sandbox/linux/system_headers/linux_signal.h
-+++ b/sandbox/linux/system_headers/linux_signal.h
-@@ -13,7 +13,7 @@
- // (not undefined, but defined different values and in different memory
- // layouts). So, fill the gap here.
- #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
- 
- #define LINUX_SIGHUP 1
- #define LINUX_SIGINT 2
-diff --git a/sandbox/linux/system_headers/linux_syscalls.h b/sandbox/linux/system_headers/linux_syscalls.h
-index 2b78a0cc3b..0a70f5ea58 100644
---- a/sandbox/linux/system_headers/linux_syscalls.h
-+++ b/sandbox/linux/system_headers/linux_syscalls.h
-@@ -35,5 +35,9 @@
- #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
- #endif
- 
-+#if defined(__powerpc64__)
-+#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
- 
-diff --git a/sandbox/linux/system_headers/linux_ucontext.h b/sandbox/linux/system_headers/linux_ucontext.h
-index 22ce780274..a69b024c2f 100644
---- a/sandbox/linux/system_headers/linux_ucontext.h
-+++ b/sandbox/linux/system_headers/linux_ucontext.h
-@@ -11,6 +11,8 @@
- #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
- #elif defined(__i386__)
- #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
-+#elif defined(__powerpc64__)
-+#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
- #else
- #error "No support for your architecture in PNaCl header"
- #endif
-diff --git a/sandbox/linux/system_headers/ppc64_linux_syscalls.h b/sandbox/linux/system_headers/ppc64_linux_syscalls.h
-new file mode 100644
-index 0000000000..ccacffe22e
---- /dev/null
-+++ b/sandbox/linux/system_headers/ppc64_linux_syscalls.h
-@@ -0,0 +1,12 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
-+#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
-+
-+#include <asm/unistd.h>
-+
-+//TODO: is it necessary to redefine syscall numbers for PPC64?
-+
-+#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/ppc64_linux_ucontext.h b/sandbox/linux/system_headers/ppc64_linux_ucontext.h
-new file mode 100644
-index 0000000000..07728e0879
---- /dev/null
-+++ b/sandbox/linux/system_headers/ppc64_linux_ucontext.h
-@@ -0,0 +1,12 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
-+#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
-+
-+#include <sys/ucontext.h>
-+
-+//TODO: is it necessary to redefine ucontext on PPC64?
-+
-+#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
-diff --git a/script/list_patch_targets.py b/script/list_patch_targets.py
-new file mode 100755
-index 0000000000..55173bac99
---- /dev/null
-+++ b/script/list_patch_targets.py
-@@ -0,0 +1,23 @@
-+#!/usr/bin/env python
-+
-+import argparse
-+import json
-+
-+
-+def parse_args():
-+  parser = argparse.ArgumentParser(description='Apply Electron patches')
-+  parser.add_argument('config', nargs='+',
-+                      type=argparse.FileType('r'),
-+                      help='patches\' config(s) in the JSON format')
-+  return parser.parse_args()
-+
-+
-+def main():
-+  configs = parse_args().config
-+  for config_json in configs:
-+    for patch_dir, repo in json.load(config_json).iteritems():
-+      print(repo)
-+
-+
-+if __name__ == '__main__':
-+  main()
-diff --git a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc b/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-index 017f13cf7b..a76e579b7b 100644
---- a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-+++ b/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-@@ -15,6 +15,11 @@
- #include "sandbox/linux/system_headers/linux_syscalls.h"
- #include "services/service_manager/sandbox/linux/sandbox_linux.h"
- 
-+// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
-+#ifdef __powerpc64__
-+#include <termios.h>
-+#endif
-+
- // TODO(vignatti): replace the local definitions below with #include
- // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
- #include <linux/types.h>
-diff --git a/third_party/angle/src/compiler/translator/InfoSink.h b/third_party/angle/src/compiler/translator/InfoSink.h
-index 3a807e1e3d..5258617a7e 100644
---- a/third_party/angle/src/compiler/translator/InfoSink.h
-+++ b/third_party/angle/src/compiler/translator/InfoSink.h
-@@ -92,7 +92,16 @@ class TInfoSinkBase
-             stream.precision(8);
-             stream << f;
-         }
--        sink.append(stream.str());
-+
-+        // Hack to work around a bug where negative floating point values
-+        // are rendered like '.0.5' instead of '-0.5'
-+        std::string res(stream.str());
-+
-+        if (signbit(f)) { // test if f is negative
-+            res[0] = '-';
-+        }
-+
-+        sink.append(res);
-         return *this;
-     }
-     // Write boolean values as their names instead of integral value.
-diff --git a/third_party/angle/src/libANGLE/Constants.h b/third_party/angle/src/libANGLE/Constants.h
-index 5a2f9875d7..47e66f2262 100644
---- a/third_party/angle/src/libANGLE/Constants.h
-+++ b/third_party/angle/src/libANGLE/Constants.h
-@@ -9,6 +9,7 @@
- #ifndef LIBANGLE_CONSTANTS_H_
- #define LIBANGLE_CONSTANTS_H_
- 
-+#include <cstddef>
- #include "common/platform.h"
- 
- #include <stdint.h>
-diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
-index 250ed85424..c75f4e0c21 100644
---- a/third_party/boringssl/BUILD.gn
-+++ b/third_party/boringssl/BUILD.gn
-@@ -103,6 +103,13 @@ if (is_win && !is_msan && current_cpu != "arm64") {
-       } else {
-         public_configs = [ ":no_asm_config" ]
-       }
-+    } else if (current_cpu == "ppc64") {
-+      if (is_linux) {
-+        # TODO: ppc64 (be) check
-+        sources += crypto_sources_linux_ppc64le
-+      } else {
-+        public_configs = [ ":no_asm_config" ]
-+      }
-     } else {
-       public_configs = [ ":no_asm_config" ]
-     }
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
-index 07d9171a0a..9aed4cb369 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
-@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
- typedef MDRawContextARM64_Old RawContextCPU;
- #elif defined(__mips__)
- typedef MDRawContextMIPS RawContextCPU;
-+#elif defined(__powerpc64__)
-+typedef MDRawContextPPC64 RawContextCPU;
- #else
- #error "This code has not been ported to your platform yet."
- #endif
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-index aae1dc13b2..03afec7a58 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-@@ -270,7 +270,42 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
-   out->float_save.fir = mcontext.fpc_eir;
- #endif
- }
--#endif  // __mips__
-+
-+#elif defined(__powerpc64__)
-+
-+uintptr_t ThreadInfo::GetInstructionPointer() const {
-+    return mcontext.gp_regs[PT_NIP];
-+}
-+
-+void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
-+    out->context_flags = MD_CONTEXT_PPC64_FULL;
-+    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
-+        out->gpr[i] = mcontext.gp_regs[i];
-+
-+    out->lr = mcontext.gp_regs[PT_LNK];
-+    out->srr0 = mcontext.gp_regs[PT_NIP];
-+    out->srr1 = mcontext.gp_regs[PT_MSR];
-+    out->cr = mcontext.gp_regs[PT_CCR];
-+    out->xer = mcontext.gp_regs[PT_XER];
-+    out->ctr = mcontext.gp_regs[PT_CTR];
-+    
-+    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
-+        out->float_save.fpregs[i] = mcontext.fp_regs[i];
-+
-+    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
-+
-+    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
-+        out->vector_save.save_vr[i] = \
-+            {(((uint64_t)vregs.vrregs[i][0]) << 32) 
-+                          | vregs.vrregs[i][1], 
-+            (((uint64_t)vregs.vrregs[i][2]) << 32)
-+                         | vregs.vrregs[i][3]};
-+
-+    out->vrsave = vregs.vrsave;
-+    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
-+    out->vector_save.save_vrvalid = 0xFFFFFFFF; 
-+}
-+#endif  // __powerpc64__
- 
- void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
-   assert(gp_regs || size);
-@@ -279,6 +314,11 @@ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
-     *gp_regs = mcontext.gregs;
-   if (size)
-     *size = sizeof(mcontext.gregs);
-+#elif defined(__powerpc64__)
-+  if (gp_regs)
-+    *gp_regs = mcontext.gp_regs;
-+  if (size)
-+    *size = sizeof(mcontext.gp_regs);
- #else
-   if (gp_regs)
-     *gp_regs = &regs;
-@@ -294,6 +334,11 @@ void ThreadInfo::GetFloatingPointRegisters(void** fp_regs, size_t* size) {
-     *fp_regs = &mcontext.fpregs;
-   if (size)
-     *size = sizeof(mcontext.fpregs);
-+#elif defined(__powerpc64__)
-+  if (fp_regs)
-+    *fp_regs = &mcontext.fp_regs;
-+  if (size)
-+    *size = sizeof(mcontext.fp_regs);
- #else
-   if (fp_regs)
-     *fp_regs = &fpregs;
-@@ -302,4 +347,13 @@ void ThreadInfo::GetFloatingPointRegisters(void** fp_regs, size_t* size) {
- #endif
- }
- 
-+#if defined(__powerpc64__)
-+void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
-+    if (v_regs)
-+        *v_regs = &vregs;
-+    if (size)
-+        *size = sizeof(vregs);
-+}
-+#endif
-+
- }  // namespace google_breakpad
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
-index fb216fa6d7..593aac8225 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
-@@ -68,6 +68,10 @@ struct ThreadInfo {
-   // Use the structures defined in <sys/user.h>
-   struct user_regs_struct regs;
-   struct user_fpsimd_struct fpregs;
-+#elif defined(__powerpc64__)
-+  // Use the structures defined in <sys/ucontext.h>.
-+  mcontext_t mcontext;
-+  vrregset_t vregs;
- #elif defined(__mips__)
-   // Use the structure defined in <sys/ucontext.h>.
-   mcontext_t mcontext;
-@@ -84,6 +88,11 @@ struct ThreadInfo {
- 
-   // Returns the pointer and size of float point register area.
-   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
-+
-+#if defined(__powerpc64__)
-+  // Returns the pointer and size of the vector register area. (PPC64 only)
-+  void GetVectorRegisters(void** v_regs, size_t* size);
-+#endif
- };
- 
- }  // namespace google_breakpad
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-index 6ee6cc1e4c..44fee5ba06 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-@@ -254,6 +254,48 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
-   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
- #endif
- }
-+
-+#elif defined(__powerpc64__)
-+
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
-+    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
-+}
-+
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
-+    return uc->uc_mcontext.gp_regs[PT_NIP];
-+}
-+
-+void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
-+                                    const vrregset_t* vregs) {
-+    out->context_flags = MD_CONTEXT_PPC64_FULL;
-+
-+    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
-+        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
-+
-+    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];    
-+    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
-+    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
-+    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
-+    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
-+    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
-+    
-+    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
-+        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
-+
-+    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
-+
-+    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
-+        out->vector_save.save_vr[i] =
-+            {(((uint64_t)vregs->vrregs[i][0]) << 32) 
-+                         | vregs->vrregs[i][1], 
-+             (((uint64_t)vregs->vrregs[i][2]) << 32)
-+                         | vregs->vrregs[i][3]};
-+
-+    out->vrsave = vregs->vrsave;
-+    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
-+    out->vector_save.save_vrvalid = 0xFFFFFFFF; 
-+}
-+
- #endif
- 
- }  // namespace google_breakpad
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-index f830618f24..24d996380f 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-@@ -54,6 +54,9 @@ struct UContextReader {
- #elif defined(__aarch64__)
-   static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                              const struct fpsimd_context* fpregs);
-+#elif defined(__powerpc64__)
-+  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-+                             const vrregset_t* vregs);
- #else
-   static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
- #endif
-diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-index b895f6d7ad..901cd68fbd 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -461,9 +461,16 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
-     memcpy(&g_crash_context_.float_state, fp_ptr,
-            sizeof(g_crash_context_.float_state));
-   }
-+#elif defined(__powerpc64__)
-+  // On PPC64, we must copy VR state
-+  ucontext_t* uc_ptr = (ucontext_t*)uc;
-+  if (uc_ptr->uc_mcontext.v_regs) {
-+    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
-+           sizeof(g_crash_context_.vector_state));
-+  }
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
-   // FP state is not part of user ABI on ARM Linux.
--  // In case of MIPS Linux FP state is already part of ucontext_t
-+  // In case of MIPS, Linux FP state is already part of ucontext_t
-   // and 'float_state' is not a member of CrashContext.
-   ucontext_t* uc_ptr = (ucontext_t*)uc;
-   if (uc_ptr->uc_mcontext.fpregs) {
-@@ -701,11 +708,19 @@ bool ExceptionHandler::WriteMinidump() {
-   }
- #endif
- 
--#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
-+#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
-+    && !defined(__powerpc64__)
-   // FPU state is not part of ARM EABI ucontext_t.
-   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
-          sizeof(context.float_state));
- #endif
-+
-+#if defined(__powerpc64__)
-+  // Vector registers must be copied on PPC64
-+  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
-+         sizeof(context.vector_state));
-+#endif
-+
-   context.tid = sys_gettid();
- 
-   // Add an exception stream to the minidump for better reporting.
-@@ -726,6 +741,9 @@ bool ExceptionHandler::WriteMinidump() {
- #elif defined(__mips__)
-   context.siginfo.si_addr =
-       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
-+#elif defined(__powerpc64__)
-+  context.siginfo.si_addr =
-+      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
- #else
- #error "This code has not been ported to your platform yet."
- #endif
-diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
-index f44483ff0f..36ce6d6ce4 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
-@@ -192,7 +192,11 @@ class ExceptionHandler {
-     siginfo_t siginfo;
-     pid_t tid;  // the crashing thread.
-     ucontext_t context;
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
-+    // state is not, so a struct is needed.
-+    vstate_t vector_state;
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
-     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
-     // In case of MIPS Linux FP state is already part of ucontext_t so
-     // 'float_state' is not required.
-diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
-index bcbf9c26f1..2c36ed41f2 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
-@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChildCrashesDontHang) {
-   }
- 
-   // Wait a while until the child should have crashed.
--  usleep(1000000);
-+  usleep(2000000);
-   // Kill the child if it is still running.
-   kill(child, SIGKILL);
- 
-@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[] = {
- #if defined(__mips__)
-   // mfc2 zero,Impl - usually illegal in userspace.
-   0x48, 0x00, 0x00, 0x48
-+#elif defined(__powerpc64__)
-+  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
- #else
-   // This crashes with SIGILL on x86/x86-64/arm.
-   0xff, 0xff, 0xff, 0xff
-@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryMaxBound) {
- 
-   // These are defined here so the parent can use them to check the
-   // data from the minidump afterwards.
--  // Use 4k here because the OS will hand out a single page even
-+  // Use the page size here because the OS will hand out a single page even
-   // if a smaller size is requested, and this test wants to
-   // test the upper bound of the memory range.
--  const uint32_t kMemorySize = 4096;  // bytes
-+  const uint32_t kMemorySize = getpagesize();  // bytes
-   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
- 
-   const pid_t child = fork();
-diff --git a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-index fa3c1713a5..6ce709e2f0 100644
---- a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-@@ -138,7 +138,9 @@ class MicrodumpWriter {
-                   const MicrodumpExtraInfo& microdump_extra_info,
-                   LinuxDumper* dumper)
-       : ucontext_(context ? &context->context : NULL),
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+        vector_state_(context ? &context->vector_state : NULL),
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
-         float_state_(context ? &context->float_state : NULL),
- #endif
-         dumper_(dumper),
-@@ -337,6 +339,8 @@ class MicrodumpWriter {
- # else
- #  error "This mips ABI is currently not supported (n32)"
- #endif
-+#elif defined(__powerpc64__)
-+    const char kArch[] = "ppc64";
- #else
- #error "This code has not been ported to your platform yet"
- #endif
-@@ -409,7 +413,9 @@ class MicrodumpWriter {
-   void DumpCPUState() {
-     RawContextCPU cpu;
-     my_memset(&cpu, 0, sizeof(RawContextCPU));
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
-     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
- #else
-     UContextReader::FillCPUContext(&cpu, ucontext_);
-@@ -605,7 +611,9 @@ class MicrodumpWriter {
-   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
- 
-   const ucontext_t* const ucontext_;
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+  const google_breakpad::vstate_t* const vector_state_;
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
-   const google_breakpad::fpstate_t* const float_state_;
- #endif
-   LinuxDumper* dumper_;
-diff --git a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
-index c2fea0225e..8c62c524a2 100644
---- a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
-@@ -278,10 +278,19 @@ TEST(MicrodumpWriterTest, BasicWithMappings) {
-   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
-   ASSERT_TRUE(ContainsMicrodump(buf));
- 
-+  int page_size = getpagesize();
- #ifdef __LP64__
--  ASSERT_NE(std::string::npos,
--            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
--                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
-+  // This test is only available for the following page sizes
-+  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
-+  if (page_size == 4096) { 
-+    ASSERT_NE(std::string::npos,
-+              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
-+                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
-+  } else {
-+    ASSERT_NE(std::string::npos,
-+              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
-+                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
-+  }
- #else
-   ASSERT_NE(std::string::npos,
-             buf.find("M 00001000 0000002A 00001000 "
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
-index 4150689839..b93e4afcff 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
-@@ -112,6 +112,9 @@ bool LinuxCoreDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) {
- #elif defined(__mips__)
-   stack_pointer =
-       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
-+#elif defined(__powerpc64__)
-+  stack_pointer =
-+      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
- #else
- #error "This code hasn't been ported to your platform yet."
- #endif
-@@ -197,7 +200,10 @@ bool LinuxCoreDumper::EnumerateThreads() {
-         memset(&info, 0, sizeof(ThreadInfo));
-         info.tgid = status->pr_pgrp;
-         info.ppid = status->pr_ppid;
--#if defined(__mips__)
-+#if defined(__powerpc64__)
-+        for (int i = 0; i < 31; i++)
-+            info.mcontext.gp_regs[i] = status->pr_reg[i];
-+#elif defined(__mips__)
- #if defined(__ANDROID__)
-         for (int i = EF_R0; i <= EF_R31; i++)
-           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
-index dbedecd530..f91f7f9940 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
-@@ -798,7 +798,9 @@ bool LinuxDumper::GetStackInfo(const void** stack, size_t* stack_len,
-       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
- 
-   // The number of bytes of stack which we try to capture.
--  static const ptrdiff_t kStackToCapture = 32 * 1024;
-+  // This now depends on page_size to avoid missing data
-+  // on systems with larger page sizes.
-+  static const ptrdiff_t kStackToCapture = 8 * page_size;
- 
-   const MappingInfo* mapping = FindMapping(stack_pointer);
-   if (!mapping)
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
-index f4a75d9060..020981f57e 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
-@@ -63,7 +63,8 @@ namespace google_breakpad {
-  (defined(__mips__) && _MIPS_SIM == _ABIO32)
- typedef Elf32_auxv_t elf_aux_entry;
- #elif defined(__x86_64) || defined(__aarch64__) || \
--     (defined(__mips__) && _MIPS_SIM != _ABIO32)
-+     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
-+     defined(__powerpc64__)
- typedef Elf64_auxv_t elf_aux_entry;
- #endif
- 
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
-index 3ad48e5015..1688c365ef 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
-@@ -51,6 +51,8 @@
- #define TID_PTR_REGISTER "rcx"
- #elif defined(__mips__)
- #define TID_PTR_REGISTER "$1"
-+#elif defined(__powerpc64__)
-+#define TID_PTR_REGISTER "r8"
- #else
- #error This test has not been ported to this platform.
- #endif
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
-index e3ddb81a65..fa28575ef5 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
-@@ -149,19 +149,27 @@ bool LinuxPtraceDumper::CopyFromProcess(void* dest, pid_t child,
-   return true;
- }
- 
--bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
--{
-+bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
- #ifdef PTRACE_GETREGSET
-   struct iovec io;
-   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
--  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
-+  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
-     return false;
-   }
- 
-   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
--  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
-+  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
-     return false;
-   }
-+
-+#if defined(__powerpc64__)
-+  // Grab the vector registers on PPC64 too
-+  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
-+  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
-+    return false;
-+  }
-+#endif // defined(__powerpc64__)
-+
-   return true;
- #else
-   return false;
-@@ -298,6 +306,9 @@ bool LinuxPtraceDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) {
- #elif defined(__mips__)
-   stack_pointer =
-       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
-+#elif defined(__powerpc64__)
-+  stack_pointer =
-+      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
- #else
- #error "This code hasn't been ported to your platform yet."
- #endif
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
-index a41dafce04..31743940de 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
-@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackReadWithMultipleThreads) {
- #elif defined(__mips__)
-     pid_t* process_tid_location =
-         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
-+#elif defined(__powerpc64__)
-+    pid_t* process_tid_location =
-+        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
- #else
- #error This test has not been ported to this platform.
- #endif
-@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeStackCopy) {
-   uintptr_t heap_addr = thread_info.regs.rcx;
- #elif defined(__mips__)
-   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
-+#elif defined(__powerpc64__)
-+  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
- #else
- #error This test has not been ported to this platform.
- #endif
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-index f8cdf2a1c6..cb808c151f 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-@@ -136,7 +136,9 @@ class MinidumpWriter {
-       : fd_(minidump_fd),
-         path_(minidump_path),
-         ucontext_(context ? &context->context : NULL),
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+        vector_state_(context ? &context->vector_state : NULL),
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
-         float_state_(context ? &context->float_state : NULL),
- #endif
-         dumper_(dumper),
-@@ -468,7 +470,9 @@ class MinidumpWriter {
-         if (!cpu.Allocate())
-           return false;
-         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
-         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
- #else
-         UContextReader::FillCPUContext(cpu.get(), ucontext_);
-@@ -897,7 +901,7 @@ class MinidumpWriter {
-     dirent->location.rva = 0;
-   }
- 
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
-   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
-     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
-     static const char vendor_id_name[] = "vendor_id";
-@@ -917,7 +921,9 @@ class MinidumpWriter {
- 
-     // processor_architecture should always be set, do this first
-     sys_info->processor_architecture =
--#if defined(__mips__)
-+#if defined(__powerpc64__)
-+        MD_CPU_ARCHITECTURE_PPC64;
-+#elif defined(__mips__)
- # if _MIPS_SIM == _ABIO32
-         MD_CPU_ARCHITECTURE_MIPS;
- # elif _MIPS_SIM == _ABI64
-@@ -1333,7 +1339,9 @@ class MinidumpWriter {
-   const char* path_;  // Path to the file where the minidum should be written.
- 
-   const ucontext_t* const ucontext_;  // also from the signal handler
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+  const google_breakpad::vstate_t* const vector_state_;
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
-   const google_breakpad::fpstate_t* const float_state_;  // ditto
- #endif
-   LinuxDumper* dumper_;
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-index d1dc331215..c344621df1 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-@@ -47,6 +47,8 @@ class ExceptionHandler;
- 
- #if defined(__aarch64__)
- typedef struct fpsimd_context fpstate_t;
-+#elif defined(__powerpc64__)
-+typedef vrregset_t vstate_t;
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
- typedef struct _libc_fpstate fpstate_t;
- #endif
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
-index c951e69d8f..e1d6e40d67 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
-@@ -714,6 +714,9 @@ TEST(MinidumpWriterTest, InvalidStackPointer) {
- #elif defined(__mips__)
-   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
-       invalid_stack_pointer;
-+#elif defined(__powerpc64__)
-+  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
-+      invalid_stack_pointer;
- #else
- # error "This code has not been ported to your platform yet."
- #endif
-diff --git a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
-index 4e938269f2..f0ff15d967 100644
---- a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
-+++ b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
-@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* path, size_t offset) {
-   }
- 
- #if defined(__x86_64__) || defined(__aarch64__) || \
--   (defined(__mips__) && _MIPS_SIM == _ABI64)
--
-+   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
-   struct kernel_stat st;
-   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
- #else
-diff --git a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
-index fad59f40cd..616496d672 100644
---- a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
-@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterMap) {
- TEST_F(MemoryMappedFileTest, MapWithOffset) {
-   // Put more data in the test file this time. Offsets can only be
-   // done on page boundaries, so we need a two page file to test this.
--  const int page_size = 4096;
--  char data1[2 * page_size];
--  size_t data1_size = sizeof(data1);
-+  const int page_size = getpagesize();
-+  char *data1 = static_cast<char*>(malloc(2 * page_size));
-+  EXPECT_TRUE(data1 != NULL);
-+  size_t data1_size = (2 * page_size);
-   for (size_t i = 0; i < data1_size; ++i) {
-     data1[i] = i & 0x7f;
-   }
-diff --git a/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc b/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
-index ccc9f1459c..debaed4d6e 100644
---- a/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
-+++ b/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
-@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegalWrite(uint64_t instruction_ptr) {
-   // Check architecture and set architecture variable to corresponding flag
-   // in objdump.
-   switch (context->GetContextCPU()) {
-+#if defined(__i386) || defined(__x86_64)
-     case MD_CONTEXT_X86:
-       architecture = "i386";
-       break;
-     case MD_CONTEXT_AMD64:
-       architecture = "i386:x86-64";
-       break;
-+#endif
-     default:
-       // Unsupported architecture. Note that ARM architectures are not
-       // supported because objdump does not support ARM.
-diff --git a/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc b/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
-index 528ee5f213..72764d6c1e 100644
---- a/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
-@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename) {
- }
- 
- TEST(ExploitabilityTest, TestWindowsEngine) {
-+// The following tests are only executable on an x86-class linux machine.
-+#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-             ExploitabilityFor("ascii_read_av.dmp"));
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngine) {
-             ExploitabilityFor("read_av_clobber_write.dmp"));
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
-             ExploitabilityFor("read_av_conditional.dmp"));
-+#endif
- }
- 
- TEST(ExploitabilityTest, TestLinuxEngine) {
-+// The following tests are only executable on an x86-class linux machine.
-+#if defined(__i386) || defined(__x86_64)
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
-             ExploitabilityFor("linux_null_read_av.dmp"));
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine) {
-             ExploitabilityFor("linux_executable_heap.dmp"));
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
--#ifndef _WIN32
-+#endif
-+#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine) {
-             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
-             ExploitabilityFor("linux_write_to_under_4k.dmp"));
--#endif  // _WIN32
-+#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
- }
- 
--#ifndef _WIN32
-+#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
- TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
-   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
-   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
-@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, CalculateAddressTest) {
-                                                          context,
-                                                          &write_address));
- }
--#endif  // _WIN32
-+#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
-+
- 
- }  // namespace
-diff --git a/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc b/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
-index 941586e9f6..49cdc3fc28 100644
---- a/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
-+++ b/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
-@@ -76,6 +76,8 @@
-   #define ELF_ARCH  EM_MIPS
- #elif defined(__aarch64__)
-   #define ELF_ARCH  EM_AARCH64
-+#elif defined(__powerpc64__)
-+  #define ELF_ARCH  EM_PPC64
- #endif
- 
- #if defined(__arm__)
-@@ -86,6 +88,8 @@ typedef user_regs user_regs_struct;
- #elif defined (__mips__)
- // This file-local typedef simplifies the source code.
- typedef gregset_t user_regs_struct;
-+#elif defined(__powerpc64__)
-+typedef struct pt_regs user_regs_struct;
- #endif
- 
- using google_breakpad::MDTypeHelper;
-@@ -320,6 +324,9 @@ struct CrashedProcess {
- #endif
- #if defined(__aarch64__)
-     user_fpsimd_struct fpregs;
-+#endif
-+#if defined(__powerpc64__)
-+    mcontext_t mcontext;
- #endif
-     uintptr_t stack_addr;
-     const uint8_t* stack;
-@@ -534,6 +541,38 @@ ParseThreadRegisters(CrashedProcess::Thread* thread,
-   thread->mcontext.fpc_eir = rawregs->float_save.fir;
- #endif
- }
-+#elif defined(__powerpc64__)
-+static void
-+ParseThreadRegisters(CrashedProcess::Thread* thread,
-+                     const MinidumpMemoryRange& range) {
-+  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
-+
-+  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
-+    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
-+
-+  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
-+  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
-+  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
-+  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
-+  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
-+  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
-+  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
-+
-+  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
-+      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
-+
-+  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
-+
-+  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
-+      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
-+      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
-+      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
-+      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
-+  }
-+
-+  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
-+}
-+
- #else
- #error "This code has not been ported to your platform yet"
- #endif
-@@ -622,6 +661,12 @@ ParseSystemInfo(const Options& options, CrashedProcess* crashinfo,
- # else
- #  error "This mips ABI is currently not supported (n32)"
- # endif
-+#elif defined(__powerpc64__)
-+  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
-+    fprintf(stderr,
-+            "This version of minidump-2-core only supports PPC64.\n");
-+    exit(1);
-+  }
- #else
- #error "This code has not been ported to your platform yet"
- #endif
-diff --git a/third_party/crashpad/crashpad/CONTRIBUTORS b/third_party/crashpad/crashpad/CONTRIBUTORS
-index 8724b7f32f..8e29424ef6 100644
---- a/third_party/crashpad/crashpad/CONTRIBUTORS
-+++ b/third_party/crashpad/crashpad/CONTRIBUTORS
-@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
- Robert Sesek <rsesek@chromium.org>
- Scott Graham <scottmg@chromium.org>
- Joshua Peraza <jperaza@chromium.org>
-+Shawn Anastasio <shawn@anastas.io>
-diff --git a/third_party/crashpad/crashpad/compat/linux/sys/user.h b/third_party/crashpad/crashpad/compat/linux/sys/user.h
-index 6ed77a98e1..1fd83469a0 100644
---- a/third_party/crashpad/crashpad/compat/linux/sys/user.h
-+++ b/third_party/crashpad/crashpad/compat/linux/sys/user.h
-@@ -15,6 +15,7 @@
- #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
- #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
- 
-+#include <cstddef>
- #include_next <sys/user.h>
- 
- #include <features.h>
-diff --git a/third_party/crashpad/crashpad/minidump/minidump_context.h b/third_party/crashpad/crashpad/minidump/minidump_context.h
-index 3a3e603cb0..3118d9e9f9 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_context.h
-+++ b/third_party/crashpad/crashpad/minidump/minidump_context.h
-@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
-   uint64_t fir;
- };
- 
-+//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
-+//! Based on minidump_cpu_ppc64.h from breakpad
-+enum MinidumpContextPPC64Flags : uint32_t {
-+  //! \brief Identifies the context as PPC64.
-+  kMinidumpContextPPC64 = 0x01000000,
-+
-+  //! \brief Indicates the validity of general purpose registers.
-+  //!
-+  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
-+  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
-+
-+  //! \brief Indicates the validity of floating point registers.
-+  //!
-+  //! Registers `fp0`-`fp31`, `fpscr` are valid.
-+  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
-+
-+  //! \brief Indicates the validity of Altivec/VMX registers.
-+  //!
-+  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
-+  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
-+
-+  //! \brief Indicates the validity of all registers
-+  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
-+                             kMinidumpContextPPC64Floating |
-+                             kMinidumpContextPPC64Vector
-+};
-+
-+//! \brief A PPC64 CPU context carried in a minidump file.
-+//! Based on minidump_cpu_ppc64.h from breakpad.
-+struct MinidumpContextPPC64 {
-+  uint64_t context_flags;
-+
-+  //! \brief General purpose registers.
-+  uint64_t nip;
-+  uint64_t msr;
-+  uint64_t regs[32];
-+  uint64_t ccr;
-+  uint64_t xer;
-+  uint64_t lnk;
-+  uint64_t ctr;
-+
-+  //! \brief Floating point registers.
-+  double fpregs[32];
-+
-+  //! \brief FPU status register.
-+  double fpscr;
-+
-+  //! \brief Altivec/VMX vector registers.
-+  struct {
-+      //! \brief Vector registers are 128bits.
-+      uint128_struct save_vr[32];
-+      uint128_struct save_vscr;
-+
-+      //! \brief Padding included for breakpad compatibiltiy.
-+      uint32_t save_pad5[4];
-+
-+      //! \brief VRSAVE register.
-+      uint32_t save_vrsave;
-+
-+      //! \brief Padding included for breakpad compatibiltiy.
-+      uint32_t save_pad6[7];
-+  } vregs;
-+};
-+
- }  // namespace crashpad
- 
- #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
-diff --git a/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc b/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
-index d7e53a4932..d89eb9e013 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
-+++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
-@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapshot(const CPUContext* context_snapshot) {
-       break;
-     }
- 
-+    case kCPUArchitecturePPC64: {
-+      context = std::make_unique<MinidumpContextPPC64Writer>();
-+      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
-+          ->InitalizeFromSnapshot(context_snapshot->ppc64);
-+      break;
-+    }
-+
-     default: {
-       LOG(ERROR) << "unknown context architecture "
-                  << context_snapshot->architecture;
-@@ -453,4 +460,47 @@ size_t MinidumpContextMIPS64Writer::ContextSize() const {
-   return sizeof(context_);
- }
- 
-+MinidumpContextPPC64Writer::MinidumpContextPPC64Writer()
-+  : MinidumpContextWriter(), context_() {
-+    context_.context_flags = kMinidumpContextPPC64;
-+}
-+
-+MinidumpContextPPC64Writer::~MinidumpContextPPC64Writer() = default;
-+
-+void MinidumpContextPPC64Writer::InitalizeFromSnapshot(
-+    const CPUContextPPC64* context_snapshot) {
-+  DCHECK_EQ(state(), kStateMutable);
-+  DCHECK_EQ(context_.context_flags, kMinidumpContextPPC64);
-+
-+  context_.context_flags = kMinidumpContextPPC64All;
-+
-+  memcpy(context_.regs, context_snapshot->regs, sizeof(context_.regs));
-+  context_.nip = context_snapshot->nip;
-+  context_.msr = context_snapshot->msr;
-+  context_.ccr = context_snapshot->ccr;
-+  context_.xer = context_snapshot->xer;
-+  context_.lnk = context_snapshot->lnk;
-+  context_.ctr = context_snapshot->ctr;
-+
-+  memcpy(context_.fpregs, context_snapshot->fpregs, sizeof(context_.fpregs));
-+  context_.fpscr = context_snapshot->fpscr;
-+
-+  memcpy(context_.vregs.save_vr, context_snapshot->vregs.save_vr,
-+         sizeof(context_.vregs.save_vr));
-+  memcpy(&context_.vregs.save_vscr, &context_snapshot->vregs.save_vscr,
-+         sizeof(context_.vregs.save_vscr));
-+  context_.vregs.save_vrsave = context_snapshot->vregs.save_vrsave;
-+}
-+
-+bool MinidumpContextPPC64Writer::WriteObject(
-+    FileWriterInterface* file_writer) {
-+  DCHECK_EQ(state(), kStateWritable);
-+  return file_writer->Write(&context_, sizeof(context_));
-+}
-+
-+size_t MinidumpContextPPC64Writer::ContextSize() const {
-+  DCHECK_GE(state(), kStateFrozen);
-+  return sizeof(context_);
-+}
-+
- }  // namespace crashpad
-diff --git a/third_party/crashpad/crashpad/minidump/minidump_context_writer.h b/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
-index d4ab936ee7..1d22fc59c9 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
-+++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
-@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final : public MinidumpContextWriter {
-   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
- };
- 
-+class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
-+ public:
-+  MinidumpContextPPC64Writer();
-+  ~MinidumpContextPPC64Writer() override;
-+
-+  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
-+  //!
-+  //! \param[in] context_snapshot The context snapshot to use as source data.
-+  //!
-+  //! \note Valid in #kStateMutable. No mutation of context() may be done before
-+  //!     calling this method, and it is not normally necessary to alter
-+  //!     context() after calling this method.
-+  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
-+
-+  //! \brief Returns a pointer to the context structure that this object will
-+  //!     write.
-+  //!
-+  //! \attention This returns a non-`const` pointer to this object’s private
-+  //!     data so that a caller can populate the context structure directly.
-+  //!     This is done because providing setter interfaces to each field in the
-+  //!     context structure would be unwieldy and cumbersome. Care must be taken
-+  //!     to populate the context structure correctly. The context structure
-+  //!     must only be modified while this object is in the #kStateMutable
-+  //!     state.
-+  MinidumpContextPPC64* context() { return &context_; }
-+
-+ protected:
-+  // MinidumpWritable:
-+  bool WriteObject(FileWriterInterface* file_writer) override;
-+
-+  // MinidumpContextWriter:
-+  size_t ContextSize() const override;
-+
-+ private:
-+  MinidumpContextPPC64 context_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
-+};
-+
- }  // namespace crashpad
- 
- #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
-diff --git a/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
-index 3216a906ba..a9fcbe9d8e 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
-+++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
-@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromSnapshot) {
-       context, ExpectMinidumpContextMIPS64, kSeed);
- }
- 
-+TEST(MinidumpContextWriter, PPC64_Zeros) {
-+  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
-+    ExpectMinidumpContextPPC64);
-+}
-+
-+TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
-+  constexpr uint32_t kSeed = 64;
-+  CPUContextPPC64 context_ppc64;
-+  CPUContext context;
-+  context.ppc64 = &context_ppc64;
-+  InitializeCPUContextPPC64(&context, kSeed);
-+  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
-+      context, ExpectMinidumpContextPPC64, kSeed);
-+}
-+
- }  // namespace
- }  // namespace test
- }  // namespace crashpad
-diff --git a/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc b/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-index a13407605f..95dc925240 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-+++ b/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-@@ -126,6 +126,8 @@ std::string MinidumpMiscInfoDebugBuildString() {
-   static constexpr char kCPU[] = "mips";
- #elif defined(ARCH_CPU_MIPS64EL)
-   static constexpr char kCPU[] = "mips64";
-+#elif defined(ARCH_CPU_PPC64)
-+  static constexpr char kCPU[] = "ppc64";
- #else
- #error define kCPU for this CPU
- #endif
-diff --git a/third_party/crashpad/crashpad/snapshot/capture_memory.cc b/third_party/crashpad/crashpad/snapshot/capture_memory.cc
-index a51626ccdc..61e0b20a17 100644
---- a/third_party/crashpad/crashpad/snapshot/capture_memory.cc
-+++ b/third_party/crashpad/crashpad/snapshot/capture_memory.cc
-@@ -111,6 +111,11 @@ void CaptureMemory::PointedToByContext(const CPUContext& context,
-   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
-     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
-   }
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
-+  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
-+    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
-+  }
- #else
- #error Port.
- #endif
-diff --git a/third_party/crashpad/crashpad/snapshot/cpu_architecture.h b/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
-index 811a720958..f4f83981df 100644
---- a/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
-+++ b/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
-@@ -43,7 +43,10 @@ enum CPUArchitecture {
-   kCPUArchitectureMIPSEL,
- 
-   //! \brief 64-bit MIPSEL.
--  kCPUArchitectureMIPS64EL
-+  kCPUArchitectureMIPS64EL,
-+
-+  //! \brief 64-bit PPC64.
-+  kCPUArchitecturePPC64
- };
- 
- }  // namespace crashpad
-diff --git a/third_party/crashpad/crashpad/snapshot/cpu_context.cc b/third_party/crashpad/crashpad/snapshot/cpu_context.cc
-index 6fb8d7e719..b01f7cad11 100644
---- a/third_party/crashpad/crashpad/snapshot/cpu_context.cc
-+++ b/third_party/crashpad/crashpad/snapshot/cpu_context.cc
-@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer() const {
-       return arm->pc;
-     case kCPUArchitectureARM64:
-       return arm64->pc;
-+    case kCPUArchitecturePPC64:
-+      return ppc64->nip;
-     default:
-       NOTREACHED();
-       return ~0ull;
-@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() const {
-       return arm->sp;
-     case kCPUArchitectureARM64:
-       return arm64->sp;
-+    case kCPUArchitecturePPC64:
-+      return ppc64->regs[1];
-     default:
-       NOTREACHED();
-       return ~0ull;
-@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
-     case kCPUArchitectureX86_64:
-     case kCPUArchitectureARM64:
-     case kCPUArchitectureMIPS64EL:
-+    case kCPUArchitecturePPC64:
-       return true;
-     case kCPUArchitectureX86:
-     case kCPUArchitectureARM:
-diff --git a/third_party/crashpad/crashpad/snapshot/cpu_context.h b/third_party/crashpad/crashpad/snapshot/cpu_context.h
-index fb23c4679f..eebede63c6 100644
---- a/third_party/crashpad/crashpad/snapshot/cpu_context.h
-+++ b/third_party/crashpad/crashpad/snapshot/cpu_context.h
-@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
-   uint64_t fir;
- };
- 
-+//! \brief A context structure carrying PPC64 CPU state.
-+struct CPUContextPPC64 {
-+  uint64_t nip;
-+  uint64_t msr;
-+  uint64_t regs[32];
-+  uint64_t ccr;
-+  uint64_t xer;
-+  uint64_t lnk;
-+  uint64_t ctr;
-+  double fpregs[32];
-+  double fpscr;
-+  struct {
-+    uint128_struct save_vr[32];
-+    uint128_struct save_vscr;
-+    uint32_t save_vrsave;
-+  } vregs;
-+};
-+
- //! \brief A context structure capable of carrying the context of any supported
- //!     CPU architecture.
- struct CPUContext {
-@@ -382,6 +400,7 @@ struct CPUContext {
-     CPUContextARM64* arm64;
-     CPUContextMIPS* mipsel;
-     CPUContextMIPS64* mips64;
-+    CPUContextPPC64* ppc64;
-   };
- };
- 
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h b/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
-index 37fbc4325c..cf4ef7ef96 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
-@@ -15,6 +15,7 @@
- #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
- #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
- 
-+#include <cstring>
- #include "build/build_config.h"
- #include "snapshot/cpu_context.h"
- #include "snapshot/linux/signal_context.h"
-@@ -174,6 +175,78 @@ void InitializeCPUContextMIPS(
- 
- #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
- 
-+#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
-+
-+//! \brief Initalizes a CPUContextPPC64 structure from native context
-+//!     structures on Linux.
-+//!
-+//! \param[in] thread_context The native thread context.
-+//! \param[in] float_context The native float context.
-+//! \param[in] vector_context The native vector context.
-+//! \param[out] context The CPUContextPPC64 structure to initalize.
-+template <typename Traits>
-+void InitializeCPUContextPPC64(
-+    const ThreadContext::t64_t& thread_context,
-+    const FloatContext::f64_t& float_context,
-+    const VectorContext::v64_t& vector_context,
-+    typename Traits::CPUContext* context) {
-+
-+  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
-+  context->nip = thread_context.nip;
-+  context->msr = thread_context.msr;
-+  context->ccr = thread_context.ccr;
-+  context->xer = thread_context.xer;
-+  context->lnk = thread_context.lnk;
-+  context->ctr = thread_context.ctr;
-+
-+  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
-+  context->fpscr = float_context.fpscr;
-+
-+  for (uint8_t i = 0; i < 32; i++) {
-+    context->vregs.save_vr[i] = {
-+      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
-+        vector_context.vrregs[i][1],
-+      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
-+        vector_context.vrregs[i][3]
-+    };
-+  }
-+  context->vregs.save_vrsave = vector_context.vrsave;
-+  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
-+}
-+
-+template <typename Traits>
-+void InitializeCPUContextPPC64(
-+    const SignalThreadContext64 &thread_context,
-+    const SignalFloatContext64 &float_context,
-+    const SignalVectorContext64 &vector_context,
-+    typename Traits::CPUContext* context) {
-+
-+  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
-+  context->nip = thread_context.nip;
-+  context->msr = thread_context.msr;
-+  context->ccr = thread_context.ccr;
-+  context->xer = thread_context.xer;
-+  context->lnk = thread_context.lnk;
-+  context->ctr = thread_context.ctr;
-+
-+  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
-+  context->fpscr = float_context.fpscr;
-+
-+  for (uint8_t i = 0; i < 32; i++) {
-+    context->vregs.save_vr[i] = {
-+      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
-+        vector_context.vrregs[i][1],
-+      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
-+        vector_context.vrregs[i][3]
-+    };
-+  }
-+  context->vregs.save_vrsave = vector_context.vrsave;
-+  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
-+}
-+
-+
-+#endif
-+
- }  // namespace internal
- }  // namespace crashpad
- 
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc b/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
-index be22c90313..c5df23d1b4 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
-@@ -159,9 +159,11 @@ void TestAgainstTarget(PtraceConnection* connection) {
-           const bool is_vdso_mapping =
-               device == 0 && inode == 0 && mapping_name == "[vdso]";
-           static constexpr char kPrefix[] = "linux-vdso.so.";
-+          static constexpr char kPrefix64[] = "linux-vdso64.so.";
-           return is_vdso_mapping ==
-                  (module_name.empty() ||
--                  module_name.compare(0, strlen(kPrefix), kPrefix) == 0);
-+                  module_name.compare(0, strlen(kPrefix), kPrefix) == 0 ||
-+                  module_name.compare(0, strlen(kPrefix64), kPrefix64) == 0);
-         },
-         module_mapping->name,
-         module_mapping->device,
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
-index cd40b3b12d..6bcf23b6ff 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
-@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
-       reader, context_address, context_.mips64);
- }
- 
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+
-+template <typename Traits>
-+static bool ReadContext(ProcessReaderLinux* reader,
-+                        LinuxVMAddress context_address,
-+                        typename Traits::CPUContext* dest_context) {
-+  const ProcessMemory* memory = reader->Memory();
-+
-+  LinuxVMAddress gp_regs_address = context_address +
-+                                   offsetof(UContext, mcontext) +
-+                                   offsetof(typename Traits::MContext, gp_regs);
-+
-+  typename Traits::SignalThreadContext thread_context;
-+  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
-+    LOG(ERROR) << "Couldn't read gp_regs!";
-+    return false;
-+  }
-+
-+  LinuxVMAddress fp_regs_address = context_address +
-+                                   offsetof(UContext, mcontext) +
-+                                   offsetof(typename Traits::MContext, fp_regs);
-+
-+  typename Traits::SignalFloatContext fp_context;
-+  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
-+    LOG(ERROR) << "Couldn't read fp_regs!";
-+    return false;
-+  }
-+
-+  LinuxVMAddress v_regs_ptr_address = context_address +
-+                                  offsetof(UContext, mcontext) +
-+                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
-+
-+  typename Traits::SignalVectorContext v_context;
-+  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
-+    LOG(ERROR) << "Couldn't read v_regs!";
-+    return false;
-+  }
-+
-+  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
-+                            v_context, dest_context);
-+
-+  return true;
-+}
-+
-+template<>
-+bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
-+    ProcessReaderLinux* reader,
-+    LinuxVMAddress context_address) {
-+  context_.architecture = kCPUArchitecturePPC64;
-+  context_.ppc64 = &context_union_.ppc64;
-+
-+  return internal::ReadContext<ContextTraits64>(
-+      reader, context_address, context_.ppc64);
-+}
-+
-+template<>
-+bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
-+    ProcessReaderLinux* reader,
-+    LinuxVMAddress context_address) {
-+  // PPC64 is 64-bit
-+  return false;
-+}
-+
- #endif  // ARCH_CPU_X86_FAMILY
- 
- bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
-index ea0cd21066..e42df520ff 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
-@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : public ExceptionSnapshot {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-     CPUContextMIPS mipsel;
-     CPUContextMIPS64 mips64;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+    CPUContextPPC64 ppc64;
- #endif
-   } context_union_;
-   CPUContext context_;
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
-index e4ff1ab79f..25534dd087 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
-@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
-             0);
- #undef CPU_ARCH_NAME
- }
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+using NativeCPUContext = ucontext_t;
-+
-+void InitializeContext(NativeCPUContext* context) {
-+  for (size_t reg = 0; reg < 32; ++reg) {
-+    context->uc_mcontext.gp_regs[reg] = reg;
-+  }
-+
-+  memset(&context->uc_mcontext.fp_regs, 44,
-+      sizeof(context->uc_mcontext.fp_regs));
-+}
- 
-+void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
-+  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
-+
-+  for (size_t reg = 0; reg < 32; ++reg) {
-+    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
-+  }
-+
-+  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
-+            sizeof(actual.ppc64->fpregs)), 0);
-+}
- #else
- #error Port.
- #endif
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
-index b96abfe74f..df12ca5669 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
-@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::InitializeStack(ProcessReaderLinux* reader) {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
-                                     : thread_info.thread_context.t32.regs[29];
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  stack_pointer = thread_info.thread_context.t64.gpr[1];
- #else
- #error Port.
- #endif
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
-index d767700205..40ad41d74f 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
-@@ -613,6 +613,8 @@ bool WriteTestModule(const base::FilePath& module_path) {
-   module.ehdr.e_machine = EM_AARCH64;
- #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
-   module.ehdr.e_machine = EM_MIPS;
-+#elif defined(ARCH_CPU_PPC64)
-+  module.ehdr.e_machine = EM_PPC64;
- #endif
- 
-   module.ehdr.e_version = EV_CURRENT;
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h b/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-index 110024680b..a1f2da2591 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-@@ -422,6 +422,89 @@ static_assert(offsetof(UContext<ContextTraits64>, mcontext.fpregs) ==
-               "context offset mismatch");
- #endif
- 
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+
-+struct SignalThreadContext64 {
-+  uint64_t regs[32];
-+  uint64_t nip;
-+  uint64_t msr;
-+  uint64_t orig_r3;
-+  uint64_t ctr;
-+  uint64_t lnk;
-+  uint64_t xer;
-+  uint64_t ccr;
-+  uint64_t softe;
-+  uint64_t trap;
-+  uint64_t dar;
-+  uint64_t dsisr;
-+  uint64_t result;
-+  uint64_t dscr;
-+  uint64_t fpr0[3];
-+};
-+
-+struct SignalFloatContext64 {
-+  double regs[32];
-+  double fpscr;
-+};
-+
-+struct SignalVectorContext64 {
-+  int32_t vrregs[32][4];
-+  struct {
-+    int32_t __pad[3];
-+    int32_t vscr_word;
-+  } vscr;
-+  int32_t vrsave;
-+  int32_t __pad[3];
-+} __attribute__((__aligned__(16)));
-+
-+
-+#pragma pack(pop)
-+struct MContext64 {
-+  uint64_t reserved[4];
-+  int32_t signal;
-+  int32_t __pad0;
-+  uint64_t handler;
-+  uint64_t oldmask;
-+  uint64_t pt_regs_ptr;
-+  SignalThreadContext64 gp_regs;
-+  SignalFloatContext64  fp_regs;
-+  SignalVectorContext64 *v_regs;
-+  int64_t vmx_reserve[69];
-+};
-+
-+struct ContextTraits64 : public Traits64 {
-+  using MContext = MContext64;
-+  using SignalThreadContext = SignalThreadContext64;
-+  using SignalFloatContext = SignalFloatContext64;
-+  using SignalVectorContext = SignalVectorContext64;
-+  using CPUContext = CPUContextPPC64;
-+};
-+
-+struct ContextTraits32 : public Traits32 {};
-+
-+struct UContext {
-+  uint64_t flags;
-+  uint64_t link;
-+  SignalStack<ContextTraits64> stack;
-+  Sigset<ContextTraits64> sigmask;
-+  MContext64 mcontext;
-+};
-+#pragma pack(push, 1)
-+
-+static_assert(sizeof(UContext) == sizeof(ucontext_t),
-+              "ucontext_t size mismatch");
-+static_assert(sizeof(MContext64) == sizeof(mcontext_t),
-+              "mcontext_t size mismatch");
-+static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
-+              "gregset_t size mismatch");
-+static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
-+              "fpregset_t size mismatch");
-+static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
-+              "vrregset_t size mismatch");
-+static_assert(offsetof(UContext, mcontext) ==
-+              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
-+static_assert(offsetof(MContext64, gp_regs) ==
-+              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc b/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
-index 8564d3d455..b690ecd48f 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
-@@ -203,6 +203,8 @@ CPUArchitecture SystemSnapshotLinux::GetCPUArchitecture() const {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
-                                     : kCPUArchitectureMIPSEL;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  return kCPUArchitecturePPC64;
- #else
- #error port to your architecture
- #endif
-@@ -218,6 +220,9 @@ uint32_t SystemSnapshotLinux::CPURevision() const {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-   // Not implementable on MIPS
-   return 0;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  // Not yet implemented on PPC64
-+  return 0;
- #else
- #error port to your architecture
- #endif
-@@ -238,6 +243,9 @@ std::string SystemSnapshotLinux::CPUVendor() const {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-   // Not implementable on MIPS
-   return std::string();
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  // Not yet implemented on PPC64
-+  return std::string();
- #else
- #error port to your architecture
- #endif
-@@ -371,6 +379,9 @@ bool SystemSnapshotLinux::NXEnabled() const {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-   // Not implementable on MIPS
-   return false;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  // Not yet implemented on PPC64
-+  return false;
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
-index e3e2bebddb..8ef43752eb 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
-@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
-         thread.thread_info.float_context.f32,
-         context_.mipsel);
-   }
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  context_.architecture = kCPUArchitecturePPC64;
-+  context_.ppc64 = &context_union_.ppc64;
-+  InitializeCPUContextPPC64<ContextTraits64>(
-+      thread.thread_info.thread_context.t64,
-+      thread.thread_info.float_context.f64,
-+      thread.thread_info.vector_context.v64,
-+      context_.ppc64);
- #else
- #error Port.
- #endif
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
-index 44cc6f6d97..d4136461e2 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
-@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public ThreadSnapshot {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-     CPUContextMIPS mipsel;
-     CPUContextMIPS64 mips64;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+    CPUContextPPC64 ppc64;
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY
-diff --git a/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc b/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
-index d3d5ebdfb9..3fd730cb52 100644
---- a/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
-+++ b/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
-@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnection* connection) {
-     if (type == AT_IGNORE) {
-       continue;
-     }
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+    if (type == AT_IGNOREPPC) {
-+      continue;
-+    }
-+#endif
-     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
-       LOG(ERROR) << "duplicate auxv entry";
-       return false;
-diff --git a/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc b/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
-index 155a1e0c6f..5e50ceb5f8 100644
---- a/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
-+++ b/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
-@@ -94,8 +94,8 @@ int PtraceBroker::Run() {
- }
- 
- bool PtraceBroker::AllocateAttachments() {
--  constexpr size_t page_size = 4096;
--  constexpr size_t alloc_size =
-+  static size_t page_size = getpagesize();
-+  size_t alloc_size =
-       (sizeof(ScopedPtraceAttach) + page_size - 1) & ~(page_size - 1);
-   void* alloc = sbrk(alloc_size);
-   if (reinterpret_cast<intptr_t>(alloc) == -1) {
-diff --git a/third_party/crashpad/crashpad/util/linux/ptracer.cc b/third_party/crashpad/crashpad/util/linux/ptracer.cc
-index c6c9229946..c770b6b6fe 100644
---- a/third_party/crashpad/crashpad/util/linux/ptracer.cc
-+++ b/third_party/crashpad/crashpad/util/linux/ptracer.cc
-@@ -394,6 +394,64 @@ bool GetThreadArea64(pid_t tid,
-   return true;
- }
- 
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
-+// That means we can simply use PTRACE_GETREGESET.
-+
-+template <typename Destination>
-+bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
-+  iovec iov;
-+  iov.iov_base = reinterpret_cast<void*>(dest);
-+  iov.iov_len = sizeof(*dest);
-+  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
-+    PLOG_IF(ERROR, can_log) << "ptrace";
-+    return false;
-+  }
-+  if (iov.iov_len != sizeof(*dest)) {
-+    LOG_IF(ERROR, can_log) << "Unexpected registers size";
-+    return false;
-+  }
-+  return true;
-+}
-+
-+bool GetVectorRegisters64(pid_t tid,
-+                          VectorContext* context,
-+                          bool can_log) {
-+  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
-+}
-+
-+bool GetFloatingPointRegisters64(pid_t tid,
-+                                 FloatContext* context,
-+                                 bool can_log) {
-+  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
-+}
-+
-+bool GetThreadArea64(pid_t tid,
-+                     const ThreadContext& context,
-+                     LinuxVMAddress* address,
-+                     bool can_log) {
-+  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
-+  // is stored in GPR 13.
-+  ThreadContext::t64_t tc;
-+  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
-+    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
-+    return false;
-+  }
-+
-+  *address = tc.gpr[13];
-+
-+  return true;
-+}
-+
-+// Stubs for 32-bit functions not applicable on PPC64
-+bool GetFloatingPointRegisters32(pid_t tid,
-+                                 FloatContext* context,
-+                                 bool can_log) { return false; }
-+bool GetThreadArea32(pid_t tid,
-+                     const ThreadContext &context,
-+                     LinuxVMAddress *address,
-+                     bool can_log) { return false; }
-+
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY
-@@ -486,6 +544,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, ThreadInfo* info) {
-   if (is_64_bit_) {
-     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
-            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
-+#endif
-            GetThreadArea64(tid,
-                            info->thread_context,
-                            &info->thread_specific_data_address,
-diff --git a/third_party/crashpad/crashpad/util/linux/thread_info.h b/third_party/crashpad/crashpad/util/linux/thread_info.h
-index 5b55c24a76..dea0d1f39e 100644
---- a/third_party/crashpad/crashpad/util/linux/thread_info.h
-+++ b/third_party/crashpad/crashpad/util/linux/thread_info.h
-@@ -28,6 +28,10 @@
- #include <android/api-level.h>
- #endif
- 
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+#include <sys/ucontext.h>
-+#endif
-+
- namespace crashpad {
- 
- //! \brief The set of general purpose registers for an architecture family.
-@@ -79,6 +83,8 @@ union ThreadContext {
-     uint32_t cp0_status;
-     uint32_t cp0_cause;
-     uint32_t padding1_;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+    // PPC64 is 64-bit
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY
-@@ -132,6 +138,21 @@ union ThreadContext {
-     uint64_t cp0_badvaddr;
-     uint64_t cp0_status;
-     uint64_t cp0_cause;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+    // Reflects struct pt_regs in asm/ptrace.h.
-+    uint64_t gpr[32];
-+    uint64_t nip;
-+    uint64_t msr;
-+    uint64_t orig_gpr3;
-+    uint64_t ctr;
-+    uint64_t lnk;
-+    uint64_t xer;
-+    uint64_t ccr;
-+    uint64_t softe;
-+    uint64_t trap;
-+    uint64_t dar;
-+    uint64_t dsisr;
-+    uint64_t result;
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY
-@@ -143,6 +164,8 @@ union ThreadContext {
-   using NativeThreadContext = user_regs;
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- // No appropriate NativeThreadsContext type available for MIPS
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  using NativeThreadContext = struct pt_regs;
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
-@@ -218,6 +241,9 @@ union FloatContext {
-     } fpregs[32];
-     uint32_t fpcsr;
-     uint32_t fpu_id;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+    // Crashpad's PPC support is 64-bit only, so this
-+    // 32bit-only struct is declared as empty.
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY
-@@ -252,6 +278,10 @@ union FloatContext {
-     double fpregs[32];
-     uint32_t fpcsr;
-     uint32_t fpu_id;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+    // Reflects fpregset_t in sys/ucontext.h
-+    double fpregs[32];
-+    double fpscr;
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY
-@@ -280,6 +310,8 @@ union FloatContext {
-   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- // No appropriate floating point context native type for available MIPS.
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
- #else
- #error Port.
- #endif  // ARCH_CPU_X86
-@@ -287,6 +319,26 @@ union FloatContext {
- static_assert(std::is_standard_layout<FloatContext>::value,
-               "Not standard layout");
- 
-+//! \brief The vector registers used for an architecture family
-+union VectorContext {
-+  struct v32_t {} v32;
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
-+#endif
-+  struct v64_t {
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+    // Reflects vrregset_t in sys/ucontext.h
-+    uint32_t vrregs[32][4];
-+    struct {
-+      uint32_t __pad[3];
-+      uint32_t vscr_word;
-+    } vscr;
-+    uint32_t vrsave;
-+    uint32_t __pad[3];
-+#endif
-+  } v64;
-+};
-+
- //! \brief A collection of `ptrace`-able information about a thread.
- struct ThreadInfo {
-   ThreadInfo();
-@@ -298,6 +350,9 @@ struct ThreadInfo {
-   //! \brief The floating point registers for the thread.
-   FloatContext float_context;
- 
-+  //! \brief (Optional) The vector registers used for the thread.
-+  VectorContext vector_context;
-+
-   //! \brief The thread-local storage address for the thread.
-   LinuxVMAddress thread_specific_data_address;
- };
-diff --git a/third_party/crashpad/crashpad/util/misc/capture_context.h b/third_party/crashpad/crashpad/util/misc/capture_context.h
-index 541589dfde..5b0fc8218c 100644
---- a/third_party/crashpad/crashpad/util/misc/capture_context.h
-+++ b/third_party/crashpad/crashpad/util/misc/capture_context.h
-@@ -66,6 +66,7 @@ using NativeCPUContext = ucontext_t;
- //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
- //!     Linux               | ARM/ARM64    | `r0`/`x0`
- //!     Linux               | MIPS/MIPS64  | `$a0`
-+//!     Linux               | PPC64        | `r3`
- //!
- //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
- //!     this function.
-diff --git a/third_party/crashpad/crashpad/util/misc/capture_context_linux.S b/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
-index de71e72312..af0ffff392 100644
---- a/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
-+++ b/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
-@@ -28,7 +28,7 @@
-   .globl CAPTURECONTEXT_SYMBOL2
- #if defined(__i386__) || defined(__x86_64__)
-   .balign 16, 0x90
--#elif defined(__arm__) || defined(__aarch64__) || defined(__mips__)
-+#elif defined(__arm__) || defined(__aarch64__) || defined(__mips__) || defined(__powerpc64__)
-   .balign 4, 0x0
- #endif
- 
-@@ -419,4 +419,214 @@ CAPTURECONTEXT_SYMBOL2:
-   jr $ra
- 
-   .set at
-+#elif defined(__powerpc64__)
-+  // Store r0-r31
-+  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
-+  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
-+  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
-+  // note that r3's original value was lost
-+  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
-+  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
-+  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
-+  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
-+  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
-+  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
-+  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
-+  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
-+  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
-+  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
-+  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
-+  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
-+  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
-+  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
-+  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
-+  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
-+  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
-+  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
-+  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
-+  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
-+  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
-+  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
-+  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
-+  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
-+  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
-+  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
-+  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
-+  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
-+  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
-+
-+  // For NIP, we can use the value in the link register
-+  mflr 0
-+  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
-+
-+  // CTR
-+  mfctr 0
-+  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
-+
-+  // For LNK, we'll use the caller's LR save area (2 stack frames up).
-+  // r4 can be used as a scratch register since it has already been saved.
-+  ld 4, 0(1)
-+  ld 4, 16(4)
-+  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
-+
-+  // XER
-+  mfxer 0
-+  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
-+
-+  // CCR
-+  mfcr 0
-+  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
-+
-+  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
-+  // not used or not relevant,  zero them out.
-+  li 4, 0
-+  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
-+  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
-+  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
-+  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
-+  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
-+  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
-+  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
-+  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
-+
-+  // Update context->uc_mcontext.regs to point to gp_regs
-+  addi 0, 3, 0xe8
-+  std 0, 0xe0(3)
-+
-+  // Save floating point registers 0-31
-+  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
-+  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
-+  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
-+  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
-+  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
-+  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
-+  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
-+  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
-+  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
-+  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
-+  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
-+  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
-+  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
-+  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
-+  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
-+  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
-+  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
-+  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
-+  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
-+  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
-+  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
-+  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
-+  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
-+  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
-+  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
-+  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
-+  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
-+  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
-+  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
-+  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
-+  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
-+  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
-+
-+  // FPSCR
-+  mffs 0
-+  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
-+
-+  // Save VMX Vector registers
-+  // Update r4 to contain the base address of vmx_reserve
-+  addi 4, 3, 0x378
-+  // Ensure that it is quadword aligned
-+  andi. 5, 4, 0xF
-+  beq 1f // No alignment is necessary
-+  // Address is doubleword aligned and not quadword aligned, add 8
-+  addi 4, 4, 8
-+
-+1:
-+  // Store VMX registers 0-31
-+  // r4 will contain the base address
-+  // r5 will contain the index
-+  li 5, 0
-+  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
-+  addi 5, 5, 16
-+  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
-+  addi 5, 5, 16
-+  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
-+  addi 5, 5, 16
-+  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
-+  addi 5, 5, 16
-+  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
-+  addi 5, 5, 16
-+  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
-+  addi 5, 5, 16
-+  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
-+  addi 5, 5, 16
-+  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
-+  addi 5, 5, 16
-+  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
-+  addi 5, 5, 16
-+  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
-+  addi 5, 5, 16
-+  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
-+  addi 5, 5, 16
-+  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
-+  addi 5, 5, 16
-+  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
-+  addi 5, 5, 16
-+  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
-+  addi 5, 5, 16
-+  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
-+  addi 5, 5, 16
-+  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
-+  addi 5, 5, 16
-+  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
-+  addi 5, 5, 16
-+  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
-+  addi 5, 5, 16
-+  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
-+  addi 5, 5, 16
-+  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
-+  addi 5, 5, 16
-+  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
-+  addi 5, 5, 16
-+  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
-+  addi 5, 5, 16
-+  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
-+  addi 5, 5, 16
-+  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
-+  addi 5, 5, 16
-+  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
-+  addi 5, 5, 16
-+  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
-+  addi 5, 5, 16
-+  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
-+  addi 5, 5, 16
-+  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
-+  addi 5, 5, 16
-+  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
-+  addi 5, 5, 16
-+  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
-+  addi 5, 5, 16
-+  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
-+  addi 5, 5, 16
-+  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
-+  addi 5, 5, 16
-+
-+  // VSCR
-+  mfvscr 0
-+  stvx 0, 4, 5
-+  addi 5, 5, 16
-+
-+  // VRSAVE
-+  mfvrsave 0
-+  stwx 0, 4, 5
-+
-+  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
-+  std 4, 0x370(3)
-+
-+  // Zero out all unused fields
-+  li 4, 0
-+  std 4, 0xc8(3) // context->uc_mcontext.signal
-+  std 4, 0xd0(3) // context->uc_mcontext.handler
-+  std 4, 0xd8(3) // context->uc_mcontext.oldmask
-+
-+  blr
- #endif  // __i386__
-diff --git a/third_party/crashpad/crashpad/util/misc/capture_context_test.cc b/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
-index cf23c2deff..5f264bc923 100644
---- a/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
-+++ b/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
-@@ -57,7 +57,7 @@ void TestCaptureContext() {
-   uintptr_t pc = ProgramCounterFromContext(context_1);
- 
- #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
--    !defined(MEMORY_SANITIZER)
-+    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
-   // Sanitizers can cause enough code bloat that the “nearby” check would
-   // likely fail.
-   const uintptr_t kReferencePC =
-diff --git a/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc b/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
-index 9fc5db28c4..5f69f8dced 100644
---- a/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
-+++ b/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
-@@ -36,6 +36,8 @@ void SanityCheckContext(const NativeCPUContext& context) {
-   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
- #endif
- }
- 
-@@ -50,6 +52,8 @@ uintptr_t ProgramCounterFromContext(const NativeCPUContext& context) {
-   return context.uc_mcontext.pc;
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-   return context.uc_mcontext.pc;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  return context.uc_mcontext.gp_regs[PT_NIP];
- #endif
- }
- 
-@@ -64,6 +68,8 @@ uintptr_t StackPointerFromContext(const NativeCPUContext& context) {
-   return context.uc_mcontext.sp;
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-   return context.uc_mcontext.gregs[29];
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  return context.uc_mcontext.gp_regs[1];
- #endif
- }
- 
-diff --git a/third_party/crashpad/crashpad/util/posix/signals_test.cc b/third_party/crashpad/crashpad/util/posix/signals_test.cc
-index d91e3cc662..b1ffc7b15a 100644
---- a/third_party/crashpad/crashpad/util/posix/signals_test.cc
-+++ b/third_party/crashpad/crashpad/util/posix/signals_test.cc
-@@ -46,12 +46,12 @@ bool CanCauseSignal(int sig) {
-   return sig == SIGABRT ||
-          sig == SIGALRM ||
-          sig == SIGBUS ||
--#if !defined(ARCH_CPU_ARM64)
-+#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
-          sig == SIGFPE ||
--#endif  // !defined(ARCH_CPU_ARM64)
-+#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
-          sig == SIGILL ||
--#endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL
-+#endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
-          sig == SIGPIPE ||
-          sig == SIGSEGV ||
- #if defined(OS_MACOSX)
-@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
-       break;
-     }
- 
--#if !defined(ARCH_CPU_ARM64)
-+#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
-     // ARM64 has hardware integer division instructions that don’t generate a
-     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
-+    //
-+    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
-     case SIGFPE: {
-       // Optimization makes this tricky, so get zero from a system call likely
-       // to succeed, and try to do something with the result.
-@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
-       fstat(quotient, &stat_buf);
-       break;
-     }
--#endif  // ARCH_CPU_ARM64
-+#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
- 
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
-     case SIGILL: {
-diff --git a/third_party/dav1d/BUILD.gn b/third_party/dav1d/BUILD.gn
-index 37ced877cb..be8ae8304e 100644
---- a/third_party/dav1d/BUILD.gn
-+++ b/third_party/dav1d/BUILD.gn
-@@ -233,6 +233,21 @@ if (current_cpu == "x86" || current_cpu == "x64") {
-       ":dav1d_config",
-     ]
- 
-+    cflags = dav1d_copts
-+  }
-+} else if (current_cpu == "ppc64") {
-+  static_library("dav1d_ppc") {
-+    sources = [
-+      "libdav1d/src/ppc/cpu.c",
-+      "libdav1d/src/ppc/cpu.h",
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [
-+      "//build/config/compiler:no_chromium_code",
-+      ":dav1d_config",
-+    ]
-+
-     cflags = dav1d_copts
-   }
- }
-@@ -262,5 +277,7 @@ static_library("dav1d") {
-     }
-   } else if (current_cpu == "arm" || current_cpu == "arm64") {
-     deps += [ ":dav1d_arm" ]
-+  } else if (current_cpu == "ppc64") {
-+    deps += [ ":dav1d_ppc" ]
-   }
- }
-diff --git a/third_party/dav1d/config/linux/ppc64/config.h b/third_party/dav1d/config/linux/ppc64/config.h
-new file mode 100644
-index 0000000000..f6ca57f7f0
---- /dev/null
-+++ b/third_party/dav1d/config/linux/ppc64/config.h
-@@ -0,0 +1,35 @@
-+/*
-+ * Autogenerated by the Meson build system.
-+ * Do not edit, your changes will be lost.
-+ */
-+
-+#pragma once
-+
-+#define ARCH_AARCH64 0
-+
-+#define ARCH_ARM 0
-+
-+#define ARCH_PPC64LE 1
-+
-+#define ARCH_X86 0
-+
-+#define ARCH_X86_32 0
-+
-+#define ARCH_X86_64 0
-+
-+#define CONFIG_16BPC 1
-+
-+#define CONFIG_8BPC 1
-+
-+#define CONFIG_LOG 1
-+
-+#define ENDIANNESS_BIG 0
-+
-+#define HAVE_ASM 1
-+
-+#define HAVE_GETAUXVAL 1
-+
-+#define HAVE_POSIX_MEMALIGN 1
-+
-+#define HAVE_UNISTD_H 1
-+
-diff --git a/third_party/libvpx/BUILD.gn b/third_party/libvpx/BUILD.gn
-index 599b9d1fe4..a98acb9b58 100644
---- a/third_party/libvpx/BUILD.gn
-+++ b/third_party/libvpx/BUILD.gn
-@@ -38,6 +38,8 @@ if (current_cpu == "x86") {
- 
- if (is_nacl) {
-   platform_include_dir = "source/config/nacl"
-+} else if (current_cpu == "ppc64") {
-+  platform_include_dir = "source/config/linux/generic"
- } else {
-   # The mac configurations are currently a relic. They were useful when
-   # x86inc.asm did not work for MACH_O but now the build is identical to the
-@@ -340,6 +342,8 @@ static_library("libvpx") {
-     } else {
-       sources = libvpx_srcs_arm64
-     }
-+  } else if (current_cpu == "ppc64") {
-+    sources = libvpx_srcs_generic
-   }
- 
-   configs -= [ "//build/config/compiler:chromium_code" ]
-diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h
-index 9276f5627a..bc317ca33a 100644
---- a/third_party/lss/linux_syscall_support.h
-+++ b/third_party/lss/linux_syscall_support.h
-@@ -3905,7 +3905,7 @@ struct kernel_statfs {
-       LSS_REG(2, buf);
-       LSS_BODY(void*, mmap2, "0"(__r2));
-     }
--#else
-+#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
-     #define __NR__mmap2 __NR_mmap2
-     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
-                          size_t,                   l, int,               p,
-@@ -4036,7 +4036,7 @@ struct kernel_statfs {
-   #if defined(__i386__) ||                                                    \
-       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
-      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
--      defined(__PPC__) ||                                                     \
-+     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
-      (defined(__s390__) && !defined(__s390x__))
-     /* On these architectures, implement mmap() with mmap2(). */
-     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
-diff --git a/third_party/pffft/src/pffft.c b/third_party/pffft/src/pffft.c
-index bdac4d7849..51e0f2cacc 100644
---- a/third_party/pffft/src/pffft.c
-+++ b/third_party/pffft/src/pffft.c
-@@ -100,6 +100,7 @@
-    Altivec support macros 
- */
- #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
-+#include <altivec.h>
- typedef vector float v4sf;
- #  define SIMD_SZ 4
- #  define VZERO() ((vector float) vec_splat_u8(0))
-diff --git a/third_party/skia/src/sksl/SkSLString.cpp b/third_party/skia/src/sksl/SkSLString.cpp
-index 88eb1c7d3b..4be33fa5bd 100644
---- a/third_party/skia/src/sksl/SkSLString.cpp
-+++ b/third_party/skia/src/sksl/SkSLString.cpp
-@@ -240,7 +240,12 @@ String to_string(double value) {
-     if (needsDotZero) {
-         buffer << ".0";
-     }
--    return String(buffer.str().c_str());
-+
-+    std::string ret(buffer.str());
-+    if (signbit(value) && ret[0] == '.') {
-+        ret[0] = '-';
-+    }
-+    return String(ret.c_str());
- }
- 
- SKSL_INT stoi(const String& s) {
-diff --git a/third_party/sqlite/amalgamation/sqlite3.c b/third_party/sqlite/amalgamation/sqlite3.c
-index 110a1a7112..5eb339844a 100644
---- a/third_party/sqlite/amalgamation/sqlite3.c
-+++ b/third_party/sqlite/amalgamation/sqlite3.c
-@@ -13986,7 +13986,8 @@ typedef INT16_TYPE LogEst;
- # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
-      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
-      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
--     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
-+     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
-+     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- #   define SQLITE_BYTEORDER    1234
- # elif defined(sparc)     || defined(__ppc__) || \
-        defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git a/third_party/sqlite/patched/ext/rtree/rtree.c b/third_party/sqlite/patched/ext/rtree/rtree.c
-index bd8b08eec0..a26801fa95 100644
---- a/third_party/sqlite/patched/ext/rtree/rtree.c
-+++ b/third_party/sqlite/patched/ext/rtree/rtree.c
-@@ -425,7 +425,7 @@ struct RtreeMatchArg {
- #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
-     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
-     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
--    defined(__arm__)
-+    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- # define SQLITE_BYTEORDER    1234
- #elif defined(sparc)    || defined(__ppc__)
- # define SQLITE_BYTEORDER    4321
-diff --git a/third_party/sqlite/patched/src/sqliteInt.h b/third_party/sqlite/patched/src/sqliteInt.h
-index 0178092955..d3ed564863 100644
---- a/third_party/sqlite/patched/src/sqliteInt.h
-+++ b/third_party/sqlite/patched/src/sqliteInt.h
-@@ -833,7 +833,8 @@ typedef INT16_TYPE LogEst;
- # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
-      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
-      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
--     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
-+     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
-+     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- #   define SQLITE_BYTEORDER    1234
- # elif defined(sparc)     || defined(__ppc__) || \
-        defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git a/third_party/sqlite/sqlite-src-3290000/ext/rtree/rtree.c b/third_party/sqlite/sqlite-src-3290000/ext/rtree/rtree.c
-index ea5e737aa3..03b92e3a9d 100644
---- a/third_party/sqlite/sqlite-src-3290000/ext/rtree/rtree.c
-+++ b/third_party/sqlite/sqlite-src-3290000/ext/rtree/rtree.c
-@@ -425,7 +425,7 @@ struct RtreeMatchArg {
- #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
-     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
-     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
--    defined(__arm__)
-+    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- # define SQLITE_BYTEORDER    1234
- #elif defined(sparc)    || defined(__ppc__)
- # define SQLITE_BYTEORDER    4321
-diff --git a/third_party/sqlite/sqlite-src-3290000/src/sqliteInt.h b/third_party/sqlite/sqlite-src-3290000/src/sqliteInt.h
-index 1c46183312..b732d97e05 100644
---- a/third_party/sqlite/sqlite-src-3290000/src/sqliteInt.h
-+++ b/third_party/sqlite/sqlite-src-3290000/src/sqliteInt.h
-@@ -833,7 +833,8 @@ typedef INT16_TYPE LogEst;
- # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
-      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
-      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
--     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
-+     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
-+     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- #   define SQLITE_BYTEORDER    1234
- # elif defined(sparc)     || defined(__ppc__) || \
-        defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git a/third_party/swiftshader/src/Yarn/BUILD.gn b/third_party/swiftshader/src/Yarn/BUILD.gn
-index 2718ad182e..05885eb7db 100644
---- a/third_party/swiftshader/src/Yarn/BUILD.gn
-+++ b/third_party/swiftshader/src/Yarn/BUILD.gn
-@@ -49,6 +49,7 @@ swiftshader_source_set("Yarn_headers") {
-       "OSFiber_asm_arm.h",
-       "OSFiber_asm_x64.h",
-       "OSFiber_asm_x86.h",
-+      "OSFiber_asm_ppc64.h",
-     ]
-   }
- 
-@@ -73,8 +74,10 @@ swiftshader_source_set("Yarn") {
-       "OSFiber_asm_arm.S",
-       "OSFiber_asm_x64.S",
-       "OSFiber_asm_x86.S",
-+      "OSFiber_asm_ppc64.S",
-       "OSFiber_x64.c",
-       "OSFiber_x86.c",
-+      "OSFiber_ppc64.c",
-     ]
-   }
- 
-diff --git a/third_party/swiftshader/src/Yarn/OSFiber_asm.hpp b/third_party/swiftshader/src/Yarn/OSFiber_asm.hpp
-index e0fa508a9e..7d6f961248 100644
---- a/third_party/swiftshader/src/Yarn/OSFiber_asm.hpp
-+++ b/third_party/swiftshader/src/Yarn/OSFiber_asm.hpp
-@@ -30,6 +30,8 @@
- #include "OSFiber_asm_aarch64.h"
- #elif defined(__arm__)
- #include "OSFiber_asm_arm.h"
-+#elif defined(__powerpc64__) && (_CALL_ELF == 2)
-+#include "OSFiber_asm_ppc64.h"
- #else
- #error "Unsupported target"
- #endif
-diff --git a/third_party/swiftshader/src/Yarn/OSFiber_asm_ppc64.S b/third_party/swiftshader/src/Yarn/OSFiber_asm_ppc64.S
-new file mode 100644
-index 0000000000..7d464fc12b
---- /dev/null
-+++ b/third_party/swiftshader/src/Yarn/OSFiber_asm_ppc64.S
-@@ -0,0 +1,196 @@
-+// Copyright 2019 The SwiftShader Authors. All Rights Reserved.
-+//
-+// Licensed under the Apache License, Version 2.0 (the "License");
-+// you may not use this file except in compliance with the License.
-+// You may obtain a copy of the License at
-+//
-+//    http://www.apache.org/licenses/LICENSE-2.0
-+//
-+// Unless required by applicable law or agreed to in writing, software
-+// distributed under the License is distributed on an "AS IS" BASIS,
-+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+// See the License for the specific language governing permissions and
-+// limitations under the License.
-+
-+#if defined(__powerpc64__)
-+
-+#define YARN_BUILD_ASM 1
-+#include "OSFiber_asm_ppc64.h"
-+
-+// void yarn_fiber_swap(yarn_fiber_context* from, const yarn_fiber_context* to)
-+// r3: from
-+// r4: to
-+.text
-+.global yarn_fiber_swap
-+.align 4
-+.type yarn_fiber_swap @function
-+yarn_fiber_swap:
-+
-+    // Save context 'from'
-+
-+    // Store non-volatile registers
-+    std 1, YARN_REG_R1(4)
-+    std 2, YARN_REG_R2(4)
-+    std 13, YARN_REG_R13(4)
-+    std 14, YARN_REG_R14(4)
-+    std 15, YARN_REG_R15(4)
-+    std 16, YARN_REG_R16(4)
-+    std 17, YARN_REG_R17(4)
-+    std 18, YARN_REG_R18(4)
-+    std 19, YARN_REG_R19(4)
-+    std 20, YARN_REG_R20(4)
-+    std 21, YARN_REG_R21(4)
-+    std 22, YARN_REG_R22(4)
-+    std 23, YARN_REG_R23(4)
-+    std 24, YARN_REG_R24(4)
-+    std 25, YARN_REG_R25(4)
-+    std 26, YARN_REG_R26(4)
-+    std 27, YARN_REG_R27(4)
-+    std 28, YARN_REG_R28(4)
-+    std 29, YARN_REG_R29(4)
-+    std 30, YARN_REG_R30(4)
-+    std 31, YARN_REG_R31(4)
-+
-+    // Store special registers
-+    mflr 5
-+    std 5, YARN_REG_LR(4)
-+    mfcr 5
-+    std 5, YARN_REG_CCR(4)
-+
-+    // Store non-volatile floating point registers
-+    stfd 14, YARN_REG_FPRS+0x10(4)
-+    stfd 15, YARN_REG_FPRS+0x18(4)
-+    stfd 16, YARN_REG_FPRS+0x20(4)
-+    stfd 17, YARN_REG_FPRS+0x28(4)
-+    stfd 18, YARN_REG_FPRS+0x30(4)
-+    stfd 19, YARN_REG_FPRS+0x38(4)
-+    stfd 20, YARN_REG_FPRS+0x40(4)
-+    stfd 21, YARN_REG_FPRS+0x48(4)
-+    stfd 22, YARN_REG_FPRS+0x50(4)
-+    stfd 23, YARN_REG_FPRS+0x58(4)
-+    stfd 24, YARN_REG_FPRS+0x60(4)
-+    stfd 25, YARN_REG_FPRS+0x68(4)
-+    stfd 26, YARN_REG_FPRS+0x70(4)
-+    stfd 27, YARN_REG_FPRS+0x78(4)
-+    stfd 28, YARN_REG_FPRS+0x80(4)
-+    stfd 29, YARN_REG_FPRS+0x88(4)
-+    stfd 30, YARN_REG_FPRS+0x90(4)
-+    stfd 31, YARN_REG_FPRS+0x98(4)
-+
-+    // Store non-volatile altivec registers
-+#ifdef __ALTIVEC__
-+    li 5, YARN_REG_VMX
-+    stvxl 20, 4, 5
-+    addi 5, 5, 16
-+    stvxl 21, 4, 5
-+    addi 5, 5, 16
-+    stvxl 22, 4, 5
-+    addi 5, 5, 16
-+    stvxl 23, 4, 5
-+    addi 5, 5, 16
-+    stvxl 24, 4, 5
-+    addi 5, 5, 16
-+    stvxl 25, 4, 5
-+    addi 5, 5, 16
-+    stvxl 26, 4, 5
-+    addi 5, 5, 16
-+    stvxl 27, 4, 5
-+    addi 5, 5, 16
-+    stvxl 28, 4, 5
-+    addi 5, 5, 16
-+    stvxl 29, 4, 5
-+    addi 5, 5, 16
-+    stvxl 30, 4, 5
-+    addi 5, 5, 16
-+    stvxl 31, 4, 5
-+    addi 5, 5, 16
-+
-+    mfvrsave 5
-+    stw 5, YARN_REG_VRSAVE(4)
-+#endif // __ALTIVEC__
-+
-+    // Load non-volatile registers
-+    ld 1, YARN_REG_R1(3)
-+    ld 2, YARN_REG_R2(3)
-+    ld 13, YARN_REG_R13(3)
-+    ld 14, YARN_REG_R14(3)
-+    ld 15, YARN_REG_R15(3)
-+    ld 16, YARN_REG_R16(3)
-+    ld 17, YARN_REG_R17(3)
-+    ld 18, YARN_REG_R18(3)
-+    ld 19, YARN_REG_R19(3)
-+    ld 20, YARN_REG_R20(3)
-+    ld 21, YARN_REG_R21(3)
-+    ld 22, YARN_REG_R22(3)
-+    ld 23, YARN_REG_R23(3)
-+    ld 24, YARN_REG_R24(3)
-+    ld 25, YARN_REG_R25(3)
-+    ld 26, YARN_REG_R26(3)
-+    ld 27, YARN_REG_R27(3)
-+    ld 28, YARN_REG_R28(3)
-+    ld 29, YARN_REG_R29(3)
-+    ld 30, YARN_REG_R30(3)
-+    ld 31, YARN_REG_R31(3)
-+
-+    // Load non-volatile floating point registers
-+    lfd 14, YARN_REG_FPRS+0x10(3)
-+    lfd 15, YARN_REG_FPRS+0x18(3)
-+    lfd 16, YARN_REG_FPRS+0x20(3)
-+    lfd 17, YARN_REG_FPRS+0x28(3)
-+    lfd 18, YARN_REG_FPRS+0x30(3)
-+    lfd 19, YARN_REG_FPRS+0x38(3)
-+    lfd 20, YARN_REG_FPRS+0x40(3)
-+    lfd 21, YARN_REG_FPRS+0x48(3)
-+    lfd 22, YARN_REG_FPRS+0x50(3)
-+    lfd 23, YARN_REG_FPRS+0x58(3)
-+    lfd 24, YARN_REG_FPRS+0x60(3)
-+    lfd 25, YARN_REG_FPRS+0x68(3)
-+    lfd 26, YARN_REG_FPRS+0x70(3)
-+    lfd 27, YARN_REG_FPRS+0x78(3)
-+    lfd 28, YARN_REG_FPRS+0x80(3)
-+    lfd 29, YARN_REG_FPRS+0x88(3)
-+    lfd 30, YARN_REG_FPRS+0x90(3)
-+    lfd 31, YARN_REG_FPRS+0x98(3)
-+
-+    // Load non-volatile altivec registers
-+#ifdef __ALTIVEC__
-+    li 5, YARN_REG_VMX
-+    lvxl 20, 3, 5
-+    addi 5, 5, 16
-+    lvxl 21, 3, 5
-+    addi 5, 5, 16
-+    lvxl 22, 3, 5
-+    addi 5, 5, 16
-+    lvxl 23, 3, 5
-+    addi 5, 5, 16
-+    lvxl 24, 3, 5
-+    addi 5, 5, 16
-+    lvxl 25, 3, 5
-+    addi 5, 5, 16
-+    lvxl 26, 3, 5
-+    addi 5, 5, 16
-+    lvxl 27, 3, 5
-+    addi 5, 5, 16
-+    lvxl 28, 3, 5
-+    addi 5, 5, 16
-+    lvxl 29, 3, 5
-+    addi 5, 5, 16
-+    lvxl 30, 3, 5
-+    addi 5, 5, 16
-+    lvxl 31, 3, 5
-+    addi 5, 5, 16
-+
-+    lwz 5, YARN_REG_VRSAVE(3)
-+    mtvrsave 5
-+#endif // __ALTIVEC__
-+
-+    // Load parameters and entrypoint
-+    ld 12, YARN_REG_LR(3)
-+    ld 4, YARN_REG_R4(3)
-+    ld 3, YARN_REG_R3(3)
-+    mtlr 12
-+
-+    // Branch to entrypoint
-+    blr
-+
-+#endif // defined(__powerpc64__)
-diff --git a/third_party/swiftshader/src/Yarn/OSFiber_asm_ppc64.h b/third_party/swiftshader/src/Yarn/OSFiber_asm_ppc64.h
-new file mode 100644
-index 0000000000..5f9b108229
---- /dev/null
-+++ b/third_party/swiftshader/src/Yarn/OSFiber_asm_ppc64.h
-@@ -0,0 +1,133 @@
-+// Copyright 2019 The SwiftShader Authors. All Rights Reserved.
-+//
-+// Licensed under the Apache License, Version 2.0 (the "License");
-+// you may not use this file except in compliance with the License.
-+// You may obtain a copy of the License at
-+//
-+//    http://www.apache.org/licenses/LICENSE-2.0
-+//
-+// Unless required by applicable law or agreed to in writing, software
-+// distributed under the License is distributed on an "AS IS" BASIS,
-+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+// See the License for the specific language governing permissions and
-+// limitations under the License.
-+
-+#define YARN_REG_R1  0x00
-+#define YARN_REG_R2  0x08
-+#define YARN_REG_R13 0x10
-+#define YARN_REG_R14 0x18
-+#define YARN_REG_R15 0x20
-+#define YARN_REG_R16 0x28
-+#define YARN_REG_R17 0x30
-+#define YARN_REG_R18 0x38
-+#define YARN_REG_R19 0x40
-+#define YARN_REG_R20 0x48
-+#define YARN_REG_R21 0x50
-+#define YARN_REG_R22 0x58
-+#define YARN_REG_R23 0x60
-+#define YARN_REG_R24 0x68
-+#define YARN_REG_R25 0x70
-+#define YARN_REG_R26 0x78
-+#define YARN_REG_R27 0x80
-+#define YARN_REG_R28 0x88
-+#define YARN_REG_R29 0x90
-+#define YARN_REG_R30 0x98
-+#define YARN_REG_R31 0xa0
-+
-+#define YARN_REG_R12 0xa8
-+
-+#define YARN_REG_R3  0xb0
-+#define YARN_REG_R4  0xb8
-+
-+#define YARN_REG_LR  0xc0
-+#define YARN_REG_CCR 0xc8
-+
-+#define YARN_REG_FPRS 0xd0
-+#define YARN_REG_VMX  0x160
-+#define YARN_REG_VRSAVE 0x220
-+
-+#ifndef YARN_BUILD_ASM
-+
-+#include <stdint.h>
-+
-+struct yarn_fiber_context
-+{
-+    // non-volatile registers
-+    uintptr_t r1;
-+    uintptr_t r2;
-+    uintptr_t r13;
-+    uintptr_t r14;
-+    uintptr_t r15;
-+    uintptr_t r16;
-+    uintptr_t r17;
-+    uintptr_t r18;
-+    uintptr_t r19;
-+    uintptr_t r20;
-+    uintptr_t r21;
-+    uintptr_t r22;
-+    uintptr_t r23;
-+    uintptr_t r24;
-+    uintptr_t r25;
-+    uintptr_t r26;
-+    uintptr_t r27;
-+    uintptr_t r28;
-+    uintptr_t r29;
-+    uintptr_t r30;
-+    uintptr_t r31;
-+
-+    // function entrypoint register (r12)
-+    uintptr_t r12;
-+
-+    // first two parameter registers (r3, r4)
-+    uintptr_t r3;
-+    uintptr_t r4;
-+
-+    // special registers
-+    uintptr_t lr;
-+    uintptr_t ccr;
-+
-+    // non-volatile floating-point registers (f14-f31)
-+    uintptr_t fprs[18];
-+
-+    // non-volatile altivec registers
-+    uintptr_t vmx[12 * 2];
-+    uint32_t vrsave;
-+};
-+
-+// Only the ELFv2 ABI is supported for now
-+#if !defined(_CALL_ELF) || (_CALL_ELF != 2)
-+#error "Only the ppc64 ELFv2 ABI is supported."
-+#endif
-+
-+#ifdef __cplusplus
-+#include <cstddef>
-+static_assert(offsetof(yarn_fiber_context, r1) == YARN_REG_R1, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r2) == YARN_REG_R2, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r12) == YARN_REG_R12, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r13) == YARN_REG_R13, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r15) == YARN_REG_R15, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r16) == YARN_REG_R16, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r17) == YARN_REG_R17, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r18) == YARN_REG_R18, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r19) == YARN_REG_R19, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r20) == YARN_REG_R20, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r21) == YARN_REG_R21, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r22) == YARN_REG_R22, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r23) == YARN_REG_R23, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r24) == YARN_REG_R24, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r25) == YARN_REG_R25, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r26) == YARN_REG_R26, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r27) == YARN_REG_R27, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r28) == YARN_REG_R28, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r29) == YARN_REG_R29, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r30) == YARN_REG_R30, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r31) == YARN_REG_R31, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, r14) == YARN_REG_R14, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, lr) == YARN_REG_LR, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, ccr) == YARN_REG_CCR, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, fprs) == YARN_REG_FPRS, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, vmx) == YARN_REG_VMX, "Bad register offset");
-+static_assert(offsetof(yarn_fiber_context, vrsave) == YARN_REG_VRSAVE, "Bad register offset");
-+#endif // __cplusplus
-+
-+#endif // YARN_BUILD_ASM
-diff --git a/third_party/swiftshader/src/Yarn/OSFiber_ppc64.c b/third_party/swiftshader/src/Yarn/OSFiber_ppc64.c
-new file mode 100644
-index 0000000000..b0efeaf01a
---- /dev/null
-+++ b/third_party/swiftshader/src/Yarn/OSFiber_ppc64.c
-@@ -0,0 +1,42 @@
-+// Copyright 2019 The SwiftShader Authors. All Rights Reserved.
-+//
-+// Licensed under the Apache License, Version 2.0 (the "License");
-+// you may not use this file except in compliance with the License.
-+// You may obtain a copy of the License at
-+//
-+//    http://www.apache.org/licenses/LICENSE-2.0
-+//
-+// Unless required by applicable law or agreed to in writing, software
-+// distributed under the License is distributed on an "AS IS" BASIS,
-+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+// See the License for the specific language governing permissions and
-+// limitations under the License.
-+
-+#if defined(__powerpc64__)
-+
-+#include "OSFiber_asm_ppc64.h"
-+
-+void yarn_fiber_trampoline(void(*target)(void*), void* arg)
-+{
-+    target(arg);
-+}
-+
-+void yarn_fiber_set_target(struct yarn_fiber_context* ctx, void* stack, uint32_t stack_size, void(*target)(void*), void* arg)
-+{
-+    uintptr_t stack_top = (uintptr_t)((uint8_t*)(stack) + stack_size);
-+    if ((stack_top % 16) != 0)
-+        stack_top -= (stack_top % 16);
-+
-+    // Write a NULL backchain and subtract a minimum stack frame size (32)
-+    *(uintptr_t *)stack_top = 0;
-+    stack_top -= 32;
-+    *(uintptr_t *)stack_top = stack_top + 32;
-+
-+    // Load registers
-+    ctx->r1 = stack_top;
-+    ctx->lr = (uintptr_t)yarn_fiber_trampoline;
-+    ctx->r3 = (uintptr_t)target;
-+    ctx->r4 = (uintptr_t)arg;
-+}
-+
-+#endif // __powerpc64__
-diff --git a/third_party/webrtc/modules/desktop_capture/differ_block.cc b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-index dd9ab457e0..c005d95990 100644
---- a/third_party/webrtc/modules/desktop_capture/differ_block.cc
-+++ b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
-   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
- 
-   if (!diff_proc) {
--#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
--    // For ARM and MIPS processors, always use C version.
--    // TODO(hclam): Implement a NEON version.
--    diff_proc = &VectorDifference_C;
--#else
-+#if defined(WEBRTC_ARCH_X86_FAMILY)
-     bool have_sse2 = WebRtc_GetCPUInfo(kSSE2) != 0;
-     // For x86 processors, check if SSE2 is supported.
-     if (have_sse2 && kBlockSize == 32) {
-@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
-     } else {
-       diff_proc = &VectorDifference_C;
-     }
-+#else
-+    // For other processors, always use C version.
-+    // TODO(hclam): Implement a NEON version.
-+    diff_proc = &VectorDifference_C;
- #endif
-   }
- 
-diff --git a/third_party/webrtc/rtc_base/system/arch.h b/third_party/webrtc/rtc_base/system/arch.h
-index eb77ffa8f4..e60b81a057 100644
---- a/third_party/webrtc/rtc_base/system/arch.h
-+++ b/third_party/webrtc/rtc_base/system/arch.h
-@@ -50,6 +50,18 @@
- #elif defined(__EMSCRIPTEN__)
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
-+#elif defined(__PPC__)
-+#define WEBRTC_ARCH_PPC_FAMILY
-+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-+#define WEBRTC_ARCH_LITTLE_ENDIAN
-+#else
-+#define WEBRTC_ARCH_BIG_ENDIAN
-+#endif
-+#if defined(__LP64__)
-+#define WEBRTC_ARCH_64_BITS
-+#else
-+#define WEBRTC_ARCH_32_BITS
-+#endif
- #else
- #error Please add support for your architecture in rtc_base/system/arch.h
- #endif
-diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn
-index 4657246ecf..fd0cb00dac 100644
---- a/ui/gl/BUILD.gn
-+++ b/ui/gl/BUILD.gn
-@@ -16,7 +16,8 @@ declare_args() {
-                         is_chromeos || is_fuchsia) &&
-                        (target_cpu == "x86" || target_cpu == "x64" ||
-                         target_cpu == "arm" || target_cpu == "arm64" ||
--                        target_cpu == "mipsel" || target_cpu == "mips64el")
-+                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
-+                        target_cpu == "ppc64")
- 
-   # Whether service side logging (actual calls into the GL driver) is enabled
-   # or not.
-diff --git a/v8/BUILD.gn b/v8/BUILD.gn
-index c486f1a1c8..90199198c5 100644
---- a/v8/BUILD.gn
-+++ b/v8/BUILD.gn
-@@ -609,6 +609,12 @@ config("toolchain") {
-     }
-     if (host_byteorder == "little") {
-       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
-+        cflags += [
-+        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
-+        "-mcpu=power8",
-+        "-maltivec",
-+        "-mvsx",
-+      ]
-     } else if (host_byteorder == "big") {
-       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
-       if (current_os == "aix") {
-diff --git a/v8/test/BUILD.gn b/v8/test/BUILD.gn
-index 6bf9ca643d..422a34b913 100644
---- a/v8/test/BUILD.gn
-+++ b/v8/test/BUILD.gn
-@@ -32,7 +32,7 @@ group("gn_all") {
-     deps += [
-       "cctest:cctest",
-       "cctest:generate-bytecode-expectations",
--      "unittests:unittests",
-+      #"unittests:unittests",
-     ]
-   }
- }
-@@ -82,7 +82,7 @@ group("v8_bot_default") {
-     "mjsunit:v8_mjsunit",
-     "mkgrokdump:mkgrokdump",
-     "preparser:v8_preparser",
--    "unittests:unittests",
-+    #"unittests:unittests",
-     "wasm-api-tests:wasm_api_tests",
-     "wasm-js:v8_wasm_js",
-     "wasm-spec-tests:v8_wasm_spec_tests",
-@@ -103,7 +103,7 @@ group("v8_default") {
-     "mjsunit:v8_mjsunit",
-     "mkgrokdump:mkgrokdump",
-     "preparser:v8_preparser",
--    "unittests:unittests",
-+    #"unittests:unittests",
-     "wasm-api-tests:wasm_api_tests",
-     "wasm-js:v8_wasm_js",
-     "wasm-spec-tests:v8_wasm_spec_tests",
--- 
-2.28.0
-
diff --git a/srcpkgs/electron7/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch b/srcpkgs/electron7/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
deleted file mode 100644
index 916dba9dc3bc..000000000000
--- a/srcpkgs/electron7/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ff4122f236b70c272c746d0c336cdbd588d78cd1 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Thu, 12 Dec 2019 16:12:18 -0500
-Subject: [PATCH] Add a script to list patch targets
-
----
- script/list_patch_targets.py | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
- create mode 100755 script/list_patch_targets.py
-
-diff --git a/script/list_patch_targets.py b/script/list_patch_targets.py
-new file mode 100755
-index 000000000..55173bac9
---- /dev/null
-+++ b/script/list_patch_targets.py
-@@ -0,0 +1,23 @@
-+#!/usr/bin/env python
-+
-+import argparse
-+import json
-+
-+
-+def parse_args():
-+  parser = argparse.ArgumentParser(description='Apply Electron patches')
-+  parser.add_argument('config', nargs='+',
-+                      type=argparse.FileType('r'),
-+                      help='patches\' config(s) in the JSON format')
-+  return parser.parse_args()
-+
-+
-+def main():
-+  configs = parse_args().config
-+  for config_json in configs:
-+    for patch_dir, repo in json.load(config_json).iteritems():
-+      print(repo)
-+
-+
-+if __name__ == '__main__':
-+  main()
--- 
-2.23.0
-
diff --git a/srcpkgs/electron7/files/patches/electron-Build-fixes.patch.patch b/srcpkgs/electron7/files/patches/electron-Build-fixes.patch.patch
deleted file mode 100644
index a591c2edf620..000000000000
--- a/srcpkgs/electron7/files/patches/electron-Build-fixes.patch.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/build/args/all.gn b/build/args/all.gn
-index 8bbb86e28..8476d09ea 100644
---- a/build/args/all.gn
-+++ b/build/args/all.gn
-@@ -1,5 +1,4 @@
- is_electron_build = true
--use_jumbo_build = true
- root_extra_deps = [ "//electron" ]
- 
- # Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
-diff --git a/build/args/release.gn b/build/args/release.gn
-index e5017f6e1..59207b389 100644
---- a/build/args/release.gn
-+++ b/build/args/release.gn
-@@ -1,6 +1,4 @@
- import("all.gn")
--is_component_build = false
--is_official_build = true
- 
- # This may be guarded behind is_chrome_branded alongside
- # proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321,
-@@ -8,9 +6,3 @@ is_official_build = true
- # The initialization of the decoder depends on whether ffmpeg has
- # been built with H.264 support.
- rtc_use_h264 = proprietary_codecs
--
--# By default, Electron builds ffmpeg with proprietary codecs enabled. In order
--# to facilitate users who don't want to ship proprietary codecs in ffmpeg, or
--# who have an LGPL requirement to ship ffmpeg as a dynamically linked library,
--# we build ffmpeg as a shared library.
--is_component_ffmpeg = true
-diff --git a/build/npm.gni b/build/npm.gni
-index a1987d095..fb33a14c3 100644
---- a/build/npm.gni
-+++ b/build/npm.gni
-@@ -35,7 +35,6 @@ template("npm_action") {
-     if (!defined(deps)) {
-       deps = []
-     }
--    deps += [ ":npm_pre_flight_" + target_name ]
- 
-     script = "//electron/build/npm-run.py"
-     args = [
-diff --git a/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch b/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
-index 0dc9916be..7eaa46bf5 100644
---- a/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
-+++ b/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
-@@ -30,7 +30,7 @@
- +    # these values being accurate.
- +    'build_v8_with_gn': 'false',
- +    'enable_lto%': 'false',
--+
-++    'openssl_fips': '',
-      'conditions': [
-        ['target_arch=="arm64"', {
-          # Disabled pending https://github.com/nodejs/node/issues/23913.
-
diff --git a/srcpkgs/electron7/files/patches/electron-dont-assume-python-is-python2.patch b/srcpkgs/electron7/files/patches/electron-dont-assume-python-is-python2.patch
deleted file mode 100644
index fb134748025b..000000000000
--- a/srcpkgs/electron7/files/patches/electron-dont-assume-python-is-python2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/build/zip.py.orig	2020-04-27 17:59:53.499281667 +0200
-+++ b/build/zip.py	2020-04-27 17:59:57.655839143 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from __future__ import print_function
- import os
- import subprocess
-
---- a/build/npm-run.py.orig	2020-04-27 17:59:50.829351807 +0200
-+++ b/build/npm-run.py	2020-04-27 18:00:02.702373256 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from __future__ import print_function
- import os
- import subprocess
diff --git a/srcpkgs/electron7/files/patches/electron-fix-includes.patch b/srcpkgs/electron7/files/patches/electron-fix-includes.patch
deleted file mode 100644
index 9df1fd6946d9..000000000000
--- a/srcpkgs/electron7/files/patches/electron-fix-includes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/patches/chromium/feat_offscreen_rendering_with_viz_compositor.patch.orig	2020-04-27 16:37:09.934271227 +0200
-+++ b/patches/chromium/feat_offscreen_rendering_with_viz_compositor.patch	2020-04-27 16:37:50.903207166 +0200
-@@ -350,7 +350,7 @@
- index 0000000000000000000000000000000000000000..3865939d0445a23a468770f57207ba5ef23277ed
- --- /dev/null
- +++ b/components/viz/service/display_embedder/software_output_device_proxy.h
--@@ -0,0 +1,88 @@
-+@@ -0,0 +1,89 @@
- +// Copyright 2014 The Chromium Authors. All rights reserved.
- +// Use of this source code is governed by a BSD-style license that can be
- +// found in the LICENSE file.
-@@ -364,6 +364,7 @@
- +
- +#include <memory>
- +
-++#include "base/threading/thread_checker.h"
- +#include "components/viz/host/host_display_client.h"
- +#include "components/viz/service/display/software_output_device.h"
- +#include "components/viz/service/viz_service_export.h"
diff --git a/srcpkgs/electron7/files/patches/electron-mjsunit-not-exsit.patch.patch b/srcpkgs/electron7/files/patches/electron-mjsunit-not-exsit.patch.patch
deleted file mode 100644
index 2567540869c9..000000000000
--- a/srcpkgs/electron7/files/patches/electron-mjsunit-not-exsit.patch.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/patches/v8/make_createdynamicfunction_throw_if_disallowed.patch b/patches/v8/make_createdynamicfunction_throw_if_disallowed.patch
-index bafd0b0..949cb2d 100644
---- a/patches/v8/make_createdynamicfunction_throw_if_disallowed.patch
-+++ b/patches/v8/make_createdynamicfunction_throw_if_disallowed.patch
-@@ -25,42 +25,3 @@ index f75014d034626643ae83dc8f167a473b7291522c..b5c2e8b25f10f2fff9011a0a1bd1aeef
-    }
-  
-    // Build the source string.
--diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status
--index 134a49f7480c87acbb08133a2d6a4d028bbdd090..7dcaa412199770d7c4f688d7f8a66d887130bf82 100644
----- a/test/mjsunit/mjsunit.status
--+++ b/test/mjsunit/mjsunit.status
--@@ -232,6 +232,9 @@
--   # BUG(v8:6306).
--   'wasm/huge-memory': [SKIP],
-- 
--+  # Needs to be adapted after changes to Function constructor. chromium:1065094
--+  'cross-realm-filtering': [SKIP],
--+
--   # Allocates a huge string and then flattens it, very slow in debug mode.
--   'regress/regress-752764': [PASS, ['mode == debug', SLOW]],
-- 
--diff --git a/test/mjsunit/regress-1065094.js b/test/mjsunit/regress-1065094.js
--new file mode 100644
--index 0000000000000000000000000000000000000000..365e20285bb0505dec3f84c4df57db0525e7acc3
----- /dev/null
--+++ b/test/mjsunit/regress-1065094.js
--@@ -0,0 +1,19 @@
--+// Copyright 2020 the V8 project authors. All rights reserved.
--+// Use of this source code is governed by a BSD-style license that can be
--+// found in the LICENSE file.
--+
--+// Flags: --allow-natives-syntax
--+
--+function f(fnConstructor) {
--+    return Object.is(new fnConstructor(), undefined);
--+}
--+
--+const realmIndex = Realm.createAllowCrossRealmAccess();
--+const otherFunction = Realm.global(realmIndex).Function;
--+Realm.detachGlobal(realmIndex);
--+
--+%PrepareFunctionForOptimization(f);
--+assertFalse(f(Function));
--+assertThrows(_ => f(otherFunction));
--+%OptimizeFunctionOnNextCall(f);
--+assertThrows(_ => f(otherFunction));
diff --git a/srcpkgs/electron7/template b/srcpkgs/electron7/template
deleted file mode 100644
index 653f183aba75..000000000000
--- a/srcpkgs/electron7/template
+++ /dev/null
@@ -1,341 +0,0 @@
-# Template file for 'electron7'
-pkgname=electron7
-version=7.3.3
-revision=1
-_nodever=12.8.1
-_chromiumver=78.0.3904.108
-archs="x86_64* aarch64* ppc64le* i686*"
-create_wrksrc=yes
-build_wrksrc="src"
-hostmakedepends="$(vopt_if clang clang) yasm python pkgconf perl gperf bison ninja nodejs hwids
- libwebp-devel freetype-devel harfbuzz-devel libpng-devel nss-devel which git libevent-devel
- pciutils-devel libatomic-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel
- opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel
- alsa-lib-devel re2-devel snappy-devel mit-krb5-devel"
-makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
- libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
- libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
- libXScrnSaver-devel alsa-lib-devel snappy-devel libdrm-devel
- libxml2-devel libxslt-devel $(vopt_if pulseaudio pulseaudio-devel) libexif-devel
- libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel
- libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel
- minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel
- re2-devel fontconfig-devel freetype-devel opus-devel libatomic-devel
- ffmpeg-devel libva-devel libuv-devel c-ares-devel libnotify-devel"
-short_desc="Application development framework based on web technologies"
-maintainer="John <me@johnnynator.dev>"
-license="BSD-3-Clause"
-homepage="https://electronjs.org"
-distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz
- https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz
- https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz"
-checksum="cd216520c38d9669d37704a401e85a88eb5c9e4811cfc1fee37e92acbb54a180
- f9c53839f306d2973de27723360024f7904101d426b9e7e9cdb56e8bcc775b0e
- 11648d586f68ee5fc38e4cadf3974541aac4a67709fa028e9075aff42e28d9b9"
-
-no_generic_pkgconfig_link=yes
-lib32disabled=yes
-nodebug=yes
-nopie=yes  # contains tools that are not PIE, enables PIE itself
-
-# XXX: pulseaudio broken at compile time
-build_options="pulseaudio clang"
-build_options_default="pulseaudio"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default+=" clang"
-fi
-
-if [ "$build_option_clang" ]; then
-	nocross="No proper setup for using clang as cross compiler in void yet"
-elif [ "$CROSS_BUILD" ] && [ "${XBPS_TARGET_MACHINE%%-musl}" = "aarch64" ]; then
-	broken="{standard input}: Error: unaligned opcodes detected in executable segment"
-	# This might also happen with non-cross gcc?
-fi
-
-_buildtype=Release
-_is_debug=false
-
-CFLAGS="-Wno-unknown-warning-option -fPIC"
-CXXFLAGS="-Wno-unknown-warning-option -fPIC"
-
-_apply_patch() {
-	local args="$1" pname="$(basename $2)"
-
-	if [ ! -f ".${pname}_done" ]; then
-		msg_normal "$pkgver: patching: ${pname}.\n"
-		patch -N $args -i $2
-		touch .${pname}_done
-	fi
-}
-
-_get_chromium_arch() {
-	case "$1" in
-		x86_64*) echo x64 ;;
-		i686*) echo x86 ;;
-		arm*) echo arm ;;
-		aarch64*) echo arm64 ;;
-		ppc64*) echo ppc64 ;;
-		ppc*) echo ppc ;;
-		mipsel*) echo mipsel ;;
-		mips*) echo mips ;;
-		*) msg_error "$pkgver: cannot be compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-	esac
-}
-
-post_extract() {
-	ln -s chromium-$_chromiumver src
-	mkdir -p src/third_party/
-	ln -s ../../node-$_nodever src/third_party/electron_node
-	ln -s ../electron-${version} src/electron
-
-}
-
-post_patch() {
-	cd $wrksrc
-	for x in $FILESDIR/patches/*; do
-		case "${x##*/}" in
-			electron*.patch)
-				cd src/electron
-				_apply_patch -p1 "$x"
-				cd "$wrksrc";;
-		esac
-	done
-
-	# Sigh, electron uses git am...
-	python2 src/electron/script/list_patch_targets.py src/electron/patches/config.json | while read -r repopath; do
-		cd "$wrksrc"/"$repopath"
-		git init -q
-		git config "gc.auto" 0
-		if [ "$repopath" != "src" ]; then
-			echo "/${repopath#src/}" >> "$wrksrc/$build_wrksrc/.gitignore"
-		fi
-		git add .
-		git -c 'user.name=Electron build' -c 'user.email=electron@ebuild' \
-			commit -q -m "." || true
-	done
-	cd $wrksrc
-	python2 src/electron/script/apply_all_patches.py src/electron/patches/config.json
-
-	for x in $FILESDIR/patches/*; do
-		case "${x##*/}" in
-			chromium*.patch)
-				cd src
-				_apply_patch -p1 "$x"
-				cd "$wrksrc";;
-		esac
-	done
-
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	for x in $FILESDIR/musl-patches/*; do
-		case "${x##*/}" in
-			chromium*.patch)
-				cd src
-				_apply_patch -p1 "$x"
-				cd "$wrksrc";;
-			electron*.patch)
-				cd src/electron
-				_apply_patch -p1 "$x"
-				cd "$wrksrc";;
-		esac
-	done
-	fi
-}
-
-pre_configure() {
-	cd "$wrksrc/$build_wrksrc"
-
-	# https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion
-	touch chrome/test/data/webui/i18n_process_css_test.html
-	# Use the file at run time instead of effectively compiling it in
-	sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \
-		-i services/device/public/cpp/usb/BUILD.gn
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin
-	ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
-
-	# reusable system library settings
-	local use_system="
-		ffmpeg
-		flac
-		fontconfig
-		freetype
-		harfbuzz-ng
-		libdrm
-		libevent
-		libjpeg
-		libpng
-		libwebp
-		libxml
-		libxslt
-		opus
-		re2
-		snappy
-		yasm
-		zlib
-		"
-	for _lib in $use_system libjpeg_turbo; do
-		msg_normal "Removing buildscripts for system provided $_lib\n"
-		find -type f -path "*third_party/$_lib/*" \
-			\! -path "*third_party/$_lib/chromium/*" \
-			\! -path "*third_party/$_lib/google/*" \
-			\! -path './base/third_party/icu/*' \
-			\! -path './third_party/libxml/*' \
-			\! -path './third_party/pdfium/third_party/freetype/include/pstables.h' \
-			\! -path './third_party/yasm/run_yasm.py' \
-			\! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
-			-delete
-	done
-
-
-	msg_normal "Replacing gn files\n"
-	python2 build/linux/unbundle/replace_gn_files.py --system-libraries \
-		$use_system
-	third_party/libaddressinput/chromium/tools/update-strings.py
-}
-
-do_configure() {
-	local target_arch="$(_get_chromium_arch ${XBPS_TARGET_MACHINE})"
-	local host_arch="$(_get_chromium_arch ${XBPS_MACHINE})"
-	# the build system will set march for use, adding it to cflags will break builds
-	export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} )
-	export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} )
-	local conf=()
-	cd third_party/electron_node
-	if [ "$CROSS_BUILD" ]; then
-		conf_args=" --dest-cpu=${target_arch} --cross-compiling"
-	fi
-	./configure --prefix=/usr \
-		--shared-zlib \
-		--shared-libuv \
-		--shared-openssl \
-		--shared-cares \
-		--openssl-use-def-ca-store \
-		--without-npm \
-		--without-dtrace \
-		--without-bundled-v8 \
-		${conf_args}
-
-	cd "$wrksrc/$build_wrksrc"/electron
-	yarn install
-	cd "$wrksrc/$build_wrksrc"
-
-	if [ "$build_option_clang" ]; then
-		export CC=clang
-		export CXX=clang++
-		export HOST_CC=clang
-		export HOST_CXX=clang++
-	else
-		export CXXFLAGS="$CXXFLAGS -fpermissive"
-		export BUILD_CXXFLAGS="$BUILD_CXXFLAGS -fpermissive"
-		export BUILD_AR="$AR_host"
-		export BUILD_NM="$NM_host"
-	fi
-
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Void Linux use ONLY.
-	conf+=(
-		'google_api_key="AIzaSyA9gWazKaHaNIPPg2hrMj6_ZSG8AFmq738"'
-		'google_default_client_id="126659149423-hoo6ickbk3p1u2qjsdsp0ddciurfvb4t.apps.googleusercontent.com"'
-		'google_default_client_secret="_ozIx2D-DKm_se_2NPwV4l5b"'
-	)
-
-	conf+=(
-		'blink_symbol_level=0'
-		'clang_use_chrome_plugins=false'
-		'closure_compile=true'
-		'custom_toolchain="//build/toolchain/linux/unbundle:default"'
-	)
-	if [ "$CROSS_BUILD" ]; then
-		conf+=(
-			'host_toolchain="//build/toolchain/linux/unbundle:host"'
-			'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"'
-			"host_pkg_config=\"$PKG_CONFIG_FOR_BUILD\""
-			"pkg_config=\"$PKG_CONFIG\""
-		)
-	else
-		conf+=(
-			'host_toolchain="//build/toolchain/linux/unbundle:default"'
-			'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'
-		)
-	fi
-	conf+=(
-		'enable_hangout_services_extension=true'
-		'enable_nacl_nonsfi=false'
-		'enable_nacl=false'
-		'enable_precompiled_headers=false'
-		'fatal_linker_warnings=false'
-		'ffmpeg_branding="Chrome"'
-		'fieldtrial_testing_like_official_build=true'
-		'gold_path="/usr/bin/ld.gold"'
-		'icu_use_data_file=true'
-		"is_clang=$(vopt_if clang true false)"
-		'is_component_build=false'
-		"is_debug=$_is_debug"
-		'is_desktop_linux=true'
-		'linux_use_bundled_binutils=false'
-		'proprietary_codecs=true'
-		'symbol_level=0'
-		'treat_warnings_as_errors=false'
-		'use_allocator_shim=false'
-		'use_allocator="none"'
-		'use_cups=true'
-		'use_custom_libcxx=false'
-		'use_gnome_keyring=false'
-		'use_gold=false'
-		'use_lld=false'
-		"use_pulseaudio=$(vopt_if pulseaudio 'true' 'false')"
-		'use_sysroot=false'
-		'use_system_harfbuzz=true'
-		"target_cpu=\"$target_arch\""
-		"host_cpu=\"$host_arch\""
-		'import("//electron/build/args/release.gn")'
-	)
-
-	msg_normal "Bootstrapping GN\n"
-	CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \
-	CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS}" \
-	LDFLAGS="${XBPS_LDFLAGS}" \
-		python2 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles
-
-	msg_normal "Configuring build\n"
-	out/Release/gn gen out/$_buildtype --args="${conf[*]}"
-}
-
-do_build() {
-	export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} )
-	export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} )
-	if [ "$build_option_clang" ]; then
-		export CC=clang
-		export CXX=clang++
-		export HOST_CC=clang
-		export HOST_CXX=clang++
-	else
-		export BUILD_CXXFLAGS="$BUILD_CXXFLAGS -fpermissive"
-		export CXXFLAGS="$CXXFLAGS -fpermissive"
-		export BUILD_AR="$AR_host"
-		export BUILD_NM="$NM_host"
-	fi
-	msg_normal "Ninja turtles GO!\n"
-	ninja ${makejobs} -C out/$_buildtype electron third_party/electron_node:headers
-	# finish rest of the build
-	strip -s out/$_buildtype/electron
-	ninja ${makejobs} -C out/$_buildtype electron_dist_zip
-}
-
-do_install() {
-	vmkdir /usr/lib/$pkgname
-	vmkdir /usr/include/$pkgname
-	bsdtar -xf out/$_buildtype/dist.zip -C "$DESTDIR/usr/lib/$pkgname"
-
-	chmod u+s "$DESTDIR/usr/lib/$pkgname/chrome-sandbox"
-
-	cp out/$_buildtype/gen/node_headers.tar.gz "$DESTDIR"/usr/include/$pkgname
-
-	vlicense ${wrksrc}/src/LICENSE chromium.LICENSE
-	vlicense ${wrksrc}/src/electron/LICENSE electron.LICENSE
-	vlicense ${wrksrc}/src/third_party/electron_node/LICENSE node.LICENSE
-
-	vmkdir /usr/bin
-	ln -s ../lib/$pkgname/electron "$DESTDIR"/usr/bin/$pkgname
-}
diff --git a/srcpkgs/electron7/update b/srcpkgs/electron7/update
deleted file mode 100644
index 3af8e58b5358..000000000000
--- a/srcpkgs/electron7/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://www.electronjs.org/releases/stable?version=${version%%.*}
-pattern='tag/v\K[\d\.]+(?=")'

From e5332af5cef1580fad28e1886c28c4f74f3b850d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 20 Jan 2021 01:35:30 +0100
Subject: [PATCH 0165/3482] removed-packages: drop mattermost-desktop and
 electron7

electron7 has been EOL for half a year and mattermost still uses
it even in git, with no compatibility with newer versions in sight
---
 srcpkgs/removed-packages/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3afdfe988051..56110cb4d738 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=11
+revision=12
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -24,6 +24,7 @@ replaces="
  dleyna-server<=0.6.0_2
  ebtables<=2.0.10.4_8
  eclipse-ecj<=4.9_3
+ electron7<=7.3.3_1
  enventor<=1.0.0_2
  epstopdf<=2.27_3
  fontmatrix<=0.6.0.20171228_2
@@ -45,6 +46,7 @@ replaces="
  llvm3.9<=3.9.1_5
  ls++-git<=20140919_3
  mac<=3.99u4b5s7_3
+ mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
  mongroup<=0.4.1_2
  phonon-backend-gstreamer<=4.9.0_2

From 2d186b167969ece4cafd4cfdf9bf41aa1fb5c1c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 2 Dec 2020 19:47:39 +0700
Subject: [PATCH 0166/3482] grub: build grub-x86_64-efi for i686, build
 manpages

Close #25267
---
 srcpkgs/grub/template | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 76f9ce3f3686..21321d001c9c 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,8 +1,8 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.04
-revision=3
-hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf"
+revision=4
+hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel fuse-devel"
 depends="os-prober"
@@ -27,10 +27,11 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 	i686*)
 		CFLAGS="-D_FILE_OFFSET_BITS=64"
+		hostmakedepends+=" cross-x86_64-linux-musl"
 		configure_args+=" ac_cv_sizeof_off_t=8"
 		_NATIVE_PLATFORM=pc
-		_SUPPLEMENTARY_BUILDS="i386-efi i386-coreboot i386-xen"
-		subpackages+=" grub-i386-efi grub-i386-coreboot grub-xen"
+		_SUPPLEMENTARY_BUILDS="i386-efi x86_64-efi i386-coreboot i386-xen"
+		subpackages+=" grub-i386-efi grub-x86_64-efi grub-i386-coreboot grub-xen"
 		;;
 	aarch64*)
 		_NATIVE_PLATFORM=efi
@@ -48,12 +49,13 @@ post_extract() {
 
 do_configure() {
 	unset CC AS LD RANLIB CPP
-	CFLAGS="$CFLAGS -fno-stack-protector"
+	local freestanding_cflags="-fno-stack-protector"
 
 	# building with altivec generates broken grub core
 	case "$XBPS_TARGET_MACHINE" in
-		ppc*) CFLAGS="$CFLAGS -mno-altivec" ;;
+		ppc*) freestanding_cflags+=" -mno-altivec" ;;
 	esac
+	CFLAGS+=" $freestanding_cflags"
 
 	configure_args+=" --enable-device-mapper --enable-cache-stats --enable-nls
 		--enable-grub-mkfont --enable-grub-mount --disable-werror
@@ -63,14 +65,11 @@ do_configure() {
 	sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|' configure
 
 	# build tools
-	_configure_args=${configure_args}
-	if [ -n "${_NATIVE_PLATFORM}" ]; then
-		_configure_args="--with-platform=${_NATIVE_PLATFORM} ${_configure_args}"
-	fi
 	msg_normal "Configuring grub tools...\n"
 	mkdir $wrksrc/build
 	cd $wrksrc/build
-	../configure --host=${XBPS_TARGET_MACHINE} ${_configure_args}
+	../configure --host=${XBPS_TARGET_MACHINE} ${configure_args} \
+		${_NATIVE_PLATFORM:+--with-platform=${_NATIVE_PLATFORM}}
 
 	for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
 		_TARGET=${_SUPP_BUILD%%-*}
@@ -78,7 +77,14 @@ do_configure() {
 		msg_normal "Configuring ${_TARGET} ${_PLATFORM} grub...\n"
 		mkdir $wrksrc/${_PLATFORM}_${_TARGET}_build
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
-		../configure --host=${XBPS_TARGET_MACHINE} --target=${_TARGET} --with-platform=${_PLATFORM} ${configure_args} \
+		if [ "$_TARGET" = x86_64 ] &&
+			[ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+			_TARGET=x86_64-linux-musl
+		fi
+		CFLAGS="$freestanding_cflags" \
+		../configure --host=${XBPS_TARGET_MACHINE} \
+			--target=${_TARGET} \
+			--with-platform=${_PLATFORM} ${configure_args} \
 			--disable-efiemu \
 			--libdir=/usr/lib
 	done
@@ -90,14 +96,14 @@ do_build() {
 
 	msg_normal "Building grub tools...\n"
 	cd $wrksrc/build
-	make ${makejobs} &> make.log || tail -n100 make.log
+	make ${makejobs}
 
 	for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
 		_TARGET=${_SUPP_BUILD%%-*}
 		_PLATFORM=${_SUPP_BUILD##*-}
 		msg_normal "Building ${_TARGET} ${_PLATFORM} grub...\n"
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
-		make ${makejobs} &> make.log || tail -n100 make.log
+		make ${makejobs}
 	done
 }
 
@@ -162,7 +168,6 @@ grub-utils_package() {
 	}
 }
 grub-x86_64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - x86_64 EFI support"
 	pkg_install() {
@@ -170,7 +175,6 @@ grub-x86_64-efi_package() {
 	}
 }
 grub-i386-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - i386 EFI support"
 	pkg_install() {
@@ -178,7 +182,6 @@ grub-i386-efi_package() {
 	}
 }
 grub-i386-coreboot_package() {
-	archs=noarch
 	depends="grub>=$version"
 	short_desc+=" - i386 coreboot support"
 	pkg_install() {
@@ -200,7 +203,6 @@ grub-xen_package() {
 	}
 }
 grub-arm64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - arm64 EFI support"
 	pkg_install() {
@@ -208,7 +210,6 @@ grub-arm64-efi_package() {
 	}
 }
 grub-powerpc-ieee1275_package() {
-	archs=noarch
 	depends="grub>=$version powerpc-utils"
 	short_desc+=" - powerpc Open Firmware support"
 	pkg_install() {

From 0a49b95a1e6bcd90a9f63f66c396c2fb06d1c6e0 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <unknown>
Date: Wed, 13 Jan 2021 15:26:53 +0100
Subject: [PATCH 0167/3482] buku: update to 4.5

---
 srcpkgs/buku/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/buku/template b/srcpkgs/buku/template
index 08ba6c8f8743..6912f42091e4 100644
--- a/srcpkgs/buku/template
+++ b/srcpkgs/buku/template
@@ -1,6 +1,6 @@
 # Template file for 'buku'
 pkgname=buku
-version=4.4
+version=4.5
 revision=1
 depends="python3-urllib3 python3-BeautifulSoup4 python3-cryptography
  python3-html5lib"
@@ -9,7 +9,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/Buku"
 distfiles="https://github.com/jarun/Buku/archive/v${version}.tar.gz"
-checksum=c7d755569117ceb85fdda734dcca657e01f6d5252d7d3b9f757faeedfdcac741
+checksum=68c7bb77ba579ce69543e17d7dacaa31164a6662bb183463e8f1ffec2f9d6785
 
 do_install() {
 	vbin buku

From c8b59cc0e9ba696d93f240f8923b91fcf85cd962 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 9 Jan 2021 13:58:11 -0600
Subject: [PATCH 0168/3482] lxcfs: update to 4.0.7.

---
 srcpkgs/lxcfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxcfs/template b/srcpkgs/lxcfs/template
index 187295579e22..5ca756e46501 100644
--- a/srcpkgs/lxcfs/template
+++ b/srcpkgs/lxcfs/template
@@ -1,6 +1,6 @@
 # Template file for 'lxcfs'
 pkgname=lxcfs
-version=4.0.6
+version=4.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Nathan <ndowens@artixlinux.org>"
 license="Apache-2.0"
 homepage="https://linuxcontainers.org/lxcfs/"
 distfiles="https://linuxcontainers.org/downloads/lxcfs/lxcfs-${version}.tar.gz"
-checksum=8bc4dbd3b0bd14379766993b4d5fa34c5331c0c2cc253c4d30797249f6a0096d
+checksum=3f28e2f4b04c0090aaf88b72666505f0313768a5254dd48a14c43cf78c543ec8
 
 make_dirs="/var/lib/lxcfs 0755 root root"
 

From cf39ebf7c6a011b54ae5ab61d18207f151cf2b31 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Jan 2021 22:51:19 +0200
Subject: [PATCH 0169/3482] tcl: update to 8.6.11.

---
 srcpkgs/tcl/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tcl/template b/srcpkgs/tcl/template
index 191acaf46c36..d36663d8b1fa 100644
--- a/srcpkgs/tcl/template
+++ b/srcpkgs/tcl/template
@@ -1,7 +1,7 @@
 # Template file for 'tcl'
 pkgname=tcl
-version=8.6.10
-revision=3
+version=8.6.11
+revision=1
 wrksrc="tcl${version}"
 build_wrksrc=unix
 build_style=gnu-configure
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="TCL"
 homepage="http://www.tcl.tk"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}${version}-src.tar.gz"
-checksum=5196dbf6638e3df8d5c87b5815c8c2b758496eb6f0e41446596c9a4e638d87ed
+checksum=8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258
 
 shlib_provides="libtcl${version%.*}.so"
 
@@ -37,5 +37,6 @@ tcl-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove usr/share/man/man3
+		vmove "usr/lib/*.a"
 	}
 }

From a1ffd3dbe4d128b014d8b72188eeb4f178d58d0e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Jan 2021 22:51:23 +0200
Subject: [PATCH 0170/3482] tk: update to 8.6.11.

---
 srcpkgs/tk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tk/template b/srcpkgs/tk/template
index e8c4f79b460f..d09a878d6256 100644
--- a/srcpkgs/tk/template
+++ b/srcpkgs/tk/template
@@ -1,7 +1,7 @@
 # Template file for 'tk'
 pkgname=tk
-version=8.6.10
-revision=3
+version=8.6.11
+revision=1
 wrksrc="tk${version}"
 build_wrksrc=unix
 build_style=gnu-configure
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:TCL"
 homepage="http://www.tcl.tk"
 distfiles="${SOURCEFORGE_SITE}/tcl/${pkgname}${version}-src.tar.gz"
-checksum=63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386
+checksum=5228a8187a7f70fa0791ef0f975270f068ba9557f57456f51eb02d9d4ea31282
 
 shlib_provides="libtk8.6.so"
 

From 5655a0bb975328835f7098e6c3eeb3068c8c0e71 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Fri, 8 Jan 2021 15:43:46 -0700
Subject: [PATCH 0171/3482] python3-txaio: update to 20.12.1.

---
 srcpkgs/python3-txaio/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-txaio/template b/srcpkgs/python3-txaio/template
index 47dadfa68ed0..e9b27b0a6886 100644
--- a/srcpkgs/python3-txaio/template
+++ b/srcpkgs/python3-txaio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-txaio'
 pkgname=python3-txaio
-version=20.4.1
-revision=2
+version=20.12.1
+revision=1
 wrksrc="txaio-${version}"
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
@@ -10,7 +10,12 @@ maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://github.com/crossbario/txaio"
 distfiles="https://github.com/crossbario/txaio/archive/v${version}.tar.gz"
-checksum=85eb85196c4b566c1b3ada3a1ce06728f0387bb054514d629d3156558a910f21
+checksum=51796ed894c7fca3f15d60f2e42aec0bd933112073de748e4fe67faf62a03387
+
+do_check() {
+	# Depends on deprecated and unmaintained trollius package
+	:
+}
 
 post-install() {
 	vlicense LICENSE

From 0de73c6e6bca2f04f55e63b21719c0348b7512c5 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 12 Jan 2021 07:27:44 +0100
Subject: [PATCH 0172/3482] lilypond: update to 2.22.0

---
 srcpkgs/lilypond/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 9d400b673cb2..c3be0ae65c02 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.21.82
+version=2.22.0
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
@@ -16,8 +16,8 @@ short_desc="Music engraving program"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later, GFDL-1.3-or-later"
 homepage="https://lilypond.org/"
-distfiles="https://lilypond.org/downloads/sources/v2.21/lilypond-${version}.tar.gz"
-checksum=f0bd17cccee771ed4a2e0db1ec81c98d9f52e47090e5dcc085de65dd8cc4bdd9
+distfiles="https://lilypond.org/downloads/sources/v2.22/lilypond-${version}.tar.gz"
+checksum=64ddd03171d247adc243e01a3be3ec2610d97c62b893c253ad02ac50694b0f4e
 python_version=3
 
 if [ -n "${CROSS_BUILD}" ]; then

From f60b617c3a5cb7822892e86892a7c162289566af Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 12 Jan 2021 07:28:31 +0100
Subject: [PATCH 0173/3482] lilypond-doc: update to 2.22.0

---
 srcpkgs/lilypond-doc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index 7c1184d99648..3d5a809a9618 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.21.82
+version=2.22.0
 revision=1
 create_wrksrc=yes
 short_desc="Documentation for the lilypond music engraving program"
@@ -8,7 +8,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later, GFDL-1.3-or-later"
 homepage="http://lilypond.org/"
 distfiles="http://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2"
-checksum=f8cb74f452472b38fd1e67a09405efd0f52d38b3b85a62c5e998a698dd82c2b7
+checksum=2698a407424e29abf834d12376fb33aa1bfa2afa8b7f3537120b0817b982bd8f
 
 do_install() {
 	vmkdir usr

From 0d8589f1931992642affef669a889d659551a627 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sun, 10 Jan 2021 09:24:40 +0100
Subject: [PATCH 0174/3482] shutils/chroot.sh: create symlink for
 /etc/localtime

Currently /etc/localtime is copied from the host to the chroot. Some
software expects /etc/localtime to be a symbolic link it can read to
determine the name of the time zone, so set up the expected link
structure.
---
 common/xbps-src/shutils/chroot.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 8646d7585492..73b98bc7200e 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -106,11 +106,17 @@ chroot_prepare() {
         msg_error "Bootstrap not installed in $XBPS_MASTERDIR, can't continue.\n"
     fi
 
-    # Create some required files.
-    if [ -f /etc/localtime ]; then
-        cp -f /etc/localtime $XBPS_MASTERDIR/etc
-    elif [ -f /usr/share/zoneinfo/UTC ]; then
-        cp -f /usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
+    # Some software expects /etc/localtime to be a symbolic link it can read to
+    # determine the name of the time zone, so set up the expected link
+    # structure.
+    if [ -f /usr/share/zoneinfo/UTC ]; then
+        tzfile=/usr/share/zoneinfo/UTC
+        mkdir -p $XBPS_MASTERDIR/usr/share/zoneinfo
+        cp /usr/share/zoneinfo/UTC $XBPS_MASTERDIR/usr/share/zoneinfo/UTC
+        ln -sf ../usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
+    else
+        # Should never happen.
+        msg_warn "No local timezone configuration file created."
     fi
 
     for f in dev sys proc host boot; do

From 217031dc0749bcfd9190861907ba533e68f072c8 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 20 Jan 2021 01:03:05 +0100
Subject: [PATCH 0175/3482] portage: update to 3.0.14.

---
 srcpkgs/portage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 3f44cd3d6c3e..4fa784964fe8 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.12
+version=3.0.14
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=4f8f4e1547d903f020eedceab6119a640ff2b331da33dc5e07b1634a63859d59
+checksum=59bebfa0aa1ff2ae3f27383f0b6c7f5d271050c080f6bfd3da86c2dcf7395aaf
 
 conf_files="
 	/etc/dispatch-conf.conf

From 767a31d5bb4870814ed09da240641f10db66808c Mon Sep 17 00:00:00 2001
From: whoizit <whoami@systemli.org>
Date: Sat, 9 Jan 2021 10:32:39 +0300
Subject: [PATCH 0176/3482] guitarix2: update to 0.42.1.

---
 srcpkgs/guitarix2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template
index 3aabb9c8ff91..2d066a454c33 100644
--- a/srcpkgs/guitarix2/template
+++ b/srcpkgs/guitarix2/template
@@ -1,6 +1,6 @@
 # Template file for 'guitarix2'
 pkgname=guitarix2
-version=0.42.0
+version=0.42.1
 revision=1
 wrksrc="guitarix-${version}"
 build_style=waf3
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://guitarix.org"
 distfiles="${SOURCEFORGE_SITE}/guitarix/guitarix/guitarix2-${version}.tar.xz"
-checksum=fb1b75b7ea9f140c2b2df50982e14616dcaffaf65425ca531fcf6f27dd956405
+checksum=797e46e07148fba89e46fac4efe73a5b3a98f070bca85db3d143de781b142c80
 
 build_options="avahi bluez"
 desc_option_avahi="Build with avahi support"

From f8ccc0ad17c7bedad85db5c5b055d2add7a4c744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 19 Jan 2021 23:07:01 -0300
Subject: [PATCH 0177/3482] gnuchess: fix segfault on musl.

musl's default thread stack size was too small for gnuchess.

Fixes #28044
---
 srcpkgs/gnuchess/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnuchess/template b/srcpkgs/gnuchess/template
index 914272150db9..9a279566ad5b 100644
--- a/srcpkgs/gnuchess/template
+++ b/srcpkgs/gnuchess/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuchess'
 pkgname=gnuchess
 version=6.2.7
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="readline-devel"
 short_desc="GNU Chess"
@@ -10,3 +10,5 @@ license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/chess/chess.html"
 distfiles="${GNU_SITE}/chess/${pkgname}-${version}.tar.gz"
 checksum=e536675a61abe82e61b919f6b786755441d9fcd4c21e1c82fb9e5340dd229846
+
+LDFLAGS="-Wl,-z,stack-size=2097152"

From 8d4a3dc0784c892b088384eaa3c6c4ec015aec12 Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel@chot.ai>
Date: Wed, 20 Jan 2021 02:43:15 +0000
Subject: [PATCH 0178/3482] dust: update to 0.5.4

---
 srcpkgs/dust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dust/template b/srcpkgs/dust/template
index 62590a742864..080b439e3237 100644
--- a/srcpkgs/dust/template
+++ b/srcpkgs/dust/template
@@ -1,6 +1,6 @@
 # Template file for 'dust'
 pkgname=dust
-version=0.5.3
+version=0.5.4
 revision=1
 build_style=cargo
 short_desc="More intuitive version of du"
@@ -8,7 +8,7 @@ maintainer="Neel <neel@chot.ai>"
 license="Apache-2.0"
 homepage="https://github.com/bootandy/dust"
 distfiles="https://github.com/bootandy/dust/archive/v${version}.tar.gz"
-checksum=f8401257e1cae721019da05a11dd00c2f114121ccd525452b783d472da59b6e8
+checksum=395f0d5f44d5000468dc51a195e4b8e8c0b710a1c75956fb1f9ad08f2fbbc935
 
 post_install() {
 	vdoc README.md

From 41093a600c0f45105e6025d8c1eddcbbfc94352e Mon Sep 17 00:00:00 2001
From: gt7-void <40529120+gt7-void@users.noreply.github.com>
Date: Mon, 18 Jan 2021 14:42:15 -0300
Subject: [PATCH 0179/3482] keepassxc: enable fdosecrets by default

This allows one to use `keepassxc` as a secrets storage via `libsecret`.

Closes: #28020 [via git-merge-pr]
Signed-off-by: Piraty <piraty1@inbox.ru>
---
 srcpkgs/keepassxc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 7778193f5fb2..d110e2fd0431 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
 # Template file for 'keepassxc'
 pkgname=keepassxc
 version=2.6.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
  -DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
@@ -36,7 +36,7 @@ desc_option_keeshare="Include sharing integration with KeeShare"
 desc_option_network="Include networking code (favicon download)"
 desc_option_sshagent="Include SSH agent support"
 desc_option_yubikey="Include YubiKey support"
-build_options_default="autotype browser keeshare network sshagent yubikey"
+build_options_default="autotype browser fdosecrets keeshare network sshagent yubikey"
 
 post_install() {
 	vlicense COPYING

From e5c1272883e2e8c460f9ff7253f9fdf95833cb4f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 20 Jan 2021 01:46:54 +0100
Subject: [PATCH 0180/3482] mirrorbits: remove

depends on geoip-data, which is long broken
---
 srcpkgs/mirrorbits/template | 43 -------------------------------------
 srcpkgs/mirrorbits/update   |  2 --
 2 files changed, 45 deletions(-)
 delete mode 100644 srcpkgs/mirrorbits/template
 delete mode 100644 srcpkgs/mirrorbits/update

diff --git a/srcpkgs/mirrorbits/template b/srcpkgs/mirrorbits/template
deleted file mode 100644
index d1d76406f86e..000000000000
--- a/srcpkgs/mirrorbits/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'mirrorbits'
-pkgname=mirrorbits
-version=0.5.1
-revision=1
-build_style=go
-go_import_path="github.com/etix/mirrorbits"
-go_ldflags="-X ${go_import_path}/core.VERSION=${VERSION}"
-_go_protobuf_version=52132540909e117f2b98b0694383dc0ab1e1deca
-hostmakedepends="govendor git pkg-config protobuf-devel protobuf"
-makedepends="geoip-devel"
-depends="geoip-data redis"
-short_desc="Geographical download redirector"
-maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="MIT"
-homepage="https://github.com/etix/mirrorbits"
-distfiles="
- https://github.com/etix/mirrorbits/archive/v${version}.tar.gz
- https://github.com/golang/protobuf/archive/${_go_protobuf_version}.tar.gz"
-checksum="
- c713c312877aa039415b1f336bf8ca456aa3089a5759c9e6aa9aac8853e165fb
- 5ef8723453af0aeea20f7b6f322345c009560ec23b85d430838bfb5d2f1cde4a"
-patch_args="-Np1"
-
-pre_build() {
-	# Build the protoc-gen-go Protobuf plugin.
-	mkdir -p "${GOPATH}/src/github.com/golang"
-	ln -s "${XBPS_BUILDDIR}/protobuf-${_go_protobuf_version}" "${GOPATH}/src/github.com/golang/protobuf"
-	GOOS= GOARCH= go install github.com/golang/protobuf/protoc-gen-go
-	# Generate mirrorbits RPC code.
-	PATH="${GOPATH}/bin:${PATH}" protoc -I rpc rpc/rpc.proto --go_out=plugins=grpc:rpc
-	# Clean up protoc-gen-go so do_install doesn't package it.
-	rm "${GOPATH}/bin/protoc-gen-go"
-
-	cd "${GOPATH}/src/${go_import_path}"
-	govendor sync
-}
-
-post_install() {
-	vlicense LICENSE.txt
-	vmkdir usr/share/mirrorbits/templates
-	vcopy templates usr/share/mirrorbits/
-	vsconf mirrorbits.conf
-}
diff --git a/srcpkgs/mirrorbits/update b/srcpkgs/mirrorbits/update
deleted file mode 100644
index 1f6df0642491..000000000000
--- a/srcpkgs/mirrorbits/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/etix/mirrorbits/releases"
-pattern='mirrorbits-v\K[\d.]+\d'

From f313f482d48f3f2fc6c69bf338195a8c7c132b7b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 20 Jan 2021 12:28:38 +0100
Subject: [PATCH 0181/3482] qomui: drop geoip dependency

---
 srcpkgs/qomui/patches/remove-geoip-dep.patch | 13 +++++++++++++
 srcpkgs/qomui/template                       |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/qomui/patches/remove-geoip-dep.patch

diff --git a/srcpkgs/qomui/patches/remove-geoip-dep.patch b/srcpkgs/qomui/patches/remove-geoip-dep.patch
new file mode 100644
index 000000000000..662ba3f9ff6e
--- /dev/null
+++ b/srcpkgs/qomui/patches/remove-geoip-dep.patch
@@ -0,0 +1,13 @@
+--- qomui/update.py
++++ qomui/update.py
+@@ -991,9 +991,7 @@
+ 
+                 if ip != 0:
+ 
+-                    country_check = check_output(["geoiplookup", "{}".format(ip)]).decode("utf-8")
+-                    cc = country_check.split(" ")[3].split(",")[0]
+-                    country = country_translate(cc)
++                    country = "Unknown"
+                     self.log.emit(("debug", "importing {}".format(name)))
+                     custom_servers[name] = {
+                                                 "name": name,
diff --git a/srcpkgs/qomui/template b/srcpkgs/qomui/template
index 9d832bd2387c..b74138381bef 100644
--- a/srcpkgs/qomui/template
+++ b/srcpkgs/qomui/template
@@ -1,13 +1,13 @@
 # Template file for 'qomui'
 pkgname=qomui
 version=0.8.2
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="qomui"
 hostmakedepends="python3 python3-setuptools"
 depends="python python3 python3-PyQt5 python3-dbus python3-psutil
  python3-requests python3-BeautifulSoup4 python3-lxml python3-pexpect openvpn
- python3-PyQt5-dbus stunnel geoip geoip-data dnsmasq libcgroup libcgroup-utils
+ python3-PyQt5-dbus stunnel dnsmasq libcgroup libcgroup-utils
  iptables wireguard wireguard-tools openresolv"
 short_desc="OpenVPN Qt management ui"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"

From 4291fc576ddc6ab6bd010b58094824a89dc30c71 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 20 Jan 2021 01:47:08 +0100
Subject: [PATCH 0182/3482] geoip-data: remove

this has failed to fetch distfiles for ages
---
 srcpkgs/geoip-data/template | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 srcpkgs/geoip-data/template

diff --git a/srcpkgs/geoip-data/template b/srcpkgs/geoip-data/template
deleted file mode 100644
index 2a1991ebf9bb..000000000000
--- a/srcpkgs/geoip-data/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'geoip-data'
-pkgname=geoip-data
-version=20171002
-revision=2
-create_wrksrc=yes
-short_desc="Non-DNS IP-to-country resolver C library and utilities (data files)"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="CC-BY-SA-4.0"
-homepage="https://dev.maxmind.com/geoip/legacy/geolite/"
-archs=noarch
-broken="broken URLs, downloads unversioned files that change daily!"
-
-do_fetch() {
-	$XBPS_FETCH_CMD http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
-	$XBPS_FETCH_CMD http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz
-	$XBPS_FETCH_CMD http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
-	$XBPS_FETCH_CMD http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz
-	$XBPS_FETCH_CMD http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
-	$XBPS_FETCH_CMD http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz
-}
-
-do_install() {
-	local f
-	vmkdir usr/share/GeoIP
-	for f in GeoIP GeoIPv6 GeoLiteCity GeoLiteCityv6 GeoIPASNum GeoIPASNumv6; do
-		zcat ../${f}.dat.gz > ${f}.dat
-		rm -f ../${f}.dat.gz
-		vinstall ${f}.dat 644 usr/share/GeoIP
-	done
-}

From 06d3472acdf8ca2777415d2d9301b5dd97126d1a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 20 Jan 2021 12:34:45 +0100
Subject: [PATCH 0183/3482] removed-packages: drop mirrorbits and geoip-data

---
 srcpkgs/removed-packages/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 56110cb4d738..e5e08f74170c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=12
+revision=13
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -28,6 +28,7 @@ replaces="
  enventor<=1.0.0_2
  epstopdf<=2.27_3
  fontmatrix<=0.6.0.20171228_2
+ geoip-data<=20171002_2
  gksu<=2.0.2_4
  go1.4-bootstrap<=20171003_2
  goffice0.8<=0.8.17_6
@@ -48,6 +49,7 @@ replaces="
  mac<=3.99u4b5s7_3
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mirrorbits<=0.5.1_1
  mongroup<=0.4.1_2
  phonon-backend-gstreamer<=4.9.0_2
  phonon-backend-vlc<=0.9.1_3

From cb804fbf85db4bed610d0eed41d1812a0cb40016 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 20 Jan 2021 12:55:11 +0100
Subject: [PATCH 0184/3482] xbps-src: remove noarch

---
 Manual.md                                           |  2 +-
 common/hooks/do-pkg/00-gen-pkg.sh                   |  6 ++----
 .../hooks/post-install/06-strip-and-debug-pkgs.sh   |  2 +-
 common/hooks/post-pkg/00-register-pkg.sh            |  6 ++----
 common/hooks/pre-pkg/04-generate-runtime-deps.sh    |  2 +-
 common/hooks/pre-pkg/05-prepare-32bit.sh            | 13 +------------
 common/hooks/pre-pkg/06-shlib-provides.sh           |  2 +-
 common/xbps-src/shutils/common.sh                   |  9 +--------
 common/xbps-src/shutils/pkgtarget.sh                |  2 +-
 9 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/Manual.md b/Manual.md
index 386daa243621..9c0d094c0fef 100644
--- a/Manual.md
+++ b/Manual.md
@@ -733,7 +733,7 @@ Examples:
 	# Default value (all arches)
 	archs="*"
 	```
-Do not use noarch. It is deprecated and being removed.
+A special value `noarch` used to be available, but has since been removed.
 
 <a id="explain_depends"></a>
 #### About the many types of `depends` variables
diff --git a/common/hooks/do-pkg/00-gen-pkg.sh b/common/hooks/do-pkg/00-gen-pkg.sh
index b809a6dc5eba..f0b70c8eebb8 100644
--- a/common/hooks/do-pkg/00-gen-pkg.sh
+++ b/common/hooks/do-pkg/00-gen-pkg.sh
@@ -104,14 +104,12 @@ hook() {
 	local arch= binpkg= repo= _pkgver= _desc= _pkgn= _pkgv= _provides= \
 		_replaces= _reverts= f= found_dbg_subpkg=
 
-	if [ "${archs// /}" = "noarch" ]; then
-		arch=noarch
-	elif [ -n "$XBPS_TARGET_MACHINE" ]; then
+	if [ -n "$XBPS_TARGET_MACHINE" ]; then
 		arch=$XBPS_TARGET_MACHINE
 	else
 		arch=$XBPS_MACHINE
 	fi
-	if [ "${archs// /}" != "noarch" -a -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then
+	if [ -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then
 		arch=${XBPS_ARCH}
 	fi
 
diff --git a/common/hooks/post-install/06-strip-and-debug-pkgs.sh b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
index 44d8a51fe939..b59dde5ab3cd 100644
--- a/common/hooks/post-install/06-strip-and-debug-pkgs.sh
+++ b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
@@ -59,7 +59,7 @@ create_debug_pkg() {
 hook() {
 	local fname= x= f= _soname= STRIPCMD=
 
-	if [ -n "$nostrip" -o "${archs// /}" = "noarch" ]; then
+	if [ -n "$nostrip" ]; then
 		return 0
 	fi
 
diff --git a/common/hooks/post-pkg/00-register-pkg.sh b/common/hooks/post-pkg/00-register-pkg.sh
index 5dc28c999c9d..ce641cfc850c 100644
--- a/common/hooks/post-pkg/00-register-pkg.sh
+++ b/common/hooks/post-pkg/00-register-pkg.sh
@@ -13,14 +13,12 @@ registerpkg() {
 hook() {
 	local arch= binpkg= pkgdir=
 
-	if [ "${archs// /}" = "noarch" ]; then
-		arch=noarch
-	elif [ -n "$XBPS_TARGET_MACHINE" ]; then
+	if [ -n "$XBPS_TARGET_MACHINE" ]; then
 		arch=$XBPS_TARGET_MACHINE
 	else
 		arch=$XBPS_MACHINE
 	fi
-	if [ "${archs// /}" != "noarch" -a -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then
+	if [ -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then
 		arch=${XBPS_ARCH}
 	fi
 	if [ -n "$repository" ]; then
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index 6e45b7dd3c3d..8ffd3a71d8eb 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -56,7 +56,7 @@ hook() {
 
     mapshlibs=$XBPS_COMMONDIR/shlibs
 
-    if [ "${archs// /}" = "noarch" -o -n "$noverifyrdeps" ]; then
+    if [ -n "$noverifyrdeps" ]; then
         store_pkgdestdir_rundeps
         return 0
     fi
diff --git a/common/hooks/pre-pkg/05-prepare-32bit.sh b/common/hooks/pre-pkg/05-prepare-32bit.sh
index fd6fdf882171..c293222586fd 100644
--- a/common/hooks/pre-pkg/05-prepare-32bit.sh
+++ b/common/hooks/pre-pkg/05-prepare-32bit.sh
@@ -19,10 +19,6 @@ hook() {
 	# This hook will only work when building for x86.
 	if [ "$XBPS_TARGET_MACHINE" != "i686" ]; then
 		return
-	fi 
-	# Ignore noarch pkgs.
-	if [ "${archs// /}" = "noarch" ]; then
-		return
 	fi
 	if [ -z "$lib32mode" ]; then
 		# Library mode, copy only relevant files to new destdir.
@@ -88,7 +84,7 @@ hook() {
 			_deps="$(<${PKGDESTDIR}/rdeps)"
 		fi
 		for f in ${_deps}; do
-			unset found pkgn pkgv _arch _shprovides
+			unset found pkgn pkgv _shprovides
 
 			pkgn="$($XBPS_UHELPER_CMD getpkgdepname $f)"
 			if [ -z "${pkgn}" ]; then
@@ -106,13 +102,6 @@ hook() {
 				printf "${pkgn}-32bit${pkgv} " >> ${destdir32}/rdeps
 				continue
 			fi
-			# If dependency is noarch do not change it to 32bit.
-			_arch=$($XBPS_QUERY_CMD -R --property=architecture "$f")
-			if [ "${_arch}" = "noarch" ]; then
-				echo "   RDEP: $f -> ${pkgn}${pkgv} (noarch)"
-				printf "${pkgn}${pkgv} " >> ${destdir32}/rdeps
-				continue
-			fi
 			# If dependency does not have "shlib-provides" do not
 			# change it to 32bit.
 			for x in ${subpackages}; do
diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/pre-pkg/06-shlib-provides.sh
index cdc94de3bc93..fc39f6bfbe48 100644
--- a/common/hooks/pre-pkg/06-shlib-provides.sh
+++ b/common/hooks/pre-pkg/06-shlib-provides.sh
@@ -45,7 +45,7 @@ collect_sonames() {
 hook() {
 	local _destdir32=${XBPS_DESTDIR}/${pkgname}-32bit-${version}
 
-	if [ -z "$shlib_provides" -a "${archs// /}" = "noarch" -o -n "$noshlibprovides" ]; then
+	if [ -n "$noshlibprovides" ]; then
 		return 0
 	fi
 
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index be75d31e6229..1739124050f7 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -328,7 +328,7 @@ get_subpkgs() {
 
 setup_pkg() {
     local pkg="$1" cross="$2" show_problems="$3"
-    local basepkg val _vars f dbgflags arch extrarepo
+    local basepkg val _vars f dbgflags extrarepo
 
     [ -z "$pkg" ] && return 1
     basepkg=${pkg%-32bit}
@@ -469,13 +469,6 @@ setup_pkg() {
         XBPS_MAKEJOBS=1
     fi
     makejobs="-j$XBPS_MAKEJOBS"
-
-    # strip whitespaces to make "  noarch  " valid too.
-    if [ "${archs// /}" = "noarch" ]; then
-        arch="noarch"
-    else
-        arch="$XBPS_TARGET_MACHINE"
-    fi
     if [ -n "$XBPS_BINPKG_EXISTS" ]; then
         local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver 2>/dev/null)"
         if [ "$_binpkgver" = "$pkgver" ]; then
diff --git a/common/xbps-src/shutils/pkgtarget.sh b/common/xbps-src/shutils/pkgtarget.sh
index e064b7c29116..6c6f03ff726f 100644
--- a/common/xbps-src/shutils/pkgtarget.sh
+++ b/common/xbps-src/shutils/pkgtarget.sh
@@ -3,7 +3,7 @@
 check_pkg_arch() {
     local cross="$1" _arch f match nonegation
 
-    if [ -n "$archs" -a "${archs// /}" != "noarch" ]; then
+    if [ -n "$archs" ]; then
         if [ -n "$cross" ]; then
             _arch="$XBPS_TARGET_MACHINE"
         elif [ -n "$XBPS_ARCH" ]; then

From d4ba149f7c34c091985135dcb8d599e71a884773 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 20 Jan 2021 10:09:45 +0100
Subject: [PATCH 0185/3482] google-chrome: update to 88.0.4324.96

---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index c42eaa649c9e..b182d2ce65e4 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=87.0.4280.141
+_chromeVersion=88.0.4324.96
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=b7edb7cd5c166bf3c0a1d245baa5924e242c3b81b97090468bec778f41f40373
+checksum=4c3fca6ba917db4635368c99df61cd811c5138daa1ad890d4dc4271dd0014124
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 8024e2936456bac1020a1f463adbfbc99eca863b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Aug 2020 22:36:02 +0200
Subject: [PATCH 0186/3482] gcc: update to 10.2.1pre1.

Changed by q66:

we're now using an upstream snapshot from alpine; this should
allow us to get an assortment of regression fixes without having
to patch them in

also libssp fixes for musl, and typo fixes for libstdc++-devel
pkg function

also drop gccgo on 32-bit powerpc

Co-authored-by: q66 <daniel@octaforge.org>
---
 common/shlibs                                 |  8 +-
 srcpkgs/gcc/files/gccgo-musl.patch            | 40 +++++-----
 srcpkgs/gcc/files/libssp-musl.patch           | 29 ++++++-
 srcpkgs/gcc/patches/0010-ldbl128-config.patch | 76 -------------------
 srcpkgs/gcc/patches/invalid_tls_model.patch   | 26 -------
 srcpkgs/gcc/patches/musl-ada.patch            | 22 +++---
 srcpkgs/gcc/template                          | 55 ++++++++------
 7 files changed, 96 insertions(+), 160 deletions(-)
 delete mode 100644 srcpkgs/gcc/patches/0010-ldbl128-config.patch
 delete mode 100644 srcpkgs/gcc/patches/invalid_tls_model.patch

diff --git a/common/shlibs b/common/shlibs
index e98f088266bd..e030495fd63d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -57,7 +57,7 @@ libcc1plugin.so.0 gcc-6.2.1_1
 libitm.so.1 libitm-4.7.3_1
 liblto_plugin.so.0 gcc-4.7.3_1
 libgcc_s.so.1 libgcc-4.4.0_1
-libgo.so.14 libgo-9.1.0_1
+libgo.so.16 libgo-10.2.0_1
 libmpx.so.2 libmpx-6.2.1_1
 libmpxwrappers.so.2 libmpx-6.2.1_1
 libperl.so.5.32 perl-5.32.0_1
@@ -863,8 +863,8 @@ libgdkmm-2.4.so.1 gtkmm2-2.24.0_1
 libgtkmm-2.4.so.1 gtkmm2-2.24.0_1
 libquadmath.so.0 libquadmath-4.4.0_1
 libgfortran.so.5 libgfortran-8.2.0_1
-libgnarl-9.so libada-9.1.0_1
-libgnat-9.so libada-9.1.0_1
+libgnarl-10.so libada-10.2.0_1
+libgnat-10.so libada-10.2.0_1
 libmozjs185.so.1.0 js-1.8.5_1
 libwebp.so.7 libwebp-0.6.0_1
 libwebpmux.so.3 libwebp-0.6.0_1
@@ -1732,7 +1732,7 @@ libextractor_common.so.1 libextractor-1.1_1
 libpano13.so.3 libpano13-2.9.19_1
 libubsan.so.1 libsanitizer-8.2.0_1
 libtsan.so.0 libsanitizer-6.3.0_1
-libasan.so.5 libsanitizer-8.2.0_1
+libasan.so.6 libsanitizer-10.2.0_1
 liblsan.so.0 libsanitizer-6.3.0_1
 libvtv.so.0 libvtv-6.3.0_1
 libatomic.so.1 libatomic-4.9.0_1
diff --git a/srcpkgs/gcc/files/gccgo-musl.patch b/srcpkgs/gcc/files/gccgo-musl.patch
index cc3ed7d17ae6..9b3f3af9b7fb 100644
--- a/srcpkgs/gcc/files/gccgo-musl.patch
+++ b/srcpkgs/gcc/files/gccgo-musl.patch
@@ -162,30 +162,30 @@ URL: https://code.foxkit.us/adelie/packages/tree/master/system/gcc
  fi
  
  if test "${GOOS}" = "aix"; then
---- libgo/runtime/go-signal.c
-+++ libgo/runtime/go-signal.c
-@@ -222,7 +222,11 @@ getSiginfo(siginfo_t *info, void *context __attribute__((unused)))
- #endif
- #ifdef __PPC__
-   #ifdef __linux__
+--- libgo/runtime/go-signal.c	2020-07-23 08:35:19.004402840 +0200
++++ -	2020-08-09 21:35:54.352886232 +0200
+@@ -224,7 +224,11 @@
+ #elif defined(__alpha__) && defined(__linux__)
+ 	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.sc_pc;
+ #elif defined(__PPC__) && defined(__linux__)
 -	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip;
-+    #ifdef __PPC64__
-+	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gp_regs[32];
-+    #else
-+	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gregs[32];
-+    #endif
-   #endif
-   #ifdef _AIX
++	#ifdef __PPC64__
++		ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gp_regs[32];
++	#else
++		ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gregs[32];
++	#endif
+ #elif defined(__PPC__) && defined(_AIX)
  	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
-@@ -343,7 +343,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
-   #endif
- #endif
- 
--#if defined(__PPC__) && defined(__LITTLE_ENDIAN__)
-+#if defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__GLIBC__)
-   #ifdef __linux__
+ #elif defined(__aarch64__) && defined(__linux__)
+@@ -333,7 +337,7 @@
+ 		runtime_printf("sp  %X\n", m->sc_regs[30]);
+ 		runtime_printf("pc  %X\n", m->sc_pc);
+ 	  }
+-#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__linux__)
++#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__linux__) && defined(__GLIBC__)
  	  {
  		mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
+ 		int i;
 --- libgo/sysinfo.c
 +++ libgo/sysinfo.c
 @@ -73,9 +73,6 @@
diff --git a/srcpkgs/gcc/files/libssp-musl.patch b/srcpkgs/gcc/files/libssp-musl.patch
index 8d47b442aa1a..e0b84f9acc97 100644
--- a/srcpkgs/gcc/files/libssp-musl.patch
+++ b/srcpkgs/gcc/files/libssp-musl.patch
@@ -4,9 +4,16 @@ Second part added to prevent gccgo from thinking it can -fsplit-stack on musl.
 
 --- gcc/gcc.c
 +++ gcc/gcc.c
-@@ -876,9 +876,8 @@
+@@ -874,10 +874,15 @@ proper position among the other output files.  */
+ #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
  #endif
  
++#ifdef ENABLE_DEFAULT_SSP
++#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} "
++#else
++#define NO_SSP_SPEC ""
++#endif
++
  #ifndef LINK_SSP_SPEC
  #ifdef TARGET_LIBC_PROVIDES_SSP
 -#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
@@ -15,6 +22,26 @@ Second part added to prevent gccgo from thinking it can -fsplit-stack on musl.
  #else
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
  		       "|fstack-protector-strong|fstack-protector-explicit" \
+@@ -1155,7 +1160,7 @@ static const char *cc1_options =
+  %{-version:--version}\
+  %{-help=*:--help=%*}\
+  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
+- %{fsyntax-only:-o %j} %{-param*}\
++ %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
+  %{coverage:-fprofile-arcs -ftest-coverage}\
+  %{fprofile-arcs|fprofile-generate*|coverage:\
+    %{!fprofile-update=single:\
+--- gcc/params.opt
++++ gcc/params.opt
+@@ -853,7 +853,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
+ The maximum number of SSA_NAME assignments to follow in determining a value.
+ 
+ -param=ssp-buffer-size=
+-Common Joined UInteger Var(param_ssp_buffer_size) Init(8) IntegerRange(1, 65536) Param Optimization
++Common Joined UInteger Var(param_ssp_buffer_size) Init(4) IntegerRange(1, 65536) Param Optimization
+ The lower bound for a buffer to be considered for stack smashing protection.
+ 
+ -param=stack-clash-protection-guard-size=
 --- gcc/config/i386/gnu-user-common.h
 +++ gcc/config/i386/gnu-user-common.h
 @@ -64,9 +64,3 @@ along with GCC; see the file COPYING3.  If not see
diff --git a/srcpkgs/gcc/patches/0010-ldbl128-config.patch b/srcpkgs/gcc/patches/0010-ldbl128-config.patch
deleted file mode 100644
index 35869dd5d0fa..000000000000
--- a/srcpkgs/gcc/patches/0010-ldbl128-config.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 47467f3ab0fb2f2fcede81060fe8bb339d0909eb Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Wed, 28 Feb 2018 00:54:05 +0000
-Subject: [PATCH 10/12] ldbl128 config
-
----
- gcc/configure    | 13 +++++++++++++
- gcc/configure.ac | 16 ++++++++++++++--
- 2 files changed, 27 insertions(+), 2 deletions(-)
-
-diff --git gcc/configure gcc/configure
-index 6121e163259..07ff8597d48 100755
---- gcc/configure
-+++ gcc/configure
-@@ -29309,6 +29309,15 @@ if test "${with_long_double_128+set}" = set; then :
-   withval=$with_long_double_128; gcc_cv_target_ldbl128="$with_long_double_128"
- else
- 
-+      case "$target" in
-+	s390*-*-linux-musl*)
-+	  gcc_cv_target_ldbl128=yes
-+	  ;;
-+	powerpc*-*-linux-musl*)
-+	  gcc_cv_target_ldbl128=no
-+	  ;;
-+	*)
-+
- if test $glibc_version_major -gt 2 \
-   || ( test $glibc_version_major -eq 2 && test $glibc_version_minor -ge 4 ); then :
-   gcc_cv_target_ldbl128=yes
-@@ -29320,6 +29329,10 @@ else
-       && gcc_cv_target_ldbl128=yes
- 
- fi
-+
-+	  ;;
-+      esac
-+
- fi
- 
-     ;;
-diff --git gcc/configure.ac gcc/configure.ac
-index b066cc609e1..6c15ed898c0 100644
---- gcc/configure.ac
-+++ gcc/configure.ac
-@@ -5971,13 +5971,25 @@ case "$target" in
-     AC_ARG_WITH(long-double-128,
-       [AS_HELP_STRING([--with-long-double-128],
- 		      [use 128-bit long double by default])],
--      gcc_cv_target_ldbl128="$with_long_double_128",
-+      gcc_cv_target_ldbl128="$with_long_double_128", [
-+      case "$target" in
-+	s390*-*-linux-musl*)
-+	  gcc_cv_target_ldbl128=yes
-+	  ;;
-+	powerpc*-*-linux-musl*)
-+	  gcc_cv_target_ldbl128=no
-+	  ;;
-+	*)]
-       [GCC_GLIBC_VERSION_GTE_IFELSE([2], [4], [gcc_cv_target_ldbl128=yes], [
-       [gcc_cv_target_ldbl128=no
-       grep '^[ 	]*#[ 	]*define[ 	][ 	]*__LONG_DOUBLE_MATH_OPTIONAL' \
-         $target_header_dir/bits/wordsize.h > /dev/null 2>&1 \
-       && gcc_cv_target_ldbl128=yes
--      ]])])
-+      ]])]
-+      [
-+	  ;;
-+      esac
-+      ])
-     ;;
- esac
- if test x$gcc_cv_target_ldbl128 = xyes; then
--- 
-2.17.1
-
diff --git a/srcpkgs/gcc/patches/invalid_tls_model.patch b/srcpkgs/gcc/patches/invalid_tls_model.patch
deleted file mode 100644
index 598cde5cb3ad..000000000000
--- a/srcpkgs/gcc/patches/invalid_tls_model.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- libgomp/configure.tgt	2018-11-08 18:13:04.000000000 +0100
-+++ libgomp/configure.tgt	2019-06-29 20:06:31.972950350 +0200
-@@ -10,23 +10,6 @@
- #  XCFLAGS		Add extra compile flags to use.
- #  XLDFLAGS		Add extra link flags to use.
- 
--# Optimize TLS usage by avoiding the overhead of dynamic allocation.
--if test $gcc_cv_have_tls = yes ; then
--  case "${target}" in
--
--    *-*-k*bsd*-gnu*)
--	;;
--
--    *-*-linux* | *-*-gnu*)
--	XCFLAGS="${XCFLAGS} -ftls-model=initial-exec -DUSING_INITIAL_EXEC_TLS"
--	;;
--
--    *-*-rtems*)
--	XCFLAGS="${XCFLAGS} -ftls-model=local-exec"
--	;;
--  esac
--fi
--
- # Since we require POSIX threads, assume a POSIX system by default.
- config_path="posix"
- 
diff --git a/srcpkgs/gcc/patches/musl-ada.patch b/srcpkgs/gcc/patches/musl-ada.patch
index 5e91b0476a38..61823684da5a 100644
--- a/srcpkgs/gcc/patches/musl-ada.patch
+++ b/srcpkgs/gcc/patches/musl-ada.patch
@@ -124,27 +124,27 @@ index 0d12f7e..a063b47 100644
  #endif
  
  #if defined (_WIN32)
---- gcc/ada/Makefile.rtl	2019-05-14 21:18:45.217455681 +0200
-+++ gcc/ada/Makefile.rtl	2019-05-14 21:21:30.686464218 +0200
-@@ -1521,7 +1521,7 @@
+--- gcc/ada/Makefile.rtl	2020-07-23 08:35:17.052381336 +0200
++++ -	2020-08-09 19:38:24.230351406 +0200
+@@ -1533,7 +1533,7 @@
+   s-intman.adb<libgnarl/s-intman__posix.adb \
    s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
    $(TRASYM_DWARF_UNIX_PAIRS) \
-   g-sercom.adb<libgnat/g-sercom__linux.adb \
 -  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
 +  s-tsmona.adb<libgnat/s-tsmona.adb \
    a-exetim.adb<libgnarl/a-exetim__posix.adb \
    a-exetim.ads<libgnarl/a-exetim__default.ads \
    s-linux.ads<libgnarl/s-linux.ads \
-@@ -2073,7 +2073,7 @@
+@@ -2083,7 +2083,7 @@
+   s-osinte.adb<libgnarl/s-osinte__posix.adb \
    s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
-   g-sercom.adb<libgnat/g-sercom__linux.adb \
    $(TRASYM_DWARF_UNIX_PAIRS) \
 -  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
 +  s-tsmona.adb<libgnat/s-tsmona.adb \
    $(ATOMICS_TARGET_PAIRS) \
    $(ATOMICS_BUILTINS_TARGET_PAIRS) \
    system.ads<libgnat/system-linux-ppc.ads
-@@ -2102,7 +2102,7 @@
+@@ -2112,7 +2112,7 @@
  endif
  
  # ARM linux, GNU eabi
@@ -153,18 +153,18 @@ index 0d12f7e..a063b47 100644
    LIBGNAT_TARGET_PAIRS = \
    a-intnam.ads<libgnarl/a-intnam__linux.ads \
    s-inmaop.adb<libgnarl/s-inmaop__posix.adb \
-@@ -2297,7 +2297,7 @@
+@@ -2305,7 +2305,7 @@
+   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
    s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
-   g-sercom.adb<libgnat/g-sercom__linux.adb \
    $(TRASYM_DWARF_UNIX_PAIRS) \
 -  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
 +  s-tsmona.adb<libgnat/s-tsmona.adb \
    $(ATOMICS_TARGET_PAIRS) \
    $(ATOMICS_BUILTINS_TARGET_PAIRS) \
    system.ads<libgnat/system-linux-ia64.ads
-@@ -2394,7 +2394,7 @@
+@@ -2401,7 +2401,7 @@
+   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
    s-taspri.ads<libgnarl/s-taspri__posix.ads \
-   g-sercom.adb<libgnat/g-sercom__linux.adb \
    $(TRASYM_DWARF_UNIX_PAIRS) \
 -  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
 +  s-tsmona.adb<libgnat/s-tsmona.adb \
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 4ebca58e89ed..f7fa99383b13 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -1,28 +1,33 @@
 # Template file for 'gcc'
-_majorver=9
-_minorver=${_majorver}.3
+_majorver=10
+_minorver=${_majorver}.2
+_patchver=${_minorver}.1
 _gmp_version=6.2.0
-_mpfr_version=4.0.2
+_mpfr_version=4.1.0
 _mpc_version=1.1.0
 _isl_version=0.21
 
 pkgname=gcc
-version=${_minorver}.0
-revision=9
+# we are using a 10-stable git snapshot alpine is using in order
+# to get regression fixes not yet incorporate into a stable release
+# it should be possible to switch back to stable with 10.3 or 11
+version=${_patchver}pre1
+wrksrc=gcc-${version/pre/_pre}
+revision=1
 short_desc="GNU Compiler Collection"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 homepage="http://gcc.gnu.org"
 license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 # *-musl builders have issues fetching https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
 distfiles="
- ${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz
+ https://dev.alpinelinux.org/~nenolod/gcc-${version/pre/_pre}.tar.xz
  https://gmplib.org/download/gmp/gmp-${_gmp_version}.tar.xz
- https://www.mpfr.org/mpfr-${_mpfr_version}/mpfr-${_mpfr_version}.tar.xz
+ ${GNU_SITE}/mpfr/mpfr-${_mpfr_version}.tar.xz
  ${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz
  http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2"
-checksum="71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+checksum="772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
  258e6cd51b3fbdfc185c716d55f82c08aff57df0c6fbd143cf6ed561267a1526
- 1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a
+ 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f
  6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
  d18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859"
 
@@ -33,10 +38,12 @@ replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0"
 
 _have_gccgo=yes
 
-# MIPS does not have libucontext yet
-# no support for ppcle in gccgo (missing GOARCH and stuff)
+# MIPS is untested and does not have go in crosstoolchains
+# 32-bit PowerPC seems weirdly broken since the 10.x release
+# 32-bit little endian PowerPC has no support at all (no GOARCH)
 case "$XBPS_TARGET_MACHINE" in
-	mips*-musl|ppcle*) _have_gccgo=no ;;
+	ppc64*) ;;
+	mips*-musl|ppc*) _have_gccgo=no ;;
 esac
 
 if [ "$CHROOT_READY" ]; then
@@ -171,6 +178,10 @@ post_extract() {
 pre_configure() {
 	# _FORTIFY_SOURCE needs an optimization level.
 	sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {gcc,libiberty}/configure
+
+	# Do not run fixincludes
+	sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)
 			patch -p0 -i ${FILESDIR}/libgnarl-musl.patch
@@ -331,16 +342,16 @@ do_install() {
 
 	# Make version a symlink of major version to make all versions
 	# from the same series work automagically.
-	mv ${DESTDIR}/usr/lib/gcc/${_triplet}/${version} \
+	mv ${DESTDIR}/usr/lib/gcc/${_triplet}/${_patchver} \
 		${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}
 	ln -sfr ${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver} \
-		${DESTDIR}/usr/lib/gcc/${_triplet}/${version}
+		${DESTDIR}/usr/lib/gcc/${_triplet}/${_patchver}
 
 	# Ditto for c++ headers.
-	mv ${DESTDIR}/usr/include/c++/${version} \
+	mv ${DESTDIR}/usr/include/c++/${_patchver} \
 		${DESTDIR}/usr/include/c++/${_minorver}
 	ln -sfr ${DESTDIR}/usr/include/c++/${_minorver} \
-		${DESTDIR}/usr/include/c++/${version}
+		${DESTDIR}/usr/include/c++/${_patchver}
 
 	# cc symlink
 	ln -sfr ${DESTDIR}/usr/bin/gcc ${DESTDIR}/usr/bin/cc
@@ -349,7 +360,7 @@ do_install() {
 
 	# lto plugin symlink
 	vmkdir usr/lib/bfd-plugins
-	ln -sfr ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/liblto_plugin.so \
+	ln -sfr ${DESTDIR}/usr/lib/gcc/${_triplet}/${_patchver}/liblto_plugin.so \
 		${DESTDIR}/usr/lib/bfd-plugins
 
 	# Remove "fixed" header
@@ -364,8 +375,8 @@ do_install() {
 	rm -f ${DESTDIR}/usr/lib/*.py
 
 	# Remove more python stuff.
-	if [ -d ${DESTDIR}/usr/share/gcc-${version}/python ]; then
-		rm -rf ${DESTDIR}/usr/share/gcc-${version}/python
+	if [ -d ${DESTDIR}/usr/share/gcc-${_patchver}/python ]; then
+		rm -rf ${DESTDIR}/usr/share/gcc-${_patchver}/python
 	fi
 
 	# Install c89 and c99 wrappers and its manpages, from NetBSD.
@@ -438,7 +449,7 @@ gcc-fortran_package() {
 		if [ "$CROSS_BUILD" ]; then
 			# A number of OMP modules are not built when cross
 			# compiling gcc. Copy them from the cross compiler.
-			local src="/usr/lib/gcc/${_triplet}/${version}/finclude"
+			local src="/usr/lib/gcc/${_triplet}/${_patchver}/finclude"
 			local dst="usr/lib/gcc/${_triplet}/${_minorver}/finclude"
 			for f in omp_lib.f90 omp_lib.h omp_lib.mod omp_lib_kinds.mod \
 				openacc.f90 openacc.mod openacc_kinds.mod openacc_lib.h; do
@@ -697,8 +708,8 @@ libstdc++-devel_package() {
 	depends="libstdc++>=${_minorver}"
 	short_desc+=" - Standard C++ Library - development files"
 	pkg_install() {
-		vmove "usr/lib/libstdc++.*a"
-		vmove "usr/lib/libsupc++.*"
+		vmove "usr/lib/libstdc++*.a"
+		vmove "usr/lib/libsupc++.a"
 		vmove usr/include/c++
 	}
 }

From 761b3788546b141f818706210a9ce5f6042f5414 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 15:46:26 +0100
Subject: [PATCH 0187/3482] build-style/go: drop 32-bit ppc from gccgo

this will always give us trouble, and probably is not worth
supporting
---
 common/environment/build-style/go.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/environment/build-style/go.sh b/common/environment/build-style/go.sh
index f3b4514d4578..337b5279d0eb 100644
--- a/common/environment/build-style/go.sh
+++ b/common/environment/build-style/go.sh
@@ -9,8 +9,7 @@ else
 	# gccgo compiler
 	if [ -z "$archs" ]; then
 		# we have support for these in our gcc
-		# ppcle is missing, and mips doesn't have go in cross yet
-		archs="aarch64* armv[567]* i686* x86_64* ppc64* ppc ppc-musl"
+		archs="aarch64* armv[567]* i686* x86_64* ppc64*"
 	fi
 	if [ "$CROSS_BUILD" ]; then
 		# target compiler to use; otherwise it'll just call gccgo

From 6ae6e7f02680b10f0b56e82ac2dabd0a9c466548 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 15:57:14 +0100
Subject: [PATCH 0188/3482] gcc: nocross for now

---
 srcpkgs/gcc/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index f7fa99383b13..183451d352df 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -35,6 +35,7 @@ nopie=yes
 lib32disabled=yes
 bootstrap=yes
 replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0"
+nocross=yes
 
 _have_gccgo=yes
 

From 2d80cf4c4987308afaa1a197115e38b86ee7e342 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:00:28 +0100
Subject: [PATCH 0189/3482] build-style/void-cross: enable patching binutils

---
 common/build-style/void-cross.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index e923c8460254..e1a808369e47 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -41,12 +41,11 @@ _void_cross_build_binutils() {
 	msg_normal "Patching binutils for ${cross_triplet}\n"
 
 	cd ${wrksrc}/binutils-${ver}
-	# enable when crosstoolchains are updated to latest binutils
-	#if [ -d "${XBPS_SRCPKGDIR}/binutils/patches" ]; then
-	#	for f in ${XBPS_SRCPKGDIR}/binutils/patches/*.patch; do
-	#		_void_cross_apply_patch -p1 "$f"
-	#	done
-	#fi
+	if [ -d "${XBPS_SRCPKGDIR}/binutils/patches" ]; then
+		for f in ${XBPS_SRCPKGDIR}/binutils/patches/*.patch; do
+			_void_cross_apply_patch -p1 "$f"
+		done
+	fi
 	cd ..
 
 	msg_normal "Building binutils for ${cross_triplet}\n"

From 0caccad4ccbb1d79ba16f9d056028a79e703d680 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Jan 2021 21:46:22 +0100
Subject: [PATCH 0190/3482] build-style/void-cross: fix build with 5.10 kernel
 headers

---
 common/build-style/void-cross.sh | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index e1a808369e47..a0783559b239 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -174,10 +174,11 @@ _void_cross_build_kernel_headers() {
 
 	cd linux-${ver}
 
-	make ARCH=$cross_linux_arch headers_check
-	make ARCH=$cross_linux_arch \
-		INSTALL_HDR_PATH=${wrksrc}/build_root/usr/${cross_triplet}/usr \
-		headers_install
+	make ARCH=${cross_linux_arch} headers
+	find usr/include -name '.*' -delete
+	rm usr/include/Makefile
+	rm -r usr/include/drm
+	cp -a usr/include ${wrksrc}/build_root/usr/${cross_triplet}/usr
 
 	touch ${wrksrc}/.linux_headers_done
 }
@@ -533,11 +534,7 @@ do_install() {
 
 	# Install Linux headers
 	cd ${wrksrc}/linux-$(cat ${wrksrc}/.linux_version)
-	make ARCH=${cross_linux_arch} \
-		INSTALL_HDR_PATH=${DESTDIR}/${sysroot}/usr headers_install
-	rm -f $(find ${DESTDIR}/${sysroot}/usr/include \
-		-name .install -or -name ..install.cmd)
-	rm -rf ${DESTDIR}/${sysroot}/usr/include/drm
+	cp -a usr/include ${DESTDIR}/${sysroot}/usr
 
 	# Install binutils
 	cd ${wrksrc}/binutils_build

From a40f4cd82b8418fd718846ac69078347dabda5b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 1 Jan 2021 22:13:51 +0100
Subject: [PATCH 0191/3482] build-style/void-cross: disable usage of fixincl,
 it breaks glibc and does nothing for musl

---
 common/build-style/void-cross.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index a0783559b239..5408bd9ef205 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -91,6 +91,10 @@ _void_cross_build_bootstrap_gcc() {
 	msg_normal "Patching GCC for ${cross_triplet}\n"
 
 	cd ${wrksrc}/gcc-${ver}
+
+	# Do not run fixincludes
+	sed -i 's@./fixinc.sh@-c true@' Makefile.in
+
 	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
 		_void_cross_apply_patch -p0 "$f"
 	done

From 599b7fef670cc9700edd2a8ffc7983c0c79672ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 1 Jan 2021 17:29:22 +0100
Subject: [PATCH 0192/3482] build-style/void-cross: remove
 enable-obsolete-{rpc,nsl} from glibc

also enable glibc cross toolchains on musl
---
 common/build-style/void-cross.sh             | 4 ----
 common/environment/build-style/void-cross.sh | 7 -------
 2 files changed, 11 deletions(-)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 5408bd9ef205..10c89e681c9d 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -220,8 +220,6 @@ _void_cross_build_glibc_headers() {
 		--host=${tgt} \
 		--with-headers=${wrksrc}/build_root/usr/${tgt}/usr/include \
 		--config-cache \
-		--enable-obsolete-rpc \
-		--enable-obsolete-nsl \
 		--enable-kernel=2.6.27 \
 		${cross_glibc_configure_args}
 
@@ -262,8 +260,6 @@ _void_cross_build_glibc() {
 		--host=${tgt} \
 		--with-headers=${wrksrc}/build_root/usr/${tgt}/usr/include \
 		--config-cache \
-		--enable-obsolete-rpc \
-		--enable-obsolete-nsl \
 		--disable-profile \
 		--disable-werror \
 		--enable-kernel=2.6.27 \
diff --git a/common/environment/build-style/void-cross.sh b/common/environment/build-style/void-cross.sh
index 08d1585e95c3..62ce9eaa2e4a 100644
--- a/common/environment/build-style/void-cross.sh
+++ b/common/environment/build-style/void-cross.sh
@@ -4,10 +4,3 @@ create_wrksrc=yes
 
 nostrip_files+=" libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a"
-
-# glibc crosstoolchains not available on musl hosts yet
-if [ -z "$archs" -a "${cross_triplet/-musl}" = "${cross_triplet}" ]; then
-	if [ "$XBPS_TARGET_LIBC" != "glibc" ]; then
-		archs="~*-musl"
-	fi
-fi

From dd50c1905d5c1839f870b01a96dcc0360a0198bf Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:04:01 +0100
Subject: [PATCH 0193/3482] build-style/void-cross: fix for newer libucontext +
 autoguess arch

---
 common/build-style/void-cross.sh | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 10c89e681c9d..6d57c288676d 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -312,14 +312,33 @@ _void_cross_build_libucontext() {
 	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
 
 	local ver=$1
+	local arch incpath
 
 	msg_normal "Building libucontext for ${cross_triplet}\n"
 
+	case "$cross_triplet" in
+		x86_64*) arch=x86_64 ;;
+		i686*) arch=x86 ;;
+		powerpc64*) arch=ppc64 ;;
+		powerpc*) arch=ppc ;;
+		mips*64*) arch=mips64 ;;
+		mips*) arch=mips ;;
+		aarch64*) arch=aarch64 ;;
+		arm*) arch=arm ;;
+		riscv64*) arch=riscv64 ;;
+		s390x*) arch=s390x ;;
+		*) msg_error "Unknown libucontext arch for ${cross_triplet}\n" ;;
+	esac
+
 	cd ${wrksrc}/libucontext-${ver}
 	# a terrible hack but seems to work for now
+	# we build a static-only library to prevent linking to a runtime
+	# since it's tiny it can be linked into libgo and we don't have
+	# to keep it around (which would possibly conflict with crossdeps)
+	incpath="${wrksrc}/build_root/usr/${cross_triplet}/usr/include"
 	CC="${cross_triplet}-gcc" AS="${cross_triplet}-as" AR="${cross_triplet}-ar" \
-	CPPFLAGS="-pipe ${cross_musl_cflags} -g0 -Os -nostdinc -isystem ${wrksrc}/build_root/usr/${cross_triplet}/usr/include" \
-	make ARCH=${cross_libucontext_arch} libucontext.a
+	make ARCH=$arch libucontext.a \
+		CFLAGS="${cross_musl_cflags} -g0 -nostdinc -isystem ${incpath}"
 
 	cp libucontext.a ${wrksrc}/build_root/usr/${cross_triplet}/usr/lib
 

From 76f3a1d0b7b4bfe1b7e032ca25cdb4c7333fbdd4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:07:24 +0100
Subject: [PATCH 0194/3482] build-style/void-cross: remove linux and
 libucontext arch vars

---
 Manual.md                        |  4 +---
 common/build-style/void-cross.sh | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Manual.md b/Manual.md
index 9c0d094c0fef..ed73ec338fa5 100644
--- a/Manual.md
+++ b/Manual.md
@@ -963,9 +963,7 @@ the out of source build by `meson_builddir`
 
 - `void-cross` For cross-toolchain packages used to build Void systems. You will need to
 specify `cross_triplet` (corresponds to the target triplet specified in the cross profile
-for the target arch), `cross_linux_arch` (the architecture name in the Linux kernel source)
-and when building Go support for musl targets, also `cross_libucontext_arch` (see `libucontext`
-for available ones). Optionally, `cross_gcc_skip_go` can be specified. Individual subproject
+for the target arch). Optionally, `cross_gcc_skip_go` can be specified. Individual subproject
 configure arguments can be specified via `cross_*_configure_args` where `*` is `binutils`,
 `gcc_bootstrap` (early gcc), `gcc` (final gcc), `glibc` (or `musl`), `configure_args` is
 additionally passed to both early and final `gcc`. You can also specify custom `CFLAGS`
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 6d57c288676d..2f6e6370762d 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -4,8 +4,6 @@
 # Mandatory variables:
 #
 # - cross_triplet - the target triplet (e.g. aarch64-linux-gnu)
-# - cross_linux_arch - the source ARCH of the kernel (e.g. arm64)
-# - cross_libucontext_arch - only on musl without cross_gcc_skip_go
 #
 # Optional variables:
 #
@@ -165,6 +163,7 @@ _void_cross_build_kernel_headers() {
 	[ -f ${wrksrc}/.linux_headers_done ] && return 0
 
 	local ver=$1
+	local arch
 
 	msg_normal "Patching Linux headers for ${cross_triplet}\n"
 
@@ -178,7 +177,18 @@ _void_cross_build_kernel_headers() {
 
 	cd linux-${ver}
 
-	make ARCH=${cross_linux_arch} headers
+	case "$cross_triplet" in
+		x86_64*|i686*) arch=x86 ;;
+		powerpc*) arch=powerpc ;;
+		mips*) arch=mips ;;
+		aarch64*) arch=arm64 ;;
+		arm*) arch=arm ;;
+		riscv*) arch=riscv ;;
+		s390*) arch=s390 ;;
+		*) msg_error "Unknown Linux arch for ${cross_triplet}\n" ;;
+	esac
+
+	make ARCH=${arch} headers
 	find usr/include -name '.*' -delete
 	rm usr/include/Makefile
 	rm -r usr/include/drm
@@ -421,13 +431,6 @@ _void_cross_build_gcc() {
 	touch ${wrksrc}/.gcc_build_done
 }
 
-_void_cross_check_var() {
-	local var="cross_${1}"
-	if [ -z "${!var}" ]; then
-		msg_error "cross_${1} not defined in template"
-	fi
-}
-
 _void_cross_test_ver() {
 	local proj=$1
 	local noerr=$2
@@ -470,14 +473,11 @@ do_build() {
 		libc_ver=$(cat .musl_version)
 		if [ -z "$cross_gcc_skip_go" ]; then
 			_void_cross_test_ver libucontext
-			_void_cross_check_var libucontext_arch
 			libucontext_ver=$(cat .libucontext_version)
 		fi
 	fi
 
-	# Verify triplet
-	_void_cross_check_var triplet
-	_void_cross_check_var linux_arch
+	[ "${cross_triplet}" ] || msg_error "cross_triplet not defined in template\n"
 
 	local sysroot="/usr/${cross_triplet}"
 

From 3cee024b0d9ad93ff954cc072425fadf22b48d1c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 17:28:29 +0100
Subject: [PATCH 0195/3482] build-style/void-cross: add minor-versioned gcc
 sylinks

---
 common/build-style/void-cross.sh | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 2f6e6370762d..5ce5a0d43603 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -550,6 +550,7 @@ do_install() {
 	ln -sf usr/lib ${DESTDIR}/${sysroot}/lib
 	ln -sf usr/lib ${DESTDIR}/${sysroot}/lib${ws}
 	ln -sf lib ${DESTDIR}/${sysroot}/usr/lib${ws}
+	ln -sf usr/include ${DESTDIR}/${sysroot}/include
 
 	# Install Linux headers
 	cd ${wrksrc}/linux-$(cat ${wrksrc}/.linux_version)
@@ -566,6 +567,11 @@ do_install() {
 	# Move libcc1.so* to the sysroot
 	mv ${DESTDIR}/usr/lib/libcc1.so* ${DESTDIR}/${sysroot}/usr/lib
 
+	local gcc_ver=$(cat ${wrksrc}/.gcc_version)
+	local gcc_patch=${gcc_ver/_*}
+	local gcc_minor=${gcc_patch%.*}
+	local gcc_major=${gcc_minor%.*}
+
 	if [ -f ${wrksrc}/.musl_version ]; then
 		# Install musl
 		cd ${wrksrc}/musl_build
@@ -584,20 +590,29 @@ do_install() {
 		make install_root=${DESTDIR}/${sysroot} install install-headers
 
 		# Remove bad header
-		rm -f ${DESTDIR}/usr/lib/gcc/${cross__triplet}/*/include-fixed/bits/statx.h
+		rm -f ${DESTDIR}/usr/lib/gcc/${cross_triplet}/${gcc_patch}/include-fixed/bits/statx.h
 	fi
 
-	local gcc_ver=$(cat ${wrksrc}/.gcc_version)
+	# minor-versioned symlinks
+	mv ${DESTDIR}/usr/lib/gcc/${cross_triplet}/${gcc_patch} \
+		${DESTDIR}/usr/lib/gcc/${cross_triplet}/${gcc_minor}
+	ln -sfr ${DESTDIR}/usr/lib/gcc/${cross_triplet}/${gcc_minor} \
+		${DESTDIR}/usr/lib/gcc/${cross_triplet}/${gcc_patch}
+
+	# ditto for c++ headers
+	mv ${DESTDIR}/${sysroot}/usr/include/c++/${gcc_patch} \
+		${DESTDIR}/${sysroot}/usr/include/c++/${gcc_minor}
+	ln -sfr ${DESTDIR}/${sysroot}/usr/include/c++/${gcc_minor} \
+		${DESTDIR}/${sysroot}/usr/include/c++/${gcc_patch}
 
 	# Symlinks for gnarl and gnat shared libraries
-	local majorver=${gcc_ver%.*.*}
-	local adalib=usr/lib/gcc/${_triplet}/${gcc_ver}/adalib
-	mv ${DESTDIR}/${adalib}/libgnarl-${majorver}.so \
+	local adalib=usr/lib/gcc/${_triplet}/${gcc_patch}/adalib
+	mv ${DESTDIR}/${adalib}/libgnarl-${gcc_major}.so \
 		${DESTDIR}/${sysroot}/usr/lib
-	mv ${DESTDIR}/${adalib}/libgnat-${majorver}.so \
+	mv ${DESTDIR}/${adalib}/libgnat-${gcc_major}.so \
 		${DESTDIR}/${sysroot}/usr/lib
-	ln -sf libgnarl-${majorver}.so ${DESTDIR}/${sysroot}/usr/lib/libgnarl.so
-	ln -sf libgnat-${majorver}.so ${DESTDIR}/${sysroot}/usr/lib/libgnat.so
+	ln -sf libgnarl-${gcc_major}.so ${DESTDIR}/${sysroot}/usr/lib/libgnarl.so
+	ln -sf libgnat-${gcc_major}.so ${DESTDIR}/${sysroot}/usr/lib/libgnat.so
 	rm -vf ${DESTDIR}/${adalib}/libgna{rl,t}.so
 
 	# Remove unnecessary libatomic which is only built for gccgo

From 886a5e77ec13b418cf7f55b977f4bfd8cb12936a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:04 +0100
Subject: [PATCH 0196/3482] cross-aarch64-linux-gnu: update to gcc 10.2.1pre1

---
 srcpkgs/cross-aarch64-linux-gnu/template | 32 +++++++++++++-----------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index bd1625c09fcb..3d43f58afcbe 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -1,15 +1,15 @@
 # Template file for 'cross-aarch64-linux-gnu'
 _triplet=aarch64-linux-gnu
-_binutils_version=2.32
-_gcc_version=9.3.0
-_glibc_version=2.30
-_linux_version=4.19
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
+_glibc_version=2.32
+_linux_version=5.10.4
 pkgname=cross-${_triplet}
-version=0.33
-revision=3
+version=0.34
+revision=1
 build_style=void-cross
 configure_args="--with-arch=armv8-a"
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -18,23 +18,27 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
- e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
+ 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_linux_arch=arm64
 cross_glibc_cflags="-O2 -march=armv8-a"
 
 if [ "$XBPS_TARGET_MACHINE" = "aarch64" ]; then
 	broken="Can't build crosstoolchain to itself"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	ppc*|mips*) broken="no gccgo support";;
+esac
+
 cross-aarch64-linux-gnu-libc_package() {
 	short_desc+=" - glibc files"
 	nostrip=yes

From 25bf559096a74e019a9f14374cd0fb2b0a2b3089 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:04 +0100
Subject: [PATCH 0197/3482] cross-aarch64-linux-musl: update to gcc 10.2.1pre1

---
 srcpkgs/cross-aarch64-linux-musl/template | 37 ++++++++++++-----------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 4a85364ee1f4..e5c31cb6583e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -1,16 +1,16 @@
 # Template file for 'cross-aarch64-linux-musl'
 _triplet=aarch64-linux-musl
-_binutils_version=2.32
-_gcc_version=9.3.0
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
 _musl_version=1.1.24
-_linux_version=4.19
-_libucontext_version=0.9.0
+_linux_version=5.10.4
+_libucontext_version=1.0
 pkgname=cross-${_triplet}
-version=0.33
-revision=4
+version=0.34
+revision=1
 build_style=void-cross
 configure_args="--with-arch=armv8-a"
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -19,26 +19,29 @@ homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
- http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
- https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
+ https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_libucontext_arch=aarch64
-cross_linux_arch=arm64
 cross_musl_cflags="-O2 -march=armv8-a"
 
 if [ "$XBPS_TARGET_MACHINE" = "aarch64-musl" ]; then
 	broken="Can't build crosstoolchain to itself"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	ppc*|mips*) broken="no gccgo support";;
+esac
+
 cross-aarch64-linux-musl-libc_package() {
 	short_desc+=" - libc files"
 	nostrip=yes

From 827b804a539a5281242397cb98320a696484281f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:04 +0100
Subject: [PATCH 0198/3482] cross-arm-linux-gnueabihf: update to gcc 10.2.1pre1

---
 srcpkgs/cross-arm-linux-gnueabi/template   |  5 ++++
 srcpkgs/cross-arm-linux-gnueabihf/template | 32 ++++++++++++----------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index b327949889b7..08839289c49d 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -37,6 +37,11 @@ if [ "$XBPS_TARGET_MACHINE" = "armv5tel" ]; then
 	broken="Can't build crosstoolchain to itself"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	ppc*|mips*) broken="no gccgo support";;
+esac
+
 cross-arm-linux-gnueabi-libc_package() {
 	short_desc+=" - glibc files"
 	nostrip=yes
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index af95b141ae83..19f29bc2790f 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -1,15 +1,15 @@
 # Template file for 'cross-arm-linux-gnueabihf'
 _triplet=arm-linux-gnueabihf
-_binutils_version=2.32
-_gcc_version=9.3.0
-_glibc_version=2.30
-_linux_version=4.19
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
+_glibc_version=2.32
+_linux_version=5.10.4
 pkgname=cross-${_triplet}
-version=0.33
-revision=2
+version=0.34
+revision=1
 build_style=void-cross
 configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -18,23 +18,27 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
- e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
+ 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_linux_arch=arm
 cross_glibc_cflags="-Os -march=armv6 -mfpu=vfp -mfloat-abi=hard"
 
 if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
 	broken="Can't build crosstoolchain to itself"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	ppc*|mips*) broken="no gccgo support";;
+esac
+
 cross-arm-linux-gnueabihf-libc_package() {
 	short_desc+=" - glibc files"
 	nostrip=yes

From 620b9eca12a76112cc5bea6b08e0aa1bb932578a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:04 +0100
Subject: [PATCH 0199/3482] cross-arm-linux-gnueabi: update to gcc 10.2.1pre1

---
 srcpkgs/cross-arm-linux-gnueabi/template | 27 ++++++++++++------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index 08839289c49d..5b046ff94b9f 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -1,15 +1,15 @@
 # Template file for 'cross-arm-linux-gnueabi'
 _triplet=arm-linux-gnueabi
-_binutils_version=2.32
-_gcc_version=9.3.0
-_glibc_version=2.30
-_linux_version=4.19
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
+_glibc_version=2.32
+_linux_version=5.10.4
 pkgname=cross-${_triplet}
-version=0.33
-revision=2
+version=0.34
+revision=1
 build_style=void-cross
 configure_args="--with-arch=armv5te --with-float=soft"
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -18,17 +18,16 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
- e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
+ 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_linux_arch=arm
 cross_binutils_configure_args="--without-fp"
 cross_glibc_configure_args="--without-fp"
 cross_glibc_cflags="-Os -march=armv5te -msoft-float -mfloat-abi=soft"

From 1b463dda61e063c6c2def30359edd6724fda719d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:04 +0100
Subject: [PATCH 0200/3482] cross-arm-linux-musleabihf: update to gcc
 10.2.1pre1

---
 srcpkgs/cross-arm-linux-musleabi/template   |  5 +++
 srcpkgs/cross-arm-linux-musleabihf/template | 37 +++++++++++----------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 02d7dcc85c86..467ec8582adc 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -40,6 +40,11 @@ if [ "$XBPS_TARGET_MACHINE" = "armv5tel-musl" ]; then
 	broken="Can't build crosstoolchain to itself"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	ppc*|mips*) broken="no gccgo support";;
+esac
+
 cross-arm-linux-musleabi-libc_package() {
 	short_desc+=" - libc files"
 	nostrip=yes
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 3a02bd7c5964..2722c5b2feab 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -1,16 +1,16 @@
 # Template file for 'cross-arm-linux-musleabihf'
 _triplet=arm-linux-musleabihf
-_binutils_version=2.32
-_gcc_version=9.3.0
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
 _musl_version=1.1.24
-_linux_version=4.19
-_libucontext_version=0.9.0
+_linux_version=5.10.4
+_libucontext_version=1.0
 pkgname=cross-${_triplet}
-version=0.33
-revision=3
+version=0.34
+revision=1
 build_style=void-cross
 configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -19,26 +19,29 @@ homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
- http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
- https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
+ https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_libucontext_arch=arm
-cross_linux_arch=arm
 cross_musl_cflags="-Os -march=armv6 -mfpu=vfp -mfloat-abi=hard"
 
 if [ "$XBPS_TARGET_MACHINE" = "armv6l-musl" ]; then
 	broken="Can't build crosstoolchain to itself"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	ppc*|mips*) broken="no gccgo support";;
+esac
+
 cross-arm-linux-musleabihf-libc_package() {
 	short_desc+=" - libc files"
 	nostrip=yes

From cc8e5a9b055e8880755597665ea662ef307eb01d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:04 +0100
Subject: [PATCH 0201/3482] cross-arm-linux-musleabi: update to gcc 10.2.1pre1

---
 srcpkgs/cross-arm-linux-musleabi/template | 32 +++++++++++------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 467ec8582adc..21225952689d 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -1,16 +1,16 @@
 # Template file for 'cross-arm-linux-musleabi'
 _triplet=arm-linux-musleabi
-_binutils_version=2.32
-_gcc_version=9.3.0
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
 _musl_version=1.1.24
-_linux_version=4.19
-_libucontext_version=0.9.0
+_linux_version=5.10.4
+_libucontext_version=1.0
 pkgname=cross-${_triplet}
-version=0.33
-revision=3
+version=0.34
+revision=1
 build_style=void-cross
 configure_args="--with-arch=armv5te --with-float=soft"
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -19,20 +19,18 @@ homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
- http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
- https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
+ https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_libucontext_arch=arm
-cross_linux_arch=arm
 cross_binutils_configure_args="--without-fp"
 cross_musl_cflags="-Os -march=armv5te -msoft-float -mfloat-abi=soft"
 

From 175076c9d0d723e01c31e2a5a51f8522a81eb511 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:05 +0100
Subject: [PATCH 0202/3482] cross-armv7l-linux-gnueabihf: update to gcc
 10.2.1pre1

---
 srcpkgs/cross-armv7l-linux-gnueabihf/template | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index d59d9d11929e..abe150f2a27b 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -1,15 +1,15 @@
 # Template file for 'cross-armv7l-linux-gnueabihf'
 _triplet=armv7l-linux-gnueabihf
-_binutils_version=2.32
-_gcc_version=9.3.0
-_glibc_version=2.30
-_linux_version=4.19
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
+_glibc_version=2.32
+_linux_version=5.10.4
 pkgname=cross-${_triplet}
-version=0.33
-revision=2
+version=0.34
+revision=1
 build_style=void-cross
 configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -18,23 +18,27 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
- e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
+ 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_linux_arch=arm
 cross_glibc_cflags="-O2 -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 
 if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
 	broken="Can't build crosstoolchain to itself"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	ppc*|mips*) broken="no gccgo support";;
+esac
+
 cross-armv7l-linux-gnueabihf-libc_package() {
 	short_desc+=" - glibc files"
 	nostrip=yes

From 08abd0e1fb2312e3f28800d38cd5f9016ae868a4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:05 +0100
Subject: [PATCH 0203/3482] cross-armv7l-linux-musleabihf: update to gcc
 10.2.1pre1

---
 .../cross-armv7l-linux-musleabihf/template    | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index fedf616d8b1e..9a54186e9143 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -1,16 +1,16 @@
 # Template file for 'cross-armv7l-linux-musleabihf'
 _triplet=armv7l-linux-musleabihf
-_binutils_version=2.32
-_gcc_version=9.3.0
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
 _musl_version=1.1.24
-_linux_version=4.19
-_libucontext_version=0.9.0
+_linux_version=5.10.4
+_libucontext_version=1.0
 pkgname=cross-${_triplet}
-version=0.33
-revision=3
+version=0.34
+revision=1
 build_style=void-cross
 configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -19,26 +19,29 @@ homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
- http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
- https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
+ https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_libucontext_arch=arm
-cross_linux_arch=arm
 cross_musl_cflags="-O2 -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 
 if [ "$XBPS_TARGET_MACHINE" = "armv7l-musl" ]; then
 	broken="Can't build crosstoolchain to itself"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	ppc*|mips*) broken="no gccgo support";;
+esac
+
 cross-armv7l-linux-musleabihf-libc_package() {
 	short_desc+=" - libc files"
 	nostrip=yes

From e20fe175710ad538e0890aa77c691c441e7c5cff Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:05 +0100
Subject: [PATCH 0204/3482] cross-i686-linux-musl: update to gcc 10.2.1pre1

---
 srcpkgs/cross-i686-linux-musl/template | 40 ++++++++++++--------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 3d889855aceb..19e37dd835c6 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -1,15 +1,15 @@
 # Template file for 'cross-i686-linux-musl'
 _triplet=i686-linux-musl
-_binutils_version=2.32
-_gcc_version=9.3.0
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
 _musl_version=1.1.24
-_linux_version=4.19
-_libucontext_version=0.9.0
+_linux_version=5.10.4
+_libucontext_version=1.0
 pkgname=cross-${_triplet}
-version=0.33
-revision=3
+version=0.34
+revision=1
 build_style=void-cross
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -18,20 +18,18 @@ homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
- http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
- https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
+ https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_libucontext_arch=x86
-cross_linux_arch=x86
 # explicitly enable for final gcc, as gfortran does not build without on x86
 cross_gcc_configure_args="--enable-libquadmath"
 cross_musl_cflags="-O2 -march=i686 -mtune=generic"
@@ -40,10 +38,10 @@ if [ "$XBPS_TARGET_MACHINE" = "i686-musl" ]; then
 	broken="Can't build crosstoolchain to itself"
 fi
 
-post_patch() {
-	vsed -i libucontext-${_libucontext_version}/arch/x86/startcontext.S \
-		-e "s;__i686.get_pc_thunk.bx;i686_get_pc_thunk_bx;g"
-}
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	ppc*|mips*) broken="no gccgo support";;
+esac
 
 cross-i686-linux-musl-libc_package() {
 	short_desc+=" - libc files"

From 6e5dac676f3e3fbf08305dcc6dd281076bde15ff Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:05 +0100
Subject: [PATCH 0205/3482] cross-i686-pc-linux-gnu: update to gcc 10.2.1pre1

---
 srcpkgs/cross-i686-pc-linux-gnu/template | 32 +++++++++++++-----------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index 7500d9dad73f..7fa37de528fd 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -1,14 +1,14 @@
 # Template file for 'cross-i686-pc-linux-gnu'
 _triplet=i686-pc-linux-gnu
-_binutils_version=2.32
-_gcc_version=9.3.0
-_glibc_version=2.30
-_linux_version=4.19
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
+_glibc_version=2.32
+_linux_version=5.10.4
 pkgname=cross-${_triplet}
-version=0.33
-revision=4
+version=0.34
+revision=1
 build_style=void-cross
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -17,17 +17,16 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
- e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
+ 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_linux_arch=x86
 # explicitly enable for final gcc, as gfortran does not build without on x86
 cross_gcc_configure_args="--enable-libquadmath"
 cross_glibc_cflags="-O2 -Wno-error -march=i686 -mtune=generic"
@@ -36,6 +35,11 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	broken="Can't build crosstoolchain to itself"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	ppc*|mips*) broken="no gccgo support";;
+esac
+
 cross-i686-pc-linux-gnu-libc_package() {
 	short_desc+=" - glibc files"
 	nostrip=yes

From 94dee69d907af3d1988a88e1a03c9f3f6a1c279b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:05 +0100
Subject: [PATCH 0206/3482] cross-mipsel-linux-muslhf: update to gcc 10.2.1pre1

---
 srcpkgs/cross-mipsel-linux-muslhf/template | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index e2109e06187e..82f902532f1c 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -1,16 +1,16 @@
 # Template file for 'cross-mipsel-linux-muslhf'
 _triplet=mipsel-linux-muslhf
-_binutils_version=2.32
-_gcc_version=9.3.0
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
 _musl_version=1.1.24
-_linux_version=4.19
+_linux_version=5.10.4
 pkgname=cross-${_triplet}
-version=0.33
-revision=3
+version=0.34
+revision=1
 build_style=void-cross
 configure_args="--with-arch=mips32r2 --with-float=hard
  --with-linker-hash-style=sysv"
-hostmakedepends="tar gcc-objc flex perl python3"
+hostmakedepends="texinfo tar gcc-objc flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -19,17 +19,16 @@ homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
  https://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_linux_arch=mips
 cross_gcc_skip_go=yes
 cross_binutils_configure_args="--enable-default-hash-style=sysv"
 cross_musl_cflags="-Os -march=mips32r2 -mhard-float"

From 3a73c1632b6121e9c50105f40f33171f06fb6cab Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:05 +0100
Subject: [PATCH 0207/3482] cross-mipsel-linux-musl: update to gcc 10.2.1pre1

---
 srcpkgs/cross-mipsel-linux-musl/template | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 7aaa4a75b4a6..b233f9a23d24 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -1,16 +1,16 @@
 # Template file for 'cross-mipsel-linux-musl'
 _triplet=mipsel-linux-musl
-_binutils_version=2.32
-_gcc_version=9.3.0
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
 _musl_version=1.1.24
-_linux_version=4.19
+_linux_version=5.10.4
 pkgname=cross-${_triplet}
-version=0.33
-revision=3
+version=0.34
+revision=1
 build_style=void-cross
 configure_args="--with-arch=mips32r2 --with-float=soft
  --with-linker-hash-style=sysv"
-hostmakedepends="tar gcc-objc flex perl python3"
+hostmakedepends="texinfo tar gcc-objc flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -19,17 +19,16 @@ homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
  https://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_linux_arch=mips
 cross_gcc_skip_go=yes
 cross_binutils_configure_args="--without-fp --enable-default-hash-style=sysv"
 cross_musl_cflags="-Os -march=mips32r2 -msoft-float"

From 01fa7f66eb2ad8444bf09b54c9a2545b6b0ef354 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:05 +0100
Subject: [PATCH 0208/3482] cross-mips-linux-muslhf: update to gcc 10.2.1pre1

---
 srcpkgs/cross-mips-linux-muslhf/template | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index 64e90e245a6b..cbf1a772b7cf 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -1,16 +1,16 @@
 # Template file for 'cross-mips-linux-muslhf'
 _triplet=mips-linux-muslhf
-_binutils_version=2.32
-_gcc_version=9.3.0
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
 _musl_version=1.1.24
-_linux_version=4.19
+_linux_version=5.10.4
 pkgname=cross-${_triplet}
-version=0.33
-revision=3
+version=0.34
+revision=1
 build_style=void-cross
 configure_args="--with-arch=mips32r2 --with-float=hard
  --with-linker-hash-style=sysv"
-hostmakedepends="tar gcc-objc flex perl python3"
+hostmakedepends="texinfo tar gcc-objc flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -19,17 +19,16 @@ homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
  https://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_linux_arch=mips
 cross_gcc_skip_go=yes
 cross_binutils_configure_args="--enable-default-hash-style=sysv"
 cross_musl_cflags="-Os -march=mips32r2 -mhard-float"

From e0c2314aa8f3d15a1732642ae03524306bc40e14 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:06 +0100
Subject: [PATCH 0209/3482] cross-mips-linux-musl: update to gcc 10.2.1pre1

---
 srcpkgs/cross-mips-linux-musl/template | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 430f248c4f7a..fb671e54c2ee 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -1,16 +1,16 @@
 # Template file for 'cross-mips-linux-musl'
 _triplet=mips-linux-musl
-_binutils_version=2.32
-_gcc_version=9.3.0
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
 _musl_version=1.1.24
-_linux_version=4.19
+_linux_version=5.10.4
 pkgname=cross-${_triplet}
-version=0.33
-revision=3
+version=0.34
+revision=1
 build_style=void-cross
 configure_args="--with-arch=mips32r2 --with-float=soft
  --with-linker-hash-style=sysv"
-hostmakedepends="tar gcc-objc flex perl python3"
+hostmakedepends="texinfo tar gcc-objc flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -19,17 +19,16 @@ homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
  https://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_linux_arch=mips
 cross_gcc_skip_go=yes
 cross_binutils_configure_args="--without-fp --enable-default-hash-style=sysv"
 cross_musl_cflags="-Os -march=mips32r2 -msoft-float"

From b51a8ad77733a543c0dc73ef30cec8c6c0060722 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:06 +0100
Subject: [PATCH 0210/3482] cross-powerpc64le-linux-gnu: update to gcc
 10.2.1pre1

---
 srcpkgs/cross-powerpc64le-linux-gnu/template | 31 ++++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 05c5f381b75f..4dfb40ce3919 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -1,16 +1,16 @@
 # Template file for 'cross-powerpc64le-linux-gnu'
 _triplet=powerpc64le-linux-gnu
-_binutils_version=2.32
-_gcc_version=9.3.0
-_glibc_version=2.30
-_linux_version=4.19
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
+_glibc_version=2.32
+_linux_version=5.10.4
 pkgname=cross-${_triplet}
-version=0.33
+version=0.34
 revision=1
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
  --enable-targets=powerpcle-linux"
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -19,18 +19,18 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
- e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
+ 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_linux_arch=powerpc
 cross_binutils_configure_args="--enable-secureplt"
+cross_gcc_bootstrap_configure_args="--with-long-double-128"
 # explicitly enable for final gcc, gfortran does not build without on ppc64le
 cross_gcc_configure_args="--enable-libquadmath"
 cross_glibc_cflags="-O2"
@@ -39,6 +39,11 @@ if [ "$XBPS_TARGET_MACHINE" = "ppc64le" ]; then
 	broken="Can't build crosstoolchain to itself"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	ppc*|mips*) broken="no gccgo support";;
+esac
+
 cross-powerpc64le-linux-gnu-libc_package() {
 	short_desc+=" - glibc files"
 	nostrip=yes

From 6a6343d6f51e296343b86777aeef1217607baf4c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:06 +0100
Subject: [PATCH 0211/3482] cross-powerpc64le-linux-musl: update to gcc
 10.2.1pre1

---
 srcpkgs/cross-powerpc64le-linux-musl/template | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0e32fc952d96..5401f15542fe 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -1,17 +1,17 @@
 # Template file for 'cross-powerpc64le-linux-musl'
 _triplet=powerpc64le-linux-musl
-_binutils_version=2.32
-_gcc_version=9.3.0
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
 _musl_version=1.1.24
-_linux_version=4.19
-_libucontext_version=0.9.0
+_linux_version=5.10.4
+_libucontext_version=1.0
 pkgname=cross-${_triplet}
-version=0.33
-revision=2
+version=0.34
+revision=1
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -20,20 +20,18 @@ homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
- http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
- https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
+ https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_libucontext_arch=ppc64
-cross_linux_arch=powerpc
 cross_binutils_configure_args="--enable-secureplt"
 cross_musl_cflags="-O2"
 
@@ -41,6 +39,11 @@ if [ "$XBPS_TARGET_MACHINE" = "ppc64le-musl" ]; then
 	broken="Can't build crosstoolchain to itself"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	ppc*|mips*) broken="no gccgo support";;
+esac
+
 cross-powerpc64le-linux-musl-libc_package() {
 	short_desc+=" - libc files"
 	nostrip=yes

From e9715d1b4085df16a034ca61085152086be46d24 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:06 +0100
Subject: [PATCH 0212/3482] cross-powerpc64-linux-gnu: update to gcc 10.2.1pre1

---
 srcpkgs/cross-powerpc64-linux-gnu/template | 31 +++++++++++++---------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 46514ae1e17b..720e3859d10f 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -1,16 +1,16 @@
 # Template file for 'cross-powerpc64-linux-gnu'
 _triplet=powerpc64-linux-gnu
-_binutils_version=2.32
-_gcc_version=9.3.0
-_glibc_version=2.30
-_linux_version=4.19
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
+_glibc_version=2.32
+_linux_version=5.10.4
 pkgname=cross-${_triplet}
-version=0.33
+version=0.34
 revision=1
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
  --enable-targets=powerpc-linux"
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -19,24 +19,29 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
- e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
+ 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_linux_arch=powerpc
 cross_binutils_configure_args="--enable-secureplt"
+cross_gcc_bootstrap_configure_args="--with-long-double-128"
 cross_glibc_cflags="-O2"
 
 if [ "$XBPS_TARGET_MACHINE" = "ppc64" ]; then
 	broken="Can't build crosstoolchain to itself"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	ppc*|mips*) broken="no gccgo support";;
+esac
+
 cross-powerpc64-linux-gnu-libc_package() {
 	short_desc+=" - glibc files"
 	nostrip=yes

From def5713bac533b3de22daf700c7fa1fb99b5abc9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:06 +0100
Subject: [PATCH 0213/3482] cross-powerpc64-linux-musl: update to gcc
 10.2.1pre1

---
 srcpkgs/cross-powerpc64-linux-musl/template | 37 +++++++++++----------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index b7c09d7f1ae7..ce0caee811f1 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -1,17 +1,17 @@
 # Template file for 'cross-powerpc64-linux-musl'
 _triplet=powerpc64-linux-musl
-_binutils_version=2.32
-_gcc_version=9.3.0
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
 _musl_version=1.1.24
-_linux_version=4.19
-_libucontext_version=0.9.0
+_linux_version=5.10.4
+_libucontext_version=1.0
 pkgname=cross-${_triplet}
-version=0.33
-revision=2
+version=0.34
+revision=1
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -20,20 +20,18 @@ homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
- http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
- https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
+ https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_libucontext_arch=ppc64
-cross_linux_arch=powerpc
 cross_binutils_configure_args="--enable-secureplt"
 cross_musl_cflags="-O2"
 
@@ -41,6 +39,11 @@ if [ "$XBPS_TARGET_MACHINE" = "ppc64-musl" ]; then
 	broken="Can't build crosstoolchain to itself"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	ppc*|mips*) broken="no gccgo support";;
+esac
+
 cross-powerpc64-linux-musl-libc_package() {
 	short_desc+=" - libc files"
 	nostrip=yes

From c3f22c565a36ede512d9317598c367e1dd870e9b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:06 +0100
Subject: [PATCH 0214/3482] cross-powerpcle-linux-gnu: update to gcc 10.2.1pre1

---
 srcpkgs/cross-powerpcle-linux-gnu/template | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index d071581bfb1a..9b081500e3d3 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -1,15 +1,15 @@
 # Template file for 'cross-powerpcle-linux-gnu'
 _triplet=powerpcle-linux-gnu
-_binutils_version=2.32
-_gcc_version=9.3.0
-_glibc_version=2.30
-_linux_version=4.19
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
+_glibc_version=2.32
+_linux_version=5.10.4
 pkgname=cross-${_triplet}
-version=0.33
+version=0.34
 revision=1
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify"
-hostmakedepends="tar gcc-objc flex perl python3"
+hostmakedepends="texinfo tar gcc-objc flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -18,19 +18,19 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
- e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
+ 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_linux_arch=powerpc
 cross_gcc_skip_go=yes
 cross_binutils_configure_args="--enable-secureplt"
+cross_gcc_bootstrap_configure_args="--with-long-double-128"
 cross_glibc_cflags="-O2"
 
 if [ "$XBPS_TARGET_MACHINE" = "ppcle" ]; then

From ffa1bbb780829e001b142d70cfa9b54eece95bcc Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:06 +0100
Subject: [PATCH 0215/3482] cross-powerpcle-linux-musl: update to gcc
 10.2.1pre1

---
 srcpkgs/cross-powerpcle-linux-musl/template | 23 ++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index 864adb978cc8..42500f043eae 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -1,16 +1,16 @@
 # Template file for 'cross-powerpcle-linux-musl'
 _triplet=powerpcle-linux-musl
-_binutils_version=2.32
-_gcc_version=9.3.0
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
 _musl_version=1.1.24
-_linux_version=4.19
+_linux_version=5.10.4
 pkgname=cross-${_triplet}
-version=0.33
+version=0.34
 revision=1
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float"
-hostmakedepends="tar gcc-objc flex perl python3"
+hostmakedepends="texinfo tar gcc-objc flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -19,17 +19,16 @@ homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
- http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
+ https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_linux_arch=powerpc
 cross_gcc_skip_go=yes
 cross_binutils_configure_args="--enable-secureplt"
 cross_musl_cflags="-O2"

From 221064e5e68f433461d7d6edf4767a907a18f1f4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:07 +0100
Subject: [PATCH 0216/3482] cross-powerpc-linux-gnu: update to gcc 10.2.1pre1

---
 srcpkgs/cross-powerpc-linux-gnu/template | 29 ++++++++++++------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 30f0c31bf97c..98c8d18bba81 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -1,15 +1,15 @@
 # Template file for 'cross-powerpc-linux-gnu'
 _triplet=powerpc-linux-gnu
-_binutils_version=2.32
-_gcc_version=9.3.0
-_glibc_version=2.30
-_linux_version=4.19
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
+_glibc_version=2.32
+_linux_version=5.10.4
 pkgname=cross-${_triplet}
-version=0.33
-revision=3
+version=0.34
+revision=1
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify"
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -18,18 +18,19 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
- e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
+ 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_linux_arch=powerpc
+cross_gcc_skip_go=yes
 cross_binutils_configure_args="--enable-secureplt"
+cross_gcc_bootstrap_configure_args="--with-long-double-128"
 cross_glibc_cflags="-O2"
 
 if [ "$XBPS_TARGET_MACHINE" = "ppc" ]; then

From c6ef2151803cc261be2362f739c5819691388894 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:07 +0100
Subject: [PATCH 0217/3482] cross-powerpc-linux-musl: update to gcc 10.2.1pre1

---
 srcpkgs/cross-powerpc-linux-musl/template | 30 ++++++++++-------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 4d52b396f23b..d2861b10e122 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -1,17 +1,16 @@
 # Template file for 'cross-powerpc-linux-musl'
 _triplet=powerpc-linux-musl
-_binutils_version=2.32
-_gcc_version=9.3.0
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
 _musl_version=1.1.24
-_linux_version=4.19
-_libucontext_version=0.9.0
+_linux_version=5.10.4
 pkgname=cross-${_triplet}
-version=0.33
-revision=2
+version=0.34
+revision=1
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float"
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -20,20 +19,17 @@ homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
- http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
- https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
+ https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_libucontext_arch=ppc
-cross_linux_arch=powerpc
+cross_gcc_skip_go=yes
 cross_binutils_configure_args="--enable-secureplt"
 cross_musl_cflags="-O2"
 

From 3776ae39ce2348e0b1b537d861639ae7c3400e37 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:07 +0100
Subject: [PATCH 0218/3482] cross-x86_64-linux-gnu: update to gcc 10.2.1pre1

---
 srcpkgs/cross-x86_64-linux-gnu/template | 30 ++++++++++++++-----------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index d35f742f8847..e71b403dbbc0 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -1,14 +1,14 @@
 # Template file for 'cross-x86_64-linux-gnu'
 _triplet=x86_64-linux-gnu
-_binutils_version=2.32
-_gcc_version=9.3.0
-_glibc_version=2.30
-_linux_version=4.19
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
+_glibc_version=2.32
+_linux_version=5.10.4
 pkgname=cross-${_triplet}
-version=0.33
+version=0.34
 revision=1
 build_style=void-cross
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -17,17 +17,16 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
- e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
+ 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_linux_arch=x86
 # explicitly enable for final gcc, gfortran does not build without on x86
 cross_gcc_configure_args="--enable-libquadmath"
 cross_glibc_cflags="-O2"
@@ -36,6 +35,11 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	broken="Can't build crosstoolchain to itself"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	ppc*|mips*) broken="no gccgo support";;
+esac
+
 cross-x86_64-linux-gnu-libc_package() {
 	short_desc+=" - glibc files"
 	nostrip=yes

From ecbdc26d3482d12943ea0fa0bb8c8cb0cd6a3e1b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:07 +0100
Subject: [PATCH 0219/3482] cross-x86_64-linux-musl: update to gcc 10.2.1pre1

---
 srcpkgs/cross-x86_64-linux-musl/template | 37 +++++++++++++-----------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 65e3501c8d1a..892526793efb 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -1,15 +1,15 @@
 # Template file for 'cross-x86_64-linux-musl'
 _triplet=x86_64-linux-musl
-_binutils_version=2.32
-_gcc_version=9.3.0
+_binutils_version=2.35.1
+_gcc_version=10.2.1_pre1
 _musl_version=1.1.24
-_linux_version=4.19
-_libucontext_version=0.9.0
+_linux_version=5.10.4
+_libucontext_version=1.0
 pkgname=cross-${_triplet}
-version=0.33
-revision=4
+version=0.34
+revision=1
 build_style=void-cross
-hostmakedepends="tar gcc-objc gcc-go flex perl python3"
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${_triplet}"
@@ -18,20 +18,18 @@ homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
- http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
- https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
-checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
+ https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
+ ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
+checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
+ 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
 nocross=yes
 
 cross_triplet=${_triplet}
-cross_libucontext_arch=x86_64
-cross_linux_arch=x86
 # explicitly enable for final gcc, gfortran does not build without on x86
 cross_gcc_configure_args="--enable-libquadmath"
 cross_musl_cflags="-O2"
@@ -40,6 +38,11 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
 	broken="Can't build crosstoolchain to itself"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	ppc*|mips*) broken="no gccgo support";;
+esac
+
 cross-x86_64-linux-musl-libc_package() {
 	short_desc+=" - libc files"
 	nostrip=yes

From f42dae75f5ca9be69c5713220d2089742566882d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 20 Jan 2021 22:10:40 +0100
Subject: [PATCH 0220/3482] musl-nscd: fix build w/ gcc10

---
 srcpkgs/musl-nscd/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/musl-nscd/template b/srcpkgs/musl-nscd/template
index 131d1e91f285..6a9440c96498 100644
--- a/srcpkgs/musl-nscd/template
+++ b/srcpkgs/musl-nscd/template
@@ -12,6 +12,8 @@ homepage="https://github.com/pikhq/musl-nscd"
 distfiles="https://github.com/pikhq/musl-nscd/archive/v$version.tar.gz"
 checksum=d0aae668bf2b5d0dd1e22fd00feec6cb0e0a6801c63a13827d4f407c33d8933a
 
+CFLAGS="-fcommon"
+
 post_install() {
 	vlicense COPYRIGHT
 	vsv nscd

From 5b7ed9c985b8a006aa808db51d2237c71fcc0d3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Thu, 7 Jan 2021 09:59:10 +0100
Subject: [PATCH 0221/3482] intellij-idea-ultimate-edition: update to 2020.3.1.

---
 srcpkgs/intellij-idea-ultimate-edition/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index f60a71bb2df4..c8a9ae55c553 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2020.3
+version=2020.3.1
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-203.5981.155"
+wrksrc="idea-IU-203.6682.168"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=43a10e1be8075ebd07bafcbe65ef431db304ee96c3072ff308e188fb9fdbcbd0
+checksum=50352d1ed9690e750f7b96ecceadb7288879afd7444e752f57c49845b0029fcf
 repository=nonfree
 restricted=yes
 nopie=yes

From 7a9dcec601a5ffc2b4d5f47ba036c716b3741274 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Thu, 21 Jan 2021 06:40:49 +0100
Subject: [PATCH 0222/3482] compsize: update to 1.4.

---
 srcpkgs/compsize/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/compsize/template b/srcpkgs/compsize/template
index 79e1194efb57..9a37a59f8c89 100644
--- a/srcpkgs/compsize/template
+++ b/srcpkgs/compsize/template
@@ -1,6 +1,6 @@
 # Template file for 'compsize'
 pkgname=compsize
-version=1.3
+version=1.4
 revision=1
 build_style=gnu-makefile
 makedepends="libbtrfs-devel"
@@ -9,7 +9,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/kilobyte/compsize"
 distfiles="https://github.com/kilobyte/compsize/archive/v${version}.tar.gz"
-checksum=c10823c940641404cd6eb9c801d43b307e87e9252e8eded66eed8be750c4f884
+checksum=4c6dd5812c8809cbe645b815ceefbd81a1a9c2c6da383d827b4d6457ecbb2c03
 
 do_install() {
 	vbin compsize

From b5adb99cb25704fe84e6555b267909b91f1eaed8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 06:39:12 +0100
Subject: [PATCH 0223/3482] PopCorn: rebuild for gcc10

---
 srcpkgs/PopCorn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index 6fab1a242d85..47abb044004f 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -1,7 +1,7 @@
 # Template file for 'PopCorn'
 pkgname=PopCorn
 version=0.4
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/the-maldridge/popcorn
 go_package="${go_import_path}/cmd/popcorn

From 2acdbd373cfc9ba4f2ef4e8bb17e0664b55e1e69 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 15:57:40 +0100
Subject: [PATCH 0224/3482] PopCorn: nocross for now

---
 srcpkgs/PopCorn/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index 47abb044004f..4fefa7e320b6 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -16,6 +16,7 @@ license="MIT"
 homepage="https://github.com/the-maldridge/PopCorn"
 distfiles="https://github.com/the-maldridge/PopCorn/archive/v${version}.tar.gz"
 checksum=b25589802c5e1c277d2e9536add44704a012359b02d7fb4be1b4b0f11eb10d93
+nocross=yes
 
 system_accounts="_popcorn"
 _popcorn_homedir="/var/lib/popcorn"

From 33644a33a947a285659cd8959fde5b1c381e8439 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 15:55:52 +0100
Subject: [PATCH 0225/3482] ghdl: rebuild for gcc10

---
 srcpkgs/ghdl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ghdl/template b/srcpkgs/ghdl/template
index b89aaf924538..9e4baf3b68a5 100644
--- a/srcpkgs/ghdl/template
+++ b/srcpkgs/ghdl/template
@@ -2,7 +2,7 @@
 pkgname=ghdl
 reverts="20181129_1"
 version=0.37
-revision=1
+revision=2
 archs="i686* x86_64*"
 build_style=configure
 configure_args="--prefix=/usr"

From 7011ed2292137a434b212022e71a19d323cb76b1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 18 Jan 2021 23:04:58 +0100
Subject: [PATCH 0226/3482] openssh: rebuild for time64

---
 srcpkgs/openssh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 8878dd9ca65c..119ba23a2a13 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody

From 3c6e5489ab73bb0b71daeeddcba540a21174b954 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Jan 2021 11:13:53 +0100
Subject: [PATCH 0227/3482] Revert "gcc: nocross for now"

This reverts commit 6ae6e7f02680b10f0b56e82ac2dabd0a9c466548.
---
 srcpkgs/gcc/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 183451d352df..f7fa99383b13 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -35,7 +35,6 @@ nopie=yes
 lib32disabled=yes
 bootstrap=yes
 replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0"
-nocross=yes
 
 _have_gccgo=yes
 

From 0b13497597c54c2e939ac38b476a8c25c49c7320 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Jan 2021 12:13:15 +0100
Subject: [PATCH 0228/3482] gcc: disable gccgo on cross+musl for now

we'll have to figure this out...
---
 srcpkgs/gcc/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index f7fa99383b13..a346b50d56dc 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -46,6 +46,11 @@ case "$XBPS_TARGET_MACHINE" in
 	mips*-musl|ppc*) _have_gccgo=no ;;
 esac
 
+# FIXME
+if [ -n "$CROSS_BUILD" -a "$XBPS_TARGET_LIBC" = "musl" ]; then
+	_have_gccgo=no
+fi
+
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="tar texinfo perl flex"
 else

From 86b7c62b9bd399e1f84014d10dabe284fc406422 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Jan 2021 12:16:46 +0100
Subject: [PATCH 0229/3482] PopCorn: remove nocross and use go on musl
 crosstargets

---
 srcpkgs/PopCorn/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index 4fefa7e320b6..fe84490de6b5 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -8,7 +8,7 @@ go_package="${go_import_path}/cmd/popcorn
  ${go_import_path}/cmd/popcornctl
  ${go_import_path}/cmd/statrepo
  ${go_import_path}/cmd/pqueryd"
-hostmakedepends="gcc-go-tools git"
+hostmakedepends="git"
 depends="snooze"
 short_desc="Package statistics system"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
@@ -16,7 +16,10 @@ license="MIT"
 homepage="https://github.com/the-maldridge/PopCorn"
 distfiles="https://github.com/the-maldridge/PopCorn/archive/v${version}.tar.gz"
 checksum=b25589802c5e1c277d2e9536add44704a012359b02d7fb4be1b4b0f11eb10d93
-nocross=yes
+
+if [ -z "$CROSS_BUILD" -o "$XBPS_TARGET_LIBC" != "musl" ]; then
+	hostmakedepends+=" gcc-go-tools"
+fi
 
 system_accounts="_popcorn"
 _popcorn_homedir="/var/lib/popcorn"

From b264ea24c2a5579306254ec4a4684259e87fbf74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 12 Nov 2020 21:29:37 +0100
Subject: [PATCH 0230/3482] glibc: update to 2.32.

---
 common/shlibs          |  2 --
 srcpkgs/glibc/template | 10 +++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e030495fd63d..670be76ec65a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -40,8 +40,6 @@ libnss_files.so.2 glibc-2.29_1
 libnss_compat.so.2 glibc-2.29_1
 libnss_dns.so.2 glibc-2.29_1
 libnss_hesiod.so.2 glibc-2.29_1
-libnss_nisplus.so.2 glibc-2.29_1
-libnss_nis.so.2 glibc-2.29_1
 libcrypt.so.1 glibc-2.29_1
 libBrokenLocale.so.1 glibc-2.29_1
 libmemusage.so glibc-2.29_1
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index dda99ba608d2..9202e4145453 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,14 +1,14 @@
 # Template file for 'glibc'
 pkgname=glibc
-version=2.30
-revision=2
+version=2.32
+revision=1
 bootstrap=yes
 short_desc="GNU C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, BSD-3-Clause"
 homepage="http://www.gnu.org/software/libc"
 distfiles="${GNU_SITE}/glibc/glibc-${version}.tar.xz"
-checksum=e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
+checksum=1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
 patch_args="-Np1"
 # Do not strip these files, objcopy errors out.
 nostrip_files="
@@ -96,12 +96,12 @@ do_configure() {
 	SHELL=/bin/bash ../configure ${configure_args} \
 		--bindir=/usr/bin --sbindir=/usr/bin \
 		--libdir=${_libdir} --libexecdir=${_libdir} \
-		--enable-add-ons=libidn --enable-obsolete-rpc \
+		--enable-add-ons=libidn \
 		--enable-multi-arch --enable-bind-now \
 		--disable-profile --enable-kernel=3.2.0 \
 		--enable-stack-guard-randomization \
 		--without-selinux --without-cvs --without-gd \
-		--disable-lock-elision --enable-obsolete-nsl \
+		--disable-lock-elision \
 		--enable-stack-protector=strong \
 		--with-headers=${XBPS_CROSS_BASE}/usr/include \
 		--disable-werror \

From a64f3f9c6715e5993db396405e0ddc4a3d45fb93 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 20 Jan 2021 00:30:54 +0100
Subject: [PATCH 0231/3482] linux5.10: update to 5.10.9.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 7c97b77eec96..189e7c87c9d5 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.8
+version=5.10.9
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=5cfc829425165d699059a398f5c24cad6e40e8899f2076ecd301c3d551e503ed
+checksum=7f733e0dd8bbb6929aae2191cf6b9dc0b0ec1dad77ab3f5d3aad1b7fe96c4751
 python_version=3
 patch_args="-Np1"
 

From 326da914a51bf27639c181810101b1439c174d15 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Jan 2021 10:31:32 +0100
Subject: [PATCH 0232/3482] apk-tools: update to 2.12.1.

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index dbdc782a0a90..0703d80b596b 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.0
+version=2.12.1
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=763ed44a5b33f8cf6054b9ad6de53c355a37dcdf954024bbc59b953c675b78c6
+checksum=c81f6d9efdf0b3b7830b30e9133911c2e7ed68c082260a26dc82dc4553524035
 CFLAGS="-Wno-error"
 
 do_install() {

From cc2182159a341ac0a7ba91a8921bd1b28e7e5c1a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Jan 2021 10:32:25 +0100
Subject: [PATCH 0233/3482] minify: update to 2.9.11.

---
 srcpkgs/minify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 3522bda46736..8d12278dfb47 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.10
+version=2.9.11
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/${pkgname}/archive/v${version}.tar.gz"
-checksum=f775e92aaefd1d4cce7df8559d35eeec022f281aad350b843610ef8f36531cb1
+checksum=3c1ec8df223b818ae0fa93b0daf3ca750f063238dc458ad373f92556ad324e6e
 
 post_install() {
 	vlicense LICENSE

From a0e7d8cef3a5dd401a5ca6c9c022c31531dfc156 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Jan 2021 10:33:31 +0100
Subject: [PATCH 0234/3482] perl-Net-SFTP-Foreign: update to 1.93.

---
 srcpkgs/perl-Net-SFTP-Foreign/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SFTP-Foreign/template b/srcpkgs/perl-Net-SFTP-Foreign/template
index 058d3e931b52..2d5909fbde40 100644
--- a/srcpkgs/perl-Net-SFTP-Foreign/template
+++ b/srcpkgs/perl-Net-SFTP-Foreign/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SFTP-Foreign'
 pkgname=perl-Net-SFTP-Foreign
-version=1.91
-revision=2
+version=1.93
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Net-SFTP-Foreign"
 distfiles="${CPAN_SITE}/Net/Net-SFTP-Foreign-${version}.tar.gz"
-checksum=b7395081314f26f3b93c857d65e9c80a04a63709df698583f22a360ffce7e178
+checksum=6c7d64250876873da434800e5060a8bef7a46451d81f817e37e43cfda51a0f7a

From 9cc0e93703ea063ec5f2c12c63b3b0d83240b6e6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Jan 2021 10:38:14 +0100
Subject: [PATCH 0235/3482] z3: update to 4.8.10.

---
 srcpkgs/z3/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 649650437499..8a58beb6fba3 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
 # Template file for 'z3'
 pkgname=z3
-version=4.8.9
-revision=2
+version=4.8.10
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/Z3Prover/z3"
 distfiles="https://github.com/Z3Prover/z3/archive/z3-${version}.tar.gz"
-checksum=c9fd04b9b33be74fffaac3ec2bc2c320d1a4cc32e395203c55126b12a14ff3f4
+checksum=12cce6392b613d3133909ce7f93985d2470f0d00138837de06cf7eb2992886b4
 
 build_options="ocaml"
 desc_option_ocaml="Enable support for OCaml bindings"

From daf828f7a6e1b02974904bb046e8681cfe4cfddb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Jan 2021 13:24:35 +0100
Subject: [PATCH 0236/3482] erlang: update to 23.2.3.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 756bc760effb..69fda3b663cc 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=23.2.2
+version=23.2.3
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=04994a2dffee0170554797b3d258b4f4727e54c772e721202e9fb22d6827e4de
+checksum=3160912856ba734bd9c17075e72f469b9d4b913f3ab9652ee7e0fb406f0f0f2c
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 1488fddd07ac3ab782c428bc091108995447bc61 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Thu, 21 Jan 2021 00:03:27 -0500
Subject: [PATCH 0237/3482] x86_64-dotconfig: Add support for SOF on comet lake

---
 srcpkgs/linux5.10/files/x86_64-dotconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index bbd136a1b1e3..26d396246492 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -6482,6 +6482,8 @@ CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
 CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
@@ -6514,7 +6516,7 @@ CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_COFFEELAKE=m
 CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_ICELAKE=m
-# CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT is not set
+CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT=y
 CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_TIGERLAKE=m
 CONFIG_SND_SOC_SOF_ELKHARTLAKE_SUPPORT=y

From 55d4d86b0a41aed42a10ed723d5cbd362848ef5b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 20 Jan 2021 08:59:20 -0500
Subject: [PATCH 0238/3482] grpc: update to 1.34.1.

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 4afd2a6dad2f..de0182c3cd60 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.34.0
+version=1.34.1
 revision=1
 _abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="7372a881122cd85a7224435a1d58bc5e11c88d4fb98a64b83f36f3d1c2f16d39
+checksum="c260a1dcdd26a78a9596494a3f41f9594ab5ec3a4d65cba4658bdee2b55ac844
  3d74cdc98b42fd4257d91f652575206de195e2c824fcd8d6e6d227f85cb143ef"
 
 if [ "$CROSS_BUILD" ]; then

From 758e75eff4172608707d0ff5989380b0c52be439 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 20 Jan 2021 08:59:24 -0500
Subject: [PATCH 0239/3482] python3-grpcio: update to 1.34.1.

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index d3455b39a76d..73e0bc72cb44 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
-version=1.34.0
+version=1.34.1
 revision=1
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz"
-checksum=f98f746cacbaa681de0bcd90d7aa77b440e3e1327a9988f6a2b580d54e27d4c3
+checksum=1c746a3cd8a830d8d916a9d0476a786aaa98c5cc2a096344af2be955e439f8ac
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 0908de25ca76d50725f3142e31cc4d35da04017c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 20 Jan 2021 08:59:27 -0500
Subject: [PATCH 0240/3482] python3-grpcio-tools: update to 1.34.1.

---
 srcpkgs/python3-grpcio-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio-tools/template b/srcpkgs/python3-grpcio-tools/template
index 6be609c50e7f..cd96fdc8305f 100644
--- a/srcpkgs/python3-grpcio-tools/template
+++ b/srcpkgs/python3-grpcio-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-grpcio-tools'
 pkgname=python3-grpcio-tools
-version=1.34.0
+version=1.34.1
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio-tools/grpcio-tools-${version}.tar.gz"
-checksum=db5a6f0130256d534cbe35eab37d37a448d96f4fd736e5051c6be1aee49cea1d
+checksum=b411f36748f4ead33411544d785e37825598bbb8abbe79eca422e395be5a3d08
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 3dc4c978a88674c17c97ae4b44370ce7ad2ae81b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 20 Jan 2021 09:02:24 -0500
Subject: [PATCH 0241/3482] python3-tifffile: update to 2021.1.14.

---
 srcpkgs/python3-tifffile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index caf542069051..ba57570b081a 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.1.11
+version=2021.1.14
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=fba3d3718634dd705d8a025421b1a241efad6166533b1be304a3b1a59a68e941
+checksum=5af5c4e49ad2d6f0b04c43937b64a7e8101a9af306b6087181d8785c854792cb
 
 post_install() {
 	vlicense LICENSE

From 2838aa918efd7f535aa900a7f83857fe8d9b2f99 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 20 Jan 2021 09:18:24 -0500
Subject: [PATCH 0242/3482] python3-setuptools: update to 51.3.3.

---
 srcpkgs/python3-setuptools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index 58346bb37e87..60a379ef73f6 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=51.1.2
+version=51.3.3
 revision=1
 wrksrc="setuptools-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://github.com/pypa/setuptools"
 changelog="https://raw.githubusercontent.com/pypa/setuptools/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.tar.gz"
-checksum=4fa149145ba5dcd4aaa89912ec92393a31170eaf17fe0268b1429538bad1f85a
+checksum=127ec775c4772bfaf2050557b00c4be6e019e52dc2e171a3fb1cd474783a2497
 alternatives="setuptools:easy_install:/usr/bin/easy_install3"
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"

From e7de40b56ad723590154114fb6acdf49cf76e718 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 20 Jan 2021 09:22:02 -0500
Subject: [PATCH 0243/3482] python-xdg: update to 0.27.

---
 srcpkgs/python-xdg/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python-xdg/template b/srcpkgs/python-xdg/template
index 083f17308d35..f9a1430433e6 100644
--- a/srcpkgs/python-xdg/template
+++ b/srcpkgs/python-xdg/template
@@ -1,11 +1,10 @@
 # Template file for 'python-xdg'
 pkgname=python-xdg
-version=0.26
-revision=4
+version=0.27
+revision=1
 wrksrc="pyxdg-${version}"
 build_style=python-module
-hostmakedepends="python python3"
-makedepends="$hostmakedepends"
+hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 pycompile_module="xdg"
 short_desc="Python2 library to access freedesktop.org standards"
@@ -13,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-only"
 homepage="https://freedesktop.org/Software/pyxdg"
 distfiles="${PYPI_SITE}/p/pyxdg/pyxdg-${version}.tar.gz"
-checksum=fe2928d3f532ed32b39c32a482b54136fe766d19936afc96c8f00645f9da1a06
+checksum=80bd93aae5ed82435f20462ea0208fb198d8eec262e831ee06ce9ddb6b91c5a5
 
 python3-xdg_package() {
 	depends="python3"

From 2937d5bbdd66e4f32761cc39cc4e6f8a7a6b8cb2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 20 Jan 2021 09:42:13 -0500
Subject: [PATCH 0244/3482] python3-icalendar: update to 4.0.7.

---
 srcpkgs/python3-icalendar/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-icalendar/template b/srcpkgs/python3-icalendar/template
index 78d1433b144a..f37ae5f3a02e 100644
--- a/srcpkgs/python3-icalendar/template
+++ b/srcpkgs/python3-icalendar/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-icalendar'
 pkgname=python3-icalendar
-version=4.0.6
-revision=3
+version=4.0.7
+revision=1
 wrksrc="icalendar-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,9 +12,13 @@ maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
 license="BSD-2-Clause"
 homepage="https://github.com/collective/icalendar"
 distfiles="${PYPI_SITE}/i/icalendar/icalendar-${version}.tar.gz"
-checksum=7e6fe7232622abe32d8f54d0936ffcd5a9087198a4c2f1ec1803a7dd9fdd979f
+checksum=0fc18d87f66e0b5da84fa731389496cfe18e4c21304e8f6713556b2e8724a7a4
 conflicts="python-icalendar>=0"
 
+do_check() {
+	PYTHONPATH=src python3 -m pytest src/icalendar/tests
+}
+
 post_install() {
 	vlicense LICENSE.rst LICENSE
 }

From ef9801e76cfcfdf7893917c8cf3d7c4b72d3a255 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 20 Jan 2021 09:54:02 -0500
Subject: [PATCH 0245/3482] python3-lz4: update to 3.1.3.

---
 srcpkgs/python3-lz4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-lz4/template b/srcpkgs/python3-lz4/template
index 9ef8d0abae52..7cb716632cad 100644
--- a/srcpkgs/python3-lz4/template
+++ b/srcpkgs/python3-lz4/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-lz4'
 pkgname=python3-lz4
-version=3.1.1
+version=3.1.3
 revision=1
 wrksrc="lz4-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/python-lz4/python-lz4"
 changelog="https://github.com/python-lz4/python-lz4/releases"
 distfiles="${PYPI_SITE}/l/lz4/lz4-${version}.tar.gz"
-checksum=1ac354804cb2d5fb3d213857a6bf8590a301ef051cc16fbb4938bd2d6e524bda
+checksum=081ef0a3b5941cb03127f314229a1c78bd70c9c220bb3f4dd80033e707feaa18
 
 post_install() {
 	vlicense LICENSE

From fd0bb86d8ff8409e8f965b1eac759b59078508e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 20 Jan 2021 10:04:51 -0500
Subject: [PATCH 0246/3482] zeromq: update to 4.3.4.

---
 srcpkgs/zeromq/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zeromq/template b/srcpkgs/zeromq/template
index 86e03e9cab57..b4804144ee2a 100644
--- a/srcpkgs/zeromq/template
+++ b/srcpkgs/zeromq/template
@@ -1,6 +1,6 @@
 # Template file for 'zeromq'
 pkgname=zeromq
-version=4.3.3
+version=4.3.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-libsodium"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="http://www.zeromq.org"
 distfiles="https://github.com/zeromq/libzmq/releases/download/v${version}/zeromq-${version}.tar.gz"
-checksum=9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2
+checksum=c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5
 
 zeromq-devel_package() {
 	depends="${sourcepkg}-${version}_${revision}"

From ea9ef49c953f5e98bcf8ce2d054f0eb5dca33d10 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 20 Jan 2021 11:41:13 -0500
Subject: [PATCH 0247/3482] python3-pandas: update to 1.2.1.

---
 srcpkgs/python3-pandas/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index b5a96db437fd..e6a64113b284 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.2.0
+version=1.2.1
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=7e8423c76e404aac38a5664713091fced5a4e7cf850f212f5dd41a000b3ae215
+checksum=c04224636fbcff8cb2df2d14ea48828224022f212f88c9542b68640747dfa1ef
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
@@ -23,8 +23,11 @@ pre_build() {
 
 do_check() {
 	# The test_raw_roundtrip relies on a clipboard
-	python3 -m pytest build/lib*/pandas \
-		-r sxX --strict -k 'not test_raw_roundtrip'
+	# S3 tests seem to require python3-pytest-xdist
+	PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest pandas \
+		--skip-slow --skip-network --skip-db -x -r EX \
+		--ignore pandas/tests/io/parser/test_network.py \
+		-m 'not single' -k 'not test_raw_roundtrip and not _s3'
 }
 
 post_install() {

From d406c98cba74a5c88e8fe6e351952531c10f557b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 20 Jan 2021 12:02:04 -0500
Subject: [PATCH 0248/3482] python3-pyzmq: update to 21.0.1.

---
 srcpkgs/python3-pyzmq/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index d5218d347bf1..230b21a04319 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=20.0.0
+version=21.0.1
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -8,12 +8,14 @@ make_build_args="--zmq=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3-setuptools"
 makedepends="zeromq-devel python3-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Python3 bindings for the ZeroMQ messaging library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
+changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=824ad5888331aadeac772bce27e1c2fbcab82fade92edbd234542c4e12f0dca9
+checksum=c3a630dd7716e8e127d43b22598e256a2d11a847b8cc3310350528960037fa06
 
 pre_build() {
 	cat > setup.cfg <<-EOF
@@ -22,6 +24,10 @@ pre_build() {
 	EOF
 }
 
+do_check() {
+	(cd build/lib* && python3 -m pytest zmq/tests -k 'not test_cython')
+}
+
 post_install() {
 	vlicense COPYING.BSD
 }

From da8ca5c0aa51f9d1aba06b79d1bb33b0f069d459 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 20 Jan 2021 12:06:19 -0500
Subject: [PATCH 0249/3482] python3-sortedcontainers: update to 2.3.0.

---
 srcpkgs/python3-sortedcontainers/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-sortedcontainers/template b/srcpkgs/python3-sortedcontainers/template
index 5d768b0e4f0f..bde58e580785 100644
--- a/srcpkgs/python3-sortedcontainers/template
+++ b/srcpkgs/python3-sortedcontainers/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sortedcontainers'
 pkgname=python3-sortedcontainers
-version=2.1.0
-revision=3
+version=2.3.0
+revision=1
 wrksrc="sortedcontainers-${version}"
 build_style=python3-module
 pycompile_module="sortedcontainers"
@@ -11,4 +11,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://www.grantjenks.com/docs/sortedcontainers/"
 distfiles="${PYPI_SITE}/s/sortedcontainers/sortedcontainers-${version}.tar.gz"
-checksum=974e9a32f56b17c1bac2aebd9dcf197f3eb9cd30553c5852a3187ad162e1a03a
+checksum=59cc937650cf60d677c16775597c89a960658a09cf7c1a668f86e1e4464b10a1
+
+do_check() {
+	: package defines no tests
+}

From ae5f404723aae15584e82b72d191178b59f139b4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 20 Jan 2021 12:07:21 -0500
Subject: [PATCH 0250/3482] python3-virtualenv: update to 20.4.0.

---
 srcpkgs/python3-virtualenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index c26f27bde836..c1b3db57952a 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-virtualenv'
 pkgname=python3-virtualenv
-version=20.3.0
+version=20.4.0
 revision=1
 wrksrc="virtualenv-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://virtualenv.pypa.io/"
 changelog="https://virtualenv.pypa.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=7992b8de87e544a4ab55afc2240bf8388c4e3b5765d03784dad384bfdf9097ee
+checksum=219ee956e38b08e32d5639289aaa5bd190cfbe7dafcb8fa65407fca08e808f9c
 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
 
 do_check() {

From a2538dd8efeef84f8f4fdd13a66461b734204ed1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 20 Jan 2021 12:16:40 -0500
Subject: [PATCH 0251/3482] python3-yaml: update to 5.4.

---
 srcpkgs/python3-yaml/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-yaml/template b/srcpkgs/python3-yaml/template
index 205db0812618..87fcde69d6c4 100644
--- a/srcpkgs/python3-yaml/template
+++ b/srcpkgs/python3-yaml/template
@@ -1,21 +1,17 @@
 # Template file for 'python3-yaml'
 pkgname=python3-yaml
-version=5.3.1
-revision=3
+version=5.4
+revision=1
 wrksrc="PyYAML-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-Cython"
 makedepends="libyaml-devel python3-devel"
 short_desc="YAML parser and emitter for Python 3"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="MIT"
 homepage="http://pyyaml.org/wiki/PyYAML"
 distfiles="${PYPI_SITE}/P/PyYAML/PyYAML-${version}.tar.gz"
-checksum=b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d
-
-do_check() {
-	python3 setup.py test
-}
+checksum=3c49e39ac034fd64fd576d63bb4db53cda89b362768a67f07749d55f128ac18a
 
 post_install() {
 	vlicense LICENSE

From a1531952a51928b6f70bd65292eaeab87c9a4ea3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 20 Jan 2021 12:21:46 -0500
Subject: [PATCH 0252/3482] tox: update to 3.21.2.

---
 srcpkgs/tox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 39f3dd4cd009..294f9bf437b6 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.21.0
+version=3.21.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=8cccede64802e78aa6c69f81051b25f0706639d1cbbb34d9366ce00c70ee054f
+checksum=f501808381c01c6d7827c2f17328be59c0a715046e94605ddca15fb91e65827d
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script

From 8462fa73e43bced82cdd6f30793e55e7850fe538 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 21 Jan 2021 21:26:04 +1100
Subject: [PATCH 0253/3482] xbps-triggers: add updmap to texmf trigger.

On some texlive installations, without a rebuild of the database,
new/removed fonts will cease to work correctly, potentially breaking the
entire installation in some cases.
---
 srcpkgs/xbps-triggers/files/texmf-dist | 7 +++++++
 srcpkgs/xbps-triggers/template         | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xbps-triggers/files/texmf-dist b/srcpkgs/xbps-triggers/files/texmf-dist
index 711f63fa1017..94a81947b21a 100755
--- a/srcpkgs/xbps-triggers/files/texmf-dist
+++ b/srcpkgs/xbps-triggers/files/texmf-dist
@@ -16,6 +16,7 @@ UPDATE="$5"
 
 texhash=usr/bin/texhash
 fmtutil=usr/bin/fmtutil-sys
+updmap=usr/bin/updmap-sys
 optional_engines="luahbtex,luajithbtex,luajittex,luatex,xetex"
 
 case "$ACTION" in
@@ -32,6 +33,12 @@ run)
 		${fmtutil} --no-error-if-no-engine="${optional_engines}" \
 			--quiet --all >/dev/null || true
 	fi
+	if [ -x ${updmap} ]; then
+		echo "Syncing font map files..."
+		yes y | ${updmap} --quiet --syncwithtrees >/dev/null
+		echo "Updating font map files..."
+		${updmap} --quiet >/dev/null
+	fi
 	;;
 *)
 	exit 1
diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template
index 75010d6bee7d..b649b5f0bfa9 100644
--- a/srcpkgs/xbps-triggers/template
+++ b/srcpkgs/xbps-triggers/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-triggers'
 pkgname=xbps-triggers
-version=0.118
+version=0.119
 revision=1
 bootstrap=yes
 short_desc="XBPS triggers for Void Linux"

From af51134b0b3d965f0d2ec3fd5689e821212438db Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 21 Jan 2021 21:27:06 +1100
Subject: [PATCH 0254/3482] texlive: fix updmap, remove conflict with psutils.

- updmap fix is needed for the trigger. TEXMFROOT is not the correct
  path in our setup, patch it to what it really should be.
- psutils was conflicting, but these tools are still useful. Rename then
  with a -tl prefix to indicate this (also move around a couple of files
  that were in the wrong place relating to psutils).

Closes: #28074 [via git-merge-pr]
---
 srcpkgs/texlive/patches/updmap.patch | 13 +++++++++++++
 srcpkgs/texlive/template             | 24 ++++++++++++++----------
 2 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/texlive/patches/updmap.patch

diff --git a/srcpkgs/texlive/patches/updmap.patch b/srcpkgs/texlive/patches/updmap.patch
new file mode 100644
index 000000000000..5eb47be4d8c4
--- /dev/null
+++ b/srcpkgs/texlive/patches/updmap.patch
@@ -0,0 +1,13 @@
+kpsewhich TEXMFROOT is not the correct value to use in our setup.
+
+--- texk/texlive/linked_scripts/texlive/updmap.pl	2021-01-21 11:15:02.314074252 +1100
++++ texk/texlive/linked_scripts/texlive/updmap.pl	2021-01-21 11:15:53.365456336 +1100
+@@ -19,7 +19,7 @@
+ my $TEXMFROOT;
+ BEGIN {
+   $^W = 1;
+-  $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`;
++  $TEXMFROOT = "/usr/share/texmf-dist";
+   if ($?) {
+     die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
+   }
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 34f89b159727..72481d85bcbf 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=6
+revision=7
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
@@ -71,7 +71,7 @@ makedepends="cairo-devel freetype-devel gd-devel graphite-devel gmp-devel
  harfbuzz-devel icu-devel libpaper-devel libpng-devel mpfr-devel
  poppler-devel pixman-devel libteckit-devel zlib-devel zziplib-devel
  libXaw-devel"
-depends="dialog ghostscript perl-Tk texlive-core xbps-triggers>=0.115_1"
+depends="dialog ghostscript perl-Tk texlive-core xbps-triggers>=0.119_1"
 short_desc="TeX Live"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
@@ -217,10 +217,12 @@ EOF
 }
 
 post_install() {
-	# Those pages are psutils' man-pages
-	for f in extractres includeres psbook psjoin psnup psresize psselect pstops
-	do
-		rm -f $DESTDIR/usr/share/man/man1/$f.1
+	# These tools are still useful for a texlive workflow, but are modified
+	# psutils and conflict with psutils; rename them to have a tl- prefix
+	for f in extractres includeres psbook psjoin psnup psresize psselect \
+			 pstops epsffit ; do
+		mv "${DESTDIR}/usr/share/man/man1/"{,tl-}"${f}.1"
+		mv "${DESTDIR}/usr/bin/"{,tl-}"${f}"
 	done
 	cp -rf ${wrksrc}/texk/tests/TeXLive \
 		"${DESTDIR}/usr/share/texmf-dist/scripts/texlive"
@@ -265,9 +267,10 @@ texlive-dvi_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - tools for dvi based workflow"
 	pkg_install() {
-		for i in afm2tfm bbox epsffit extractres includeres ps2eps psbook psjoin \
-				 psnup psresize psselect pstops ; do
+		for i in afm2tfm bbox tl-extractres tl-includeres tl-psbook tl-psjoin \
+				 tl-psnup tl-psresize tl-psselect tl-pstops ; do
 			vmove "usr/bin/${i}"
+			vmove "usr/share/man/man1/${i}.1"
 		done
 		vmove usr/bin/dvi*
 	}
@@ -373,13 +376,14 @@ texlive-ConTeXt_package() {
 	short_desc+=" - alternative general-purpose document processor"
 	pkg_install() {
 		for i in context contextjit mptopdf mtxrun mtxrunjit texexec \
-				 texmfstart dosepsbin epspdf epspdftk purifyeps repstopdf ; do
+				 texmfstart dosepsbin epspdf epspdftk purifyeps repstopdf \
+				 ps2eps tl-epsffit ; do
 			vmove "usr/bin/${i}"
 		done
 		for i in context dosepsbin epspdf epstopdf ps2eps purifyeps ; do
 			vmove "usr/share/texmf-dist/scripts/${i}"
 		done
-		for i in epsffit ps2eps ; do
+		for i in tl-epsffit ps2eps ; do
 			vmove "usr/share/man/man1/${i}.1"
 		done
 	}

From 6753a7c05d9c858b51f7bfefa7db89aabe4ed1c3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 Jan 2021 09:17:01 -0500
Subject: [PATCH 0255/3482] python3-pandas: fix checksum

---
 srcpkgs/python3-pandas/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index e6a64113b284..c4cf88cc45da 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=c04224636fbcff8cb2df2d14ea48828224022f212f88c9542b68640747dfa1ef
+checksum=e129d3abfa6134a1d6dc061ebb5e52da661ce0aa2febc2b7757ffb785b65e8e4
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds

From 6dd8c08b3476097b764bfcf43faaa634211f781e Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 7 Jan 2021 12:07:21 -0500
Subject: [PATCH 0256/3482] ell: update to 0.36.

- Drop musl-rawmemchr patch.
- Make @ericon maintainer.
---
 srcpkgs/ell/patches/linux-types.patch    | 10 ----------
 srcpkgs/ell/patches/musl-rawmemchr.patch | 18 ------------------
 srcpkgs/ell/template                     | 11 +++++++----
 3 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/ell/patches/linux-types.patch
 delete mode 100644 srcpkgs/ell/patches/musl-rawmemchr.patch

diff --git a/srcpkgs/ell/patches/linux-types.patch b/srcpkgs/ell/patches/linux-types.patch
deleted file mode 100644
index a3b6baa3cef2..000000000000
--- a/srcpkgs/ell/patches/linux-types.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ell/dhcp-server.c.orig	2020-11-30 12:16:40.821110152 -0500
-+++ ell/dhcp-server.c	2020-11-30 12:16:55.123140621 -0500
-@@ -24,6 +24,7 @@
- #include <config.h>
- #endif
- 
-+#include <linux/types.h>
- #include <net/ethernet.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
diff --git a/srcpkgs/ell/patches/musl-rawmemchr.patch b/srcpkgs/ell/patches/musl-rawmemchr.patch
deleted file mode 100644
index 8bbe4f5236b6..000000000000
--- a/srcpkgs/ell/patches/musl-rawmemchr.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This will be addressed in the next upstream release (>1.10) as shown here:
-
-https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=3916c1cc32be205e185a8a56de5cde1b9ec60e81
-
---- ell/pem.c.orig	2020-11-30 09:02:25.583791998 -0500
-+++ ell/pem.c	2020-11-30 09:03:23.548913496 -0500
-@@ -224,7 +224,11 @@
- 
- 		/* Check that each header line has a key and a colon */
- 		while (start < end) {
-+#if defined(__GLIBC__)
- 			const char *lf = rawmemchr(start, '\n');
-+#else
-+			const char *lf = memchr(start, '\n', end - start);
-+#endif
- 			const char *colon = memchr(start, ':', lf - start);
- 
- 			if (!colon)
diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template
index 427104e5e16c..a221184180ef 100644
--- a/srcpkgs/ell/template
+++ b/srcpkgs/ell/template
@@ -1,6 +1,6 @@
 # Template file for 'ell'
 pkgname=ell
-version=0.35
+version=0.36
 revision=1
 build_style=gnu-configure
 configure_args="--enable-glib"
@@ -8,14 +8,17 @@ hostmakedepends="pkg-config"
 makedepends="libglib-devel"
 checkdepends="dbus"
 short_desc="Linux library for embedded development"
-maintainer="Peter Bui <pbui@github.bx612.space>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-only"
 homepage="https://01.org/ell"
 distfiles="${KERNEL_SITE}/libs/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=2bfe9da7781f65f1cb1595a5a068a3ae74d4b68b74f287c6f0c892cfe623913f
+checksum=2f99e743a235b1c834b19112e4e0283d02da93b863899381466cde47bf159cf6
 
 do_check() {
-	dbus-run-session make check
+	if [ "$XBPS_CHECK_PKGS" = full]; then
+		# tests depend on kernel features
+		dbus-run-session make check
+	fi
 }
 
 ell-devel_package() {

From 065adf62bd19c9e1594ca6d5b1b4f442fc66fa60 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 7 Jan 2021 12:07:29 -0500
Subject: [PATCH 0257/3482] iwd: update to 1.11.

- Bump ell version in depends due to new symbols.
- Make @ericon maintainer.

Closes: #27741 [via git-merge-pr]
---
 srcpkgs/iwd/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index aa7e24ffb1d0..176fb47aba06 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,27 +1,30 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=1.10
+version=1.11
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd-service --enable-pie
  --enable-external-ell --enable-dbus-policy --enable-wired"
-hostmakedepends="python3-docutils pkg-config automake libtool"
+hostmakedepends="python3-docutils pkg-config"
 makedepends="readline-devel dbus-devel ell-devel"
-depends="dbus ell>=0.29"
+depends="dbus ell>=0.36"
 checkdepends="python3"
 short_desc="Internet Wireless Daemon by Intel that aims to replace wpa_supplicant"
-maintainer="Peter Bui <pbui@github.bx612.space>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="LGPL-2.1-or-later"
 homepage="https://iwd.wiki.kernel.org/"
 changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog"
 distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz"
-checksum=94781d7435f1822dd55ae6abe8091e04db4c69abd2e800669981a1a75512e463
+checksum=db854f569cfa94dc32120d8cf2e7d483a16679f238e1a4794837d0e455ea7aa9
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"
 
-pre_configure() {
-	autoreconf -fi
+do_check() {
+	if [ "$XBPS_CHECK_PKGS" = full]; then
+		# tests depend on kernel features
+		dbus-run-session make check
+	fi
 }
 
 post_install() {

From ae06ba604c515dabf49ddc901ea668f3571969c0 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 21 Dec 2020 18:18:51 +0100
Subject: [PATCH 0258/3482] elogind: update to 246.9.2

Closes: #27276 [via git-merge-pr]
---
 srcpkgs/elogind/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 35480b0ece0f..228a35ad87f4 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,8 +1,7 @@
 # Template file for 'elogind'
 pkgname=elogind
-reverts="243.7_1"
-version=243.4
-revision=3
+version=246.9.2
+revision=1
 build_style=meson
 configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
  -Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
@@ -18,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/elogind/elogind"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=f1098745863138e6270ea22e78a39baef9a0356b48246c5a53b34211992dc7db
+checksum=dd2fcf22a89a078cad22e633d2f14a4cc9f4a9c8bae25c0e39fc4aec3e273bc9
 conf_files="/etc/elogind/*.conf"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
@@ -39,6 +38,13 @@ pre_check() {
 	echo 'dummy-file' > /etc/os-release
 }
 
+do_check() {
+	if [ "$XBPS_CHECK_PKGS" = full ]; then
+		# tests fail differently due to containerization and kernel features
+		make check
+	fi
+}
+
 post_check() {
 	rm -f /etc/machine-id /etc/os-release
 }

From aaeb2facbc01d2ef0b02f536e14a7dbbac9d0e55 Mon Sep 17 00:00:00 2001
From: Daniel Kolesa <daniel@octaforge.org>
Date: Thu, 21 Jan 2021 14:13:32 +0100
Subject: [PATCH 0259/3482] gcc: patch gccgo on musl to allow usage of
 freestanding libucontext

---
 srcpkgs/gcc/files/gccgo-musl.patch | 22 ++++++++++++++++++++++
 srcpkgs/gcc/template               |  5 -----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gcc/files/gccgo-musl.patch b/srcpkgs/gcc/files/gccgo-musl.patch
index 9b3f3af9b7fb..a2ce4b2b0469 100644
--- a/srcpkgs/gcc/files/gccgo-musl.patch
+++ b/srcpkgs/gcc/files/gccgo-musl.patch
@@ -1,6 +1,9 @@
 This is not among the normal patches as these changes are musl specific and
 there is no way to easily conditionalize it in source for some of the changes.
 
+Added by q66: runtime.h now uses libucontext_ prefixed APIs to allow build
+with freestanding versions of libucontext
+
 Souurce: Adélie Linux, q66
 URL: https://code.foxkit.us/adelie/packages/tree/master/system/gcc
 
@@ -186,6 +189,25 @@ URL: https://code.foxkit.us/adelie/packages/tree/master/system/gcc
  	  {
  		mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
  		int i;
+--- libgo/runtime/runtime.h
++++ libgo/runtime/runtime.h
+@@ -500,10 +500,13 @@ int __go_setcontext(__go_context_t*);
+ void __go_makecontext(__go_context_t*, void (*)(), void*, size_t);
+ #else
+ #define __go_context_t	ucontext_t
+-#define __go_getcontext(c)	getcontext(c)
+-#define __go_setcontext(c)	setcontext(c)
++int  libucontext_getcontext(__go_context_t *);
++void libucontext_makecontext(__go_context_t *, void (*)(), int, ...);
++int  libucontext_setcontext(const __go_context_t *);
++#define __go_getcontext(c)	libucontext_getcontext(c)
++#define __go_setcontext(c)	libucontext_setcontext(c)
+ #define __go_makecontext(c, fn, sp, size) \
+-	((c)->uc_stack.ss_sp = sp, (c)->uc_stack.ss_size = size, makecontext(c, fn, 0))
++	((c)->uc_stack.ss_sp = sp, (c)->uc_stack.ss_size = size, libucontext_makecontext(c, fn, 0))
+ #endif
+ 
+ // Symbols defined by the linker.
 --- libgo/sysinfo.c
 +++ libgo/sysinfo.c
 @@ -73,9 +73,6 @@
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a346b50d56dc..f7fa99383b13 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -46,11 +46,6 @@ case "$XBPS_TARGET_MACHINE" in
 	mips*-musl|ppc*) _have_gccgo=no ;;
 esac
 
-# FIXME
-if [ -n "$CROSS_BUILD" -a "$XBPS_TARGET_LIBC" = "musl" ]; then
-	_have_gccgo=no
-fi
-
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="tar texinfo perl flex"
 else

From 7d1cbb6e5082c454223bcd7ec98983f1b9dc1f23 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 20 Jan 2021 12:36:15 +0100
Subject: [PATCH 0260/3482] open-vm-tools: update to 11.2.5.

---
 srcpkgs/open-vm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 35e77a450774..91f592220c4d 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'open-vm-tools'
 pkgname=open-vm-tools
-version=11.2.0
+version=11.2.5
 revision=1
 archs="x86_64* i686* aarch64*"
 wrksrc="open-vm-tools-stable-${version}"
@@ -19,7 +19,7 @@ license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/vmware/open-vm-tools"
 changelog="https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/ChangeLog"
 distfiles="https://github.com/vmware/open-vm-tools/archive/stable-${version}.tar.gz"
-checksum=280970a15dd8210b89e68df5fce64fa8bfb3ff7ca3737ce5ebf8634d8c1a2494
+checksum=7c31bb8ef70a0e32b81cde6550cae390a53108e4abb28bb539b0ab5b9e4fc188
 
 build_options="pam x11"
 build_options_default="pam x11"

From 57cdf59dd70a30654b204a894751c887e5c9bbc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 21 Jan 2021 11:59:22 -0300
Subject: [PATCH 0261/3482] firefox: revbump for seccomp filters on 32bit
 glibc.

This matters only for armv7l, since firefox for i686 had already been
built with updated kernel headers, but the cross toolchains didn't have
them.

Also add mozconfig option to enable language packs to work out of the
box.

Fixes #27255
---
 srcpkgs/firefox/files/mozconfig | 2 ++
 srcpkgs/firefox/template        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/firefox/files/mozconfig b/srcpkgs/firefox/files/mozconfig
index 31bb6dcd0f2d..fa5a7a42e04b 100644
--- a/srcpkgs/firefox/files/mozconfig
+++ b/srcpkgs/firefox/files/mozconfig
@@ -32,3 +32,5 @@ ac_add_options --enable-optimize="$CFLAGS"
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-application=browser
+
+ac_add_options --allow-addon-sideload
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 3fc52655d4eb..70cd34499359 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -4,7 +4,7 @@
 #
 pkgname=firefox
 version=84.0.2
-revision=1
+revision=2
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"

From be36e2cdaff462e617e95b16626efe8aaab7b540 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 21 Jan 2021 16:08:33 +0100
Subject: [PATCH 0262/3482] jitterentropy: update to 3.0.1.

---
 srcpkgs/jitterentropy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jitterentropy/template b/srcpkgs/jitterentropy/template
index 746a015f9f50..b0a2842ad0ee 100644
--- a/srcpkgs/jitterentropy/template
+++ b/srcpkgs/jitterentropy/template
@@ -1,6 +1,6 @@
 # Template file for 'jitterentropy'
 pkgname=jitterentropy
-version=3.0.0
+version=3.0.1
 revision=1
 wrksrc="${pkgname}-library-${version}"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
 homepage="https://www.chronox.de/jent.html"
 distfiles="https://github.com/smuellerDD/jitterentropy-library/archive/v${version}.tar.gz"
-checksum=e4e0e6a2ae19c8b927bb7d249c05610297c2ca8b6d4eb84ff348e8412f71d825
+checksum=015a443ebfaab7bc302caa24dcc124aefe1818046893f49591d2465bd3f58e16
 
 jitterentropy-devel_package() {
 	short_desc+=" - development files"

From 0447d19a7c0fddae1399bd3557a1ce4f65d6e506 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Tue, 19 Jan 2021 23:46:32 -0800
Subject: [PATCH 0263/3482] GoLand: update to 2020.3.1.

---
 srcpkgs/GoLand/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template
index 18ed226159dc..71067ad0f526 100644
--- a/srcpkgs/GoLand/template
+++ b/srcpkgs/GoLand/template
@@ -1,6 +1,6 @@
 # Template file for 'GoLand'
 pkgname=GoLand
-version=2020.2.3
+version=2020.3.1
 revision=1
 archs="i686 x86_64"
 depends="jetbrains-jdk-bin"
@@ -9,7 +9,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/go"
 distfiles="https://download.jetbrains.com/go/goland-${version}.tar.gz"
-checksum=c0ca83c05e156c58483b42eb9a14fd1013434c8936fbba20ffd4b0b722a6bfa2
+checksum=b336e309edf51a3c6fa9b3424538a4cd9055d6516373fcf0f1d5a9ba840af189
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -19,6 +19,8 @@ post_extract() {
 	# Remove files for other CPU architectures
 	rm -rf bin/fsnotifier-arm
 	rm -rf lib/pty4j-native/linux/ppc64le
+	rm -rf lib/pty4j-native/linux/aarch64
+	rm -rf lib/pty4j-native/linux/mips64el
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)

From 4f9e7d9176e2e6444bba2d82b50800ea0f95c3aa Mon Sep 17 00:00:00 2001
From: Georgian Fire <gfire@tuta.io>
Date: Tue, 19 Jan 2021 14:43:05 -0500
Subject: [PATCH 0264/3482] font-iosevka: update to 4.5.0

---
 srcpkgs/font-iosevka/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 85ad5eb1fd25..7027b3212ff3 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=4.0.0
+version=4.5.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -11,9 +11,9 @@ homepage="https://typeof.net/Iosevka/"
 distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENSE.md>LICENSE.txt
  https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-slab-${version}.zip"
-checksum="e61c0988bb231a321f14cce1b119a468f279ea86826c32e943ab16dbf08c1ba9
- 689e97f69cf207203d232f14382fa746bfeb5988c73d24fd2fcfcd93d1559417
- a8d09017d69918acf8e21b4ecd80edf9001c35f791bda959b9d5a69ccc0b5028"
+checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
+ 884e82e41f094eb2dc50c2d2706237416ad6bed83cf57d0f76fb884d38e285c5
+ 56987be16eb0e7f5ac653ac66eede10e5e2431b62a2c70f152734c348963e09e"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 82e8532592156fd9b2b7728f9871af000fb77e90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 18 Jan 2021 16:03:55 -0300
Subject: [PATCH 0265/3482] thunderbird: update to 78.6.1, adopt.

---
 srcpkgs/thunderbird/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 5ccbe65c2646..90726eef5646 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.6.0
+version=78.6.1
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=1dd6f9a4d88b4c3d0ec47bba60a891243ef95e105a9045b2d32e2b126779844b
+checksum=870b544d26f5e52c187499d134e49eded2943a4a029269ae86aba6a69c53dcc6
 
 lib32disabled=yes
 

From 7ac00e994efc7aa88e7fd7f77f8380e653bfb7fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 18 Jan 2021 16:04:21 -0300
Subject: [PATCH 0266/3482] thunderbird-i18n: update to 78.6.1.

---
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 79cd560228ef..3385c87d31d3 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.6.0
+version=78.6.1
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="77c0da17d85872a3ceae3d5849655a0dd3d783b365d405d4c2f9b3a243b3e5aa
- e92122dfd91a99e7c32b90c5055f7f0c1a5268e0c001da5fc142a9d63261f0de
- 62d1d6d4f34292549b6ada66ede177b1a26efaeaa2e4d9e0f5ea7aeb6a555c1a
- 7846462412da03936930afb548657bea5c0e73eb464affd54459332888b6c744
- 27534af1a57041a076261443347f183d80d757da14157ddba11ff393f248ed8b
- c1541a2035e9ae4549c337686c9d8e9e995a32bc6173794d834bd83f404845dc
- 3791e46378d40f75016ff5d35e66a8cef8aaed45f87368ac07bcec7fa916472f
- 617f1c23b7210bf4ceccb22a3824a15074e2d9770ca66a26f6448d26beb72e81
- e90862ea3b5a6653e9eea25613915392c438ae5ae42d860440d85ffa1d850e3d
- 59bbfca02bb2ac6853c845653dc2de5ba123b33b468595a356f419c1fc8b6527
- ec3e37a0a4c4dde29ba4c538d1efc1e135ef950ce95aa928c617b9da2a3de783
- 27c42d0537c3e51c7b2289fd25ef201bcd62281b5d844b68c03474be2a1e54e6
- b299d69c68a79e3709c1487ae87f8ebf5765ef38f483d148238c7c7bd54a047a
- 408fe2cc100ea42751baa138b98d62ed78b5bb69f44039f61eea8262d5e9cd2e
- 913446300c7b3e837309fb137e7f68f62da3c23939287feeb94a5d35425140ca
- 5ed478e15a65d6ff15683b64f2769e3f7ced421c424d59ea7dba644cb5b84759
- 2b7d9416fa15300c18b13a34ab709b307ded3705d0ccffc70423ecf9762dbff8
- 31628ff53e3e87cbce122908b537df030f3ec936def0eb0e50c9791e6103b042
- d7233c9efe07e54ec29911a8b27b8bce2b09f59e027687218c300374abc80aea
- 6ed4dc7f605de1516f9ae175b2b12bcd9d0fce64a8f00acb9a675ac1258af6a9
- 16a31b73042ffaf8373a977cdb2a2c563a6b49d13bc504569865a305e3fae380
- 5328efe43bdf651f3ff72696f96e8ea2aa000a95233b6a406f612c6a076ac38c
- 802db39bd53707555bbd5202c2668c7be92598b75cd7364e6169218c9f1f001e
- 9f9a547d87133a468757baa38a600ad24a8479231766529c2612d6f7a63836a2
- 82cf87688f7594e9d882969efd5a5963f3fa3f8b91e026b271fe630b3fda777a
- 55c8f68d1702befe1782c7373893fac4d9e15fb77fcd9ee4d8345707969dcf97
- 3cdcf203980d08dd18f0b6a566dc2585140625807f839102f15f0b685312aef6
- 52ed8740582330ac3e2660f86b07676aa72533180d5a0df411569cda7e0d0ee2
- 2e2eaf97e024d908b4cbd837bd8d14e50fc30bc877958f458568f3d5ef03debf
- 44830607a1818da44721d6dfb7c60395c5557c4e84fcbf7936106f6d64c0b2df
- 1727d70e0a3a8c8c8c6dc049243cd7ffb6710226b0ab7e4e4d776e241c13eaf9
- 10cb0bdbc88f5718f7a7877d4ec2c5e7fc71e4dd13e0522ec10082f9846fb65c
- 77740587416416ca7401573e4ba820ad2a3adb32374cb83b8a56e48aa4411b28
- 7b63447a8ee28e635e7cb060a1df868c6a8c0d11448c30712fae971ba02e132e
- a4aa893d47d6edb2e9f8ad6423abe17e39be8dded5f359ed933723b944c6a85b
- 327cdc48a35fdcae7daa3dac86005d15798fd8ad4ffd47a497923dcbdf9cf386
- 32a0a2dc3075db4645836dab1d6353d9466328c0e63e183290f345a04e285f87
- e07cc90bcb41097ba19d886d2d1e38ef3b3ae2f6d36cf0133e018e40535357d6
- 669a76ddd841a6559cbfdd97c82961251030e01036831279210f94606d472f05
- e6f698313d67ab9da38ff1ff8097264dabc87de85df0e1c363736f60ad0954e2
- 48ac6b9506b2cae19451845a6d633579ed341e367e4c22f525c5d147cea7bb85
- 45fbeacc161c4d3e9fa8ba12c7a06b6ddf56dc5aa3c49543f45c9e5ecc6f8533
- 8114465485f3740e2f38cd31e29e183a91cfe50c1b3bcdd2fac37f5254df38c5
- 26869522aa4a17cd3965dc35442e6687cec86274cc17d43d3eda36b71e293071
- 79ede7a6a4fdc587996a6717891a1931f63a07d468d3adf07b4df56402202fbd
- 76acb24a68cc77a9f28b31e7337c815b8fefa81df6a47d57ed81612dc69c9878
- bace543f253d44df294a35bb9db6dd4fbef8d0196a5698e0a862c589519c07d5
- 8b6bd148954f415265dee893ca94024826c0f3a2ed0c308e3386637f158ed26b
- 887a93e80fa6b42832e04ebea6f5c1a3cdb76cb6d4b2b0c0c882ab3c80a2c2da
- 0e7b8d2f3c7b57751cc68aae7135976c9683eb14b703d23b90fe31ed4170b55c
- 82f17754a013e65ad962e88a709be83eae9a00f0ba62c94bfbdf53eeb099ed19
- 1aa191b1dd13e47e02e7167063afc89bb091d7a38708fc5d7e8e5c0a34f4dd43
- cedb43a69a31e5c889f5dd485cc8036819248cfe8e49c4b519f4854c5dddb3a8
- 131e883c87b8f4af323007f112ae93bfa8e37701ff4c64237e4db2045bbefb74
- f54718774782453f8dfce92e55177663dbc8f49d8da668b0f745b98f0ca854f2"
+checksum="e219394dff8efa55cff3bcdfeb11512c05429a8a8b1b267a4e25d7b4f25ff8bf
+ 70100e330a4357fd41aaace58191faa5d33ffc6160a71375fa50beac13426464
+ 232de444679279f96d3aef9122c6ed1f1cd21519f8bade4921ba57cdae1841f5
+ 7d72da039551edc420a8d26d4a36a8d2b4f157091acaf0743ea65da6b5fe94b9
+ 0c26eee598ac67d9ee621a439c1c74fa3144a85a7a868330bc2896c01c2ec048
+ 349c6745d419fa442dd9bb3b8e93a7ca3ee870d50365c52b059f7d17fdab7bf2
+ 396b1ba5ce5f688e1ac46d240d5cf9ccb8e7c956c2fc11f92ad0cb8bba8fa02f
+ a059986fa9a302f51ed5de605f48750b5d4c56def5843f9024b11dbb54fd0576
+ 1b0f2bab89d93a7279114fb288ac3d7593d12d1b42ac8f33c50a4b701bd20907
+ aba82ecc6d91d6d47440fbffeb14f6ede17eb89a06566c001de50b5b35f948fb
+ 07b9b1837eaa5b4b1b7c45e37c83eb7225627daa088b841e006582cc244d798a
+ 581f415d8146dce16ec3ef25b43c323f01a8d90d3aad9ba16801b30df410ad6c
+ 2888542aac6163f93776bb43aa18a6636b2aa794ad8e349d95548faaf666569e
+ c296a9bd8c6f89ef7c75707d239d218b918f9fc68f1a10262362963cbbe8a010
+ 47903e76d08ae2f2cdc51828a65f9b34839930219a2c6e017e729c0d41f9677d
+ 3e2a49c7314c050a680e85e40ec57794cdf8fa382c23744247d04db412d1527f
+ e3123b6fa35c0b60c90c635bc80da772eecc3c60acf596af4a78ab01d9651863
+ f04e7ccb3416f29dadb85caf193a1420c56d52797b28ddb0ed300e33f3de5b43
+ 9022ec0a832d35982d8ebe2a847fb8cfd2e8c7def938d2262a671921832cef09
+ 1e1a2640a14b9644e6e0e25a8e400c800d9855678a84e70bac35cbcea6e6e2de
+ 248a7f831ebc78b21abc80046e1670183d24becc075929212d8f904a9a2bfad1
+ 7b1ad4971690b75e41e881038773e9b14e74798888d4797b13a4d6149c6898ec
+ 83c2393f2440dac78b601b4e037c86242dbd32dbf20e80ba9eef4aa100975eaf
+ 9828b309b689d3dd193824b6d27e9d26ad0e64a6193b3917d80632051f7876e7
+ 738653a9e4e5b42eb3aac6b21bd868bfd1d91e9f6df4fb9828dbfa5e3bf83edd
+ b43cd7995f75b5c59851fec42864bdece44fe1a5e29125a59b8b4efdedb6e068
+ 076f46a1c75cad00b07dec0009859133a0a8edab07a91c9c19f735891ae38368
+ f60db3af5aa6f9e54a18792c23d1e37f3eb31d995062eb8e42803442029ad10e
+ a0d2f462e3c1203315eeea160e44347a9f09a4e2be02fde958316987d280fce9
+ 9c62dcfac247ec9daad9ae1040ce6cfe840f5ae7fc05c03531ef1baca8b9d2ed
+ 65438bc89ee12fac5322b17eb460c399e1c79153b8401b3a903b7dcc1c334f74
+ cf414370af76d6acc24e79024930ab285544be64fe21be97364616dd2a579e10
+ 2127e4879f5e59cc843b9ef2dc4fb06649520685ced51ab0d87e8d703705b17e
+ f868867c74a72317ec9df521e88e64308119def7b045119061a4e8be66285d0c
+ aee136f1b637c3fe7432b15c1184b8ecf019da291a756a8a1269ecfad675f999
+ 23a783b408b8f72fc8ed32fd0c8b62c3aeee458569f6c239554b57897bac7375
+ 0d9d01a16595895546b40da1836a798395cd571e2e25d6b6d0b6852c4181efe8
+ a6a187d0f22a9c14a293ce0da887f6954218c27cad89bbafbf29bd19b487d1ea
+ 59b07afeed57833d55112aca0e4c054fdc7855c2b687a69ed8d3771b2b039d30
+ 255759456642abb9b7a97f7ebedcc3c946d816b80db3b8ffdcbabb5420c96b41
+ 56d761ca31c963351f6c34b15a82a31f5bf98a905eb1b02339a6e4613e12c7e5
+ 19c814481e03422ecf538478806c4e64803c2a7a011eea614e26abe78210162b
+ a5324699458b5f767e48cbf763a9a7aa89ffe003b7f7b3a2fa199fd24d063206
+ fbd135f039a85e064420f6cb6859fbca3ba6c24e438339e9308253cf8aead81b
+ c2f7b0ba8e1919b9452c0c02d3a8338442bfdcb17f2049c4b1e29a0c347fef0a
+ 89eb18e56ca896cfa9d4059c7a9798afb539c4f18ead11d39f10d00967013938
+ 9ebda35cadfddbc0e460cc0003e745f0e1fff1cff40e7a0fc03b10e5780f8456
+ 6ba07d9ad3fa236c014a081697cf7f9f870a5bc9b60b7e03a456de3e3e597acb
+ 6943914ef17d0f62de915721c526e4fbd3aa4d63bb8144cf95bd44a86a14bc69
+ 4430402ad31bb9799f0b3110abbb2dc412022eb74b06bd5d656c6246f041b40c
+ 17914302e797f5362f8e6b7473ba02278003263c63dd20b044eb70a575550050
+ 66bb52f540987cb548353cd0f15d34fc6d600bedd9c07df25e3e7770d12bd7de
+ 70cc073b366a3dc4c96369ba132308e7fa72f04c8ab3516460c45339d7ffb6b9
+ 82a8ebb64d5e5af7d24b79d18650f632e90f9fd8c5d40379964d6f8bf403d336
+ 613133513d1287ab13168f6ddf225d5ad9e697ec44f769cee3e9b70ee9b86150"

From fd134b606932db34a58abc9e69b365bcb0dc9ee8 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 20 Jan 2021 22:43:56 +0100
Subject: [PATCH 0267/3482] lutris: fix crash, add missing dependency

---
 srcpkgs/lutris/patches/fix-dxvk.patch | 22 ++++++++++++++++++++++
 srcpkgs/lutris/template               |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/lutris/patches/fix-dxvk.patch

diff --git a/srcpkgs/lutris/patches/fix-dxvk.patch b/srcpkgs/lutris/patches/fix-dxvk.patch
new file mode 100644
index 000000000000..1a7c135d06ed
--- /dev/null
+++ b/srcpkgs/lutris/patches/fix-dxvk.patch
@@ -0,0 +1,22 @@
+upstream: yes
+--- lutris/util/wine/dxvk.py
++++ lutris/util/wine/dxvk.py
+@@ -53,7 +53,8 @@ def version(self):
+         """Return version of DXVK (latest known version if not provided)"""
+         if self._version:
+             return self._version
+-        return self.versions[0]
++        if self.versions:
++            return self.versions[0]
+ 
+     @property
+     def dxvk_path(self):
+@@ -62,6 +62,8 @@ def dxvk_path(self):
+ 
+     def load_dxvk_versions(self):
+         versions_path = os.path.join(self.base_dir, "dxvk_versions.json")
++        if not system.path_exists(versions_path):
++            return []
+         with open(versions_path, "r") as dxvk_version_file:
+             dxvk_versions = [v["tag_name"] for v in json.load(dxvk_version_file)]
+         return dxvk_versions
diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template
index 6a059013032f..c8008f65f8fc 100644
--- a/srcpkgs/lutris/template
+++ b/srcpkgs/lutris/template
@@ -1,12 +1,12 @@
 # Template file for 'lutris'
 pkgname=lutris
 version=0.5.8.2
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="gettext python3-setuptools python3-gobject gtk+3-devel"
 depends="python3-dbus python3-gobject python3-yaml python3-evdev python3-Pillow
  pciutils cabextract gtk+3 xrandr unzip p7zip gnome-desktop python3-requests webkit2gtk
- glxinfo python3-distro python3-lxml"
+ glxinfo python3-distro python3-lxml python3-magic"
 short_desc="Open gaming platform for managing games in a unified way"
 maintainer="Jan Wey. <janwey.git@gmail.com>"
 license="GPL-3.0-or-later"

From fb07496d6bb4f4c1e9f0bc33eb4174e49a34139a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 20 Jan 2021 18:37:20 +0200
Subject: [PATCH 0268/3482] growlight: update to 1.2.27.

---
 srcpkgs/growlight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 650cfceac6c3..d66c560c1291 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,6 +1,6 @@
 # Template file for 'growlight'
 pkgname=growlight
-version=1.2.26
+version=1.2.27
 revision=1
 build_style=cmake
 configure_args="$(vopt_bool zfs USE_LIBZFS) $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://nick-black.com/dankwiki/index.php/Growlight"
 distfiles="https://github.com/dankamongmen/growlight/archive/v${version}.tar.gz"
-checksum=fd44f4b6fdec3200c539dcb520347634727872dfffada98433162eb824903bfb
+checksum=3d5ebd86dd4c378192c446cd0f13968f565c2c9848b2ae13cc493b9682703180
 
 build_options="man zfs"
 

From d4505b40ebcdcde911f2b74a521e40648a704c5d Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 20 Jan 2021 09:23:03 +0100
Subject: [PATCH 0269/3482] terminology: update to 1.9.0.

---
 srcpkgs/terminology/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terminology/template b/srcpkgs/terminology/template
index 36983b6fc0c7..af994753275d 100644
--- a/srcpkgs/terminology/template
+++ b/srcpkgs/terminology/template
@@ -1,6 +1,6 @@
 # Template file for 'terminology'
 pkgname=terminology
-version=1.8.1
+version=1.9.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config efl gettext"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.enlightenment.org"
 distfiles="https://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=04a69ac8ade443cba7dae20f82bbaa431fd155cec60c133b263d82f18e93b8bb
+checksum=3f3bc327da5cc239d468570afed29a17e2fda3b1fee02b28f02ee7ed5141e46c
 
 post_install() {
 	vlicense COPYING

From f57ccccd262aab05102dc82d66d7a98b9d61918c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Jan 2021 17:56:31 +0100
Subject: [PATCH 0270/3482] linux5.10: fix config for new aarch64 options.

---
 srcpkgs/linux5.10/files/arm64-dotconfig | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index f0fcc43b536b..e089585f4d42 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.1 Kernel Configuration
+# Linux/arm64 5.10.9 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 9.3.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=232000000
+CONFIG_GCC_VERSION=100201
+CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
@@ -449,9 +449,11 @@ CONFIG_ARM64_CNP=y
 #
 # ARMv8.3 architectural features
 #
+CONFIG_ARM64_PTR_AUTH=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
 CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
 CONFIG_AS_HAS_PAC=y
+CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y
 # end of ARMv8.3 architectural features
 
 #
@@ -466,9 +468,12 @@ CONFIG_ARM64_TLB_RANGE=y
 # ARMv8.5 architectural features
 #
 CONFIG_ARM64_BTI=y
+CONFIG_ARM64_BTI_KERNEL=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
 CONFIG_ARM64_E0PD=y
 CONFIG_ARCH_RANDOM=y
+CONFIG_ARM64_AS_HAS_MTE=y
+CONFIG_ARM64_MTE=y
 # end of ARMv8.5 architectural features
 
 CONFIG_ARM64_SVE=y
@@ -1076,6 +1081,7 @@ CONFIG_DEV_PAGEMAP_OPS=y
 CONFIG_HMM_MIRROR=y
 CONFIG_DEVICE_PRIVATE=y
 CONFIG_FRAME_VECTOR=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
 CONFIG_READ_ONLY_THP_FOR_FS=y
@@ -7949,7 +7955,6 @@ CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_APPLE_MFI_FASTCHARGE=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -11096,7 +11101,6 @@ CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
-CONFIG_DMA_VIRT_OPS=y
 CONFIG_SWIOTLB=y
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_DMA_COHERENT_POOL=y
@@ -11387,6 +11391,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y

From 8d09903501d10078997222b976e33c9d858f4e7a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 20 Jan 2021 20:09:22 +0100
Subject: [PATCH 0271/3482] gscan2pdf: update to 2.11.0.

---
 srcpkgs/gscan2pdf/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template
index 5cd68a3343a1..3f9360dfb05e 100644
--- a/srcpkgs/gscan2pdf/template
+++ b/srcpkgs/gscan2pdf/template
@@ -1,6 +1,6 @@
 # Template file for 'gscan2pdf'.
 pkgname=gscan2pdf
-version=2.10.2
+version=2.11.0
 revision=1
 build_style=perl-module
 hostmakedepends="perl gettext"
@@ -15,9 +15,8 @@ short_desc="GUI to produce PDFs or DjVus from scanned documents"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-3.0-or-later"
 homepage="http://gscan2pdf.sourceforge.net"
-# distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-distfiles="$DEBIAN_SITE/main/g/gscan2pdf/gscan2pdf_$version.orig.tar.xz"
-checksum=e3e3e89f835fc0b7936e88f60fad216a76a8e77864b41139044171c011eae27f
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=d0b96e98a68f7f311e48a74e796838f5ef07dca7c90d5bb50081bcba0c2a13cb
 nocross=yes
 
 do_check() {

From 5e25ba5f428a8fa0e78e72b9d4805b25a197485e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 20 Jan 2021 20:05:27 +0100
Subject: [PATCH 0272/3482] filezilla: update to 3.52.2.

---
 srcpkgs/filezilla/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 89419db539a2..ed291a60db7a 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.52.0.5
+version=3.52.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=af615c192ada96fb425f97cf348b802419d27696711d3e5123dfa92a19744829
+checksum=c0788816928a26e8863c7dc26b158644e71bef29406df7d2eda37dc4810d6cdf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"

From 46c4380ffc3ccdae6b71b1eceeafbba67db0ad88 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 20 Jan 2021 20:12:45 +0100
Subject: [PATCH 0273/3482] linux5.4: update to 5.4.91.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 35de1cf56c24..b889f9bf128e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.89
+version=5.4.91
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=268dd5177b6df1867d4ed2452ffb11a016d955c43aba5e07940886f347ab0aaf
+checksum=0e0161bb034b9ba59e58a20985e49ecfb38104586602f53f37b382f508fc5c17
 python_version=3
 patch_args="-Np1"
 

From 47ade802cec1edbc6d36cd1e9c8f8913df27b83c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 20 Jan 2021 20:19:10 +0100
Subject: [PATCH 0274/3482] linux4.19: update to 4.19.169.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 93d5896f8180..d6b48be5bf35 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.167
+version=4.19.169
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=312c67677c75adc4324078c5afb11411df379d5573ad0a429b3f4919f26bed01
+checksum=c7d24ddb8ecc348ca7bed24111ff98e2a87f74666c8bbbf4f9c57b7c3c25de94
 python_version=2 #unverified
 patch_args="-Np1"
 

From 6e61ccec91f4dc91d7685cb91c8912ee3da1cf98 Mon Sep 17 00:00:00 2001
From: Pierre Bourgin <pierre.bourgin@free.fr>
Date: Wed, 20 Jan 2021 22:35:13 +0100
Subject: [PATCH 0275/3482] libsearpc: fix python3 support

Closes: #28041
---
 .../patches/001-python3-support.patch         | 114 ++++++++++++++++++
 srcpkgs/libsearpc/template                    |   4 +-
 2 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/libsearpc/patches/001-python3-support.patch

diff --git a/srcpkgs/libsearpc/patches/001-python3-support.patch b/srcpkgs/libsearpc/patches/001-python3-support.patch
new file mode 100644
index 000000000000..7b4ae20c2819
--- /dev/null
+++ b/srcpkgs/libsearpc/patches/001-python3-support.patch
@@ -0,0 +1,114 @@
+upstream: yes
+
+From b0079d2a0c3ce0cb4698a162498b108244726912 Mon Sep 17 00:00:00 2001
+From: Xiangyue Cai <caixiangyue007@gmail.com>
+Date: Mon, 8 Jun 2020 15:09:06 +0800
+Subject: [PATCH] configure with python3 (#53)
+
+* configure with python3
+
+* remove future
+---
+ configure.ac              | 2 +-
+ pysearpc/client.py        | 1 -
+ pysearpc/named_pipe.py    | 3 ---
+ pysearpc/pygencode.py     | 3 ---
+ pysearpc/server.py        | 2 --
+ pysearpc/test_pysearpc.py | 1 -
+ pysearpc/transport.py     | 2 --
+ pysearpc/utils.py         | 1 -
+ 8 files changed, 1 insertion(+), 14 deletions(-)
+
+diff --git configure.ac configure.ac
+index 53d7438..9c2159a 100644
+--- configure.ac
++++ configure.ac
+@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED])
+ AC_SUBST(JANSSON_CFLAGS)
+ AC_SUBST(JANSSON_LIBS)
+ 
+-AM_PATH_PYTHON([2.4])
++AM_PATH_PYTHON([3.5])
+ if test "$bwin32" = true; then
+    if test x$PYTHON_DIR != x; then
+    # set pyexecdir to somewhere like /c/Python26/Lib/site-packages
+diff --git pysearpc/client.py pysearpc/client.py
+index 20e5535..3650cb1 100644
+--- pysearpc/client.py
++++ pysearpc/client.py
+@@ -1,4 +1,3 @@
+-from builtins import object
+ import json
+ from .common import SearpcError
+ 
+diff --git pysearpc/named_pipe.py pysearpc/named_pipe.py
+index a0ca619..73df576 100644
+--- pysearpc/named_pipe.py
++++ pysearpc/named_pipe.py
+@@ -2,9 +2,6 @@
+ RPC client/server implementation based on named pipe transport.
+ """
+ 
+-from future import standard_library
+-standard_library.install_aliases()
+-from builtins import object
+ import json
+ import logging
+ import os
+diff --git pysearpc/pygencode.py pysearpc/pygencode.py
+index 62a635b..8c718ce 100644
+--- pysearpc/pygencode.py
++++ pysearpc/pygencode.py
+@@ -1,8 +1,5 @@
+ #!/usr/bin/python
+ 
+-
+-from __future__ import print_function
+-from builtins import str
+ import string
+ import sys
+ 
+diff --git pysearpc/server.py pysearpc/server.py
+index a7ec7be..94d9bac 100644
+--- pysearpc/server.py
++++ pysearpc/server.py
+@@ -1,5 +1,3 @@
+-from builtins import str
+-from builtins import object
+ import json
+ 
+ from .common import SearpcError
+diff --git pysearpc/test_pysearpc.py pysearpc/test_pysearpc.py
+index a9c6f8b..64a455d 100755
+--- pysearpc/test_pysearpc.py
++++ pysearpc/test_pysearpc.py
+@@ -1,7 +1,6 @@
+ #!/usr/bin/env python
+ #coding: UTF-8
+ 
+-from builtins import object
+ import json
+ import logging
+ import os
+diff --git pysearpc/transport.py pysearpc/transport.py
+index 3c6e821..3deb42c 100644
+--- pysearpc/transport.py
++++ pysearpc/transport.py
+@@ -1,5 +1,3 @@
+-
+-from builtins import object
+ class SearpcTransport(object):
+     """
+     A transport is repsonsible to send the serialized request to the
+diff --git pysearpc/utils.py pysearpc/utils.py
+index 2aeda93..451ad4e 100644
+--- pysearpc/utils.py
++++ pysearpc/utils.py
+@@ -1,4 +1,3 @@
+-from builtins import bytes
+ import os
+ import socket
+ 
+-- 
+2.30.0
+
diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template
index 625672ca4d50..02273e1ef58d 100644
--- a/srcpkgs/libsearpc/template
+++ b/srcpkgs/libsearpc/template
@@ -2,9 +2,8 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=libsearpc
 version=3.2.0
-revision=3
+revision=4
 build_style=gnu-configure
-pycompile_module="pysearpc"
 configure_args="PYTHON=python3 --disable-static --disable-compile-demo"
 hostmakedepends="automake libtool pkg-config python3 glib-devel"
 makedepends="libglib-devel jansson-devel"
@@ -48,7 +47,6 @@ libsearpc-codegen_package() {
 
 libsearpc-python3_package() {
 	short_desc+=" - Python3 bindings"
-	pycompile_module="pysearpc"
 	depends="python3"
 	pkg_install() {
 		vmove usr/lib/python3*

From 43c98a178b74088b2c0abe89007db6194b16f0e7 Mon Sep 17 00:00:00 2001
From: Oliver Nutter <mrnoname1000@riseup.net>
Date: Sun, 2 Aug 2020 04:44:52 -0500
Subject: [PATCH 0276/3482] zopfli: build with cmake; add a devel subpkg

remove unnecessary vlicense

Closes #23986
Closes #24003
---
 srcpkgs/zopfli-devel    |  1 +
 srcpkgs/zopfli/template | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)
 create mode 120000 srcpkgs/zopfli-devel

diff --git a/srcpkgs/zopfli-devel b/srcpkgs/zopfli-devel
new file mode 120000
index 000000000000..9efe6d7a50da
--- /dev/null
+++ b/srcpkgs/zopfli-devel
@@ -0,0 +1 @@
+zopfli
\ No newline at end of file
diff --git a/srcpkgs/zopfli/template b/srcpkgs/zopfli/template
index 0666294da3ea..bc35648500d6 100644
--- a/srcpkgs/zopfli/template
+++ b/srcpkgs/zopfli/template
@@ -1,10 +1,10 @@
 # Template file for 'zopfli'
 pkgname=zopfli
 version=1.0.3
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
-build_style=gnu-makefile
-make_build_args="zopfli zopflipng"
+build_style=cmake
+configure_args=-DZOPFLI_BUILD_SHARED=ON
 short_desc="Very good, but slow, deflate or zlib compression"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
@@ -12,12 +12,12 @@ homepage="https://github.com/google/zopfli"
 distfiles="https://github.com/google/${pkgname}/archive/${pkgname}-${version}.tar.gz"
 checksum=e955a7739f71af37ef3349c4fa141c648e8775bceb2195be07e86f8e638814bd
 
-pre_build() {
-	export CFLAGS="$CFLAGS $LDFLAGS -lm"
-}
-
-do_install() {
-	vbin zopfli
-	vbin zopflipng
-	vlicense COPYING LICENSE
+zopfli-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/cmake
+	}
 }

From f40cecc5f5fce18c76a63af75ce415f18ebbd598 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Jan 2021 18:59:35 +0100
Subject: [PATCH 0277/3482] dovecot: install default configuration to
 /usr/share/example/dovecot only

Closes #25893.
---
 srcpkgs/dovecot/template | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 828719e5222f..b3e60a746142 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -45,21 +45,14 @@ fi
 # For SSL support.
 depends="ca-certificates"
 system_accounts="_dovecot _dovenull"
-conf_files="/etc/dovecot/*.conf /etc/dovecot/conf.d/*.conf /etc/ssl/dovecot-openssl.cnf"
 
 post_install() {
-	local econfdir=usr/share/doc/dovecot/example-config
-	local econfdird=${econfdir}/conf.d
-
-	# install example conf files and ssl.conf
-	vmkdir etc/dovecot/conf.d
-	install -m644 ${DESTDIR}/${econfdird}/*.conf \
-		${DESTDIR}/etc/dovecot/conf.d
-	install -m644 ${DESTDIR}/${econfdird}/*.conf.ext \
-		${DESTDIR}/etc/dovecot/conf.d
-	install -m644 ${DESTDIR}/${econfdir}/dovecot.conf ${DESTDIR}/etc/dovecot
-	vinstall doc/dovecot-openssl.cnf 644 etc/ssl
-	vbin doc/mkcert.sh dovecot-mkcert.sh
+	vsconf doc/dovecot-openssl.cnf
+	vsconf doc/mkcert.sh
+	mv ${DESTDIR}/usr/share/doc/dovecot/example-config/* \
+		${DESTDIR}/usr/share/examples/dovecot
+	mv ${DESTDIR}/usr/share/examples/dovecot/*.ext \
+		${DESTDIR}/usr/share/examples/dovecot/conf.d
 	rm ${DESTDIR}/etc/dovecot/README
 
 	vsv dovecot
@@ -77,14 +70,12 @@ dovecot-devel_package() {
 dovecot-plugin-ldap_package() {
 	depends="dovecot>=${version}"
 	short_desc+=" - LDAP plugin"
-	conf_files="/etc/dovecot/conf.d/auth-ldap.conf.ext"
 	pkg_install() {
 		vmove usr/lib/dovecot/libdovecot-ldap.*
 		vmove usr/lib/dovecot/modules/dict/libdict_ldap.so
 		vmove usr/lib/dovecot/modules/auth/libauthdb_ldap.so
-		vmove usr/share/doc/dovecot/example-config/conf.d/auth-ldap.conf.ext
-		vmove usr/share/doc/dovecot/example-config/dovecot-ldap.conf.ext
-		vmove etc/dovecot/conf.d/auth-ldap.conf.ext
+		vmove usr/share/examples/dovecot/conf.d/auth-ldap.conf.ext
+		vmove usr/share/examples/dovecot/conf.d/dovecot-ldap.conf.ext
 	}
 }
 dovecot-plugin-lucene_package() {

From c153fd28fd6dc71bfaf272db9276143e04fd5062 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 21 Jan 2021 19:34:10 +0200
Subject: [PATCH 0278/3482] mtpaint: update to 3.50.02.

---
 srcpkgs/mtpaint/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mtpaint/template b/srcpkgs/mtpaint/template
index 39f4f899f33f..a799ea000c41 100644
--- a/srcpkgs/mtpaint/template
+++ b/srcpkgs/mtpaint/template
@@ -1,8 +1,8 @@
 # Template file for 'mtpaint'
 pkgname=mtpaint
-version=3.50.01
+version=3.50.02
 revision=1
-_commit=a4675ff5cd9fcd57d291444cb9f332b48f11243f
+_commit=f6e8058c117cc11ae4cd5b1b11391d20de7f06cf
 wrksrc="mtPaint-${_commit}"
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="http://mtpaint.sourceforge.net/"
 changelog="https://raw.githubusercontent.com/wjaguar/mtPaint/master/NEWS"
 distfiles="https://github.com/wjaguar/mtPaint/archive/${_commit}.tar.gz"
-checksum=852e0e8456610596952f168281836ed640275ac0dcd773321ae9a9285077e899
+checksum=728265164534b07895f6bf70d5e546581dbd6bddd727bf83d2784eea374d7e35
 
 post_install() {
 	vdoc doc/vcode.t2t

From b0bb0a91717df363c6fb246b67561831160337f3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 21 Jan 2021 19:48:16 +0200
Subject: [PATCH 0279/3482] fossil: update to 2.14.

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index 058d2596c8c7..df8d4cb415c7 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,6 +1,6 @@
 # Template file for 'fossil'
 pkgname=fossil
-version=2.13
+version=2.14
 revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.fossil-scm.org"
 distfiles="https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
-checksum=d933d3e0710eed3de5ee23bf8d2677419c4d4a8cd30b61f7161d9071d63a73f5
+checksum=b8d0c920196dd8ae29152fa7448e513a1fa7c588871b785e3fbfc07b42a05fb9
 
 post_extract() {
 	vsed -i 's/test_system_sqlite$/# &/' auto.def  # failing on cross

From a36d2938a2e0921d69e25da8ba1c465be04aeda2 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Thu, 21 Jan 2021 12:07:11 +0530
Subject: [PATCH 0280/3482] python3-cloudscraper: update to 1.2.52; orphan.

---
 srcpkgs/python3-cloudscraper/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-cloudscraper/template b/srcpkgs/python3-cloudscraper/template
index 47d299ff397b..ea8b4a975607 100644
--- a/srcpkgs/python3-cloudscraper/template
+++ b/srcpkgs/python3-cloudscraper/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-cloudscraper'
 pkgname=python3-cloudscraper
-version=1.2.48
+version=1.2.52
 revision=1
 wrksrc=cloudscraper-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests-toolbelt"
 short_desc="Python module to bypass Cloudflare's anti-bot page"
-maintainer="Lorem <notloremipsum@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/venomous/cloudscraper"
 distfiles="${PYPI_SITE}/c/cloudscraper/cloudscraper-${version}.tar.gz"
-checksum=bb6be1c2d12720c9fcde80f1965a2250444821f64a900e5bddf9aef2c1fa5d62
+checksum=db54e8e21f38ca3999c80270d55288ecc236d6ddb75f2ee4d40cfe1a3fb4421e
 
 do_check() {
 	# Needs unpackaged v8eval

From d31ab287710dd4a95c971ff943636fc5e8513220 Mon Sep 17 00:00:00 2001
From: Spencer Burris <sburris@posteo.net>
Date: Wed, 20 Jan 2021 19:21:29 -0800
Subject: [PATCH 0281/3482] zola: update to 0.13.0

---
 srcpkgs/zola/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index cd6815950ff7..982f970698cd 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.12.2
+version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=1c0cb37e9a3d9f7ff41012996eb068fb5453c9727f107ac817429cbdae4dae84
+checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
 
 case $XBPS_TARGET_MACHINE in
 	ppc*) broken="segfaults" ;;

From 24423db66cb74c87b5a34dce21a806fd04739820 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Thu, 21 Jan 2021 11:59:22 +0530
Subject: [PATCH 0282/3482] Komikku: update to 0.25.1

 - replace python3-cloudscraper dependency with python3-requests
---
 srcpkgs/Komikku/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 00a17d2e882b..fd8ecd8b7a4a 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,12 +1,12 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.24.0
+version=0.25.1
 revision=1
 wrksrc=Komikku-v${version}
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config"
 makedepends="gtk+3-devel libhandy1-devel"
-depends="gtk+3 python3-BeautifulSoup4 python3-cloudscraper python3-dateparser
+depends="gtk+3 python3-BeautifulSoup4 python3-requests python3-dateparser
  python3-gobject python3-lxml python3-magic python3-Pillow python3-pure-protobuf
  libhandy1 libnotify libsecret python3-Unidecode python3-keyring"
 checkdepends="appstream-glib desktop-file-utils"
@@ -15,4 +15,4 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
 distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=a6c8f98d24212e7d108030da5d0bde944668e0325ac4a87880b42bcf5c641c78
+checksum=5aba25a8f13dc99f1f8bfeb9d347a8b44cfae7c6fb35d801f21af6ad846036c1

From afba6f2fc520ae92af96078292fcb3bad0b49ade Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 21 Jan 2021 20:34:16 +0200
Subject: [PATCH 0283/3482] gajim: add libsoup to dependencies.

---
 srcpkgs/gajim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index 0c99528981ca..cce8f28496e7 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,12 +1,12 @@
 # Template file for 'gajim'
 pkgname=gajim
 version=1.2.2
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="python3-gobject python3-nbxmpp python3-pyasn1 python3-setuptools
  python3-precis-i18n python3-keyring python3-cssutils python3-packaging
- python3-css-parser farstream python3-dbus"
+ python3-css-parser farstream python3-dbus libsoup"
 short_desc="Full featured Jabber/XMPP client"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From b215450289f5d4fffccec30d77844ab58de62c3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 21 Jan 2021 20:43:19 +0100
Subject: [PATCH 0284/3482] doctl: update to 1.55.0.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 67429c711efc..a7e89e832ac2 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.54.1
+version=1.55.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -11,4 +11,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=f61746217994a7270ac32d9707a7c2906e94821238bdb938b0e3be70f2f2dcb5
+checksum=7141427c5a2c3b3043f076ef7789a1a526cd8b2fa8af94d33372bd775691e141

From 8155eb6adb6bf6fb95316336c892f43bda124edf Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Jan 2021 22:02:31 +0100
Subject: [PATCH 0285/3482] elogind: fix build on ppcle

---
 srcpkgs/elogind/patches/ppcle.patch | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/elogind/patches/ppcle.patch

diff --git a/srcpkgs/elogind/patches/ppcle.patch b/srcpkgs/elogind/patches/ppcle.patch
new file mode 100644
index 000000000000..4ae5faf44f13
--- /dev/null
+++ b/srcpkgs/elogind/patches/ppcle.patch
@@ -0,0 +1,25 @@
+From 836f3efb84a703b3594906572a54616d25cecf5e Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Thu, 21 Jan 2021 21:59:12 +0100
+Subject: [PATCH] add ppcle arch tuple
+
+---
+ src/basic/architecture.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git src/basic/architecture.h src/basic/architecture.h
+index 620b522..afdff7a 100644
+--- src/basic/architecture.h
++++ src/basic/architecture.h
+@@ -94,7 +94,7 @@ int uname_architecture(void);
+ #    endif
+ #  else
+ #    define native_architecture() ARCHITECTURE_PPC_LE
+-#    error "Missing LIB_ARCH_TUPLE for PPCLE"
++#    define LIB_ARCH_TUPLE "powerpcle-linux-gnu"
+ #  endif
+ #elif defined(__ia64__)
+ #  define native_architecture() ARCHITECTURE_IA64
+-- 
+2.30.0
+

From 6955cd6d8bc7dafc64eb17da37a019e2ad3aa1a2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Jan 2021 22:23:00 +0100
Subject: [PATCH 0286/3482] elogind: fix ppc64 tuple

---
 srcpkgs/elogind/patches/ppc64-bad-tuple.patch | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/elogind/patches/ppc64-bad-tuple.patch

diff --git a/srcpkgs/elogind/patches/ppc64-bad-tuple.patch b/srcpkgs/elogind/patches/ppc64-bad-tuple.patch
new file mode 100644
index 000000000000..93a0f081897b
--- /dev/null
+++ b/srcpkgs/elogind/patches/ppc64-bad-tuple.patch
@@ -0,0 +1,25 @@
+From 0ce8ef86e8bfc872b40bc090fea9873fa1f51836 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Thu, 21 Jan 2021 22:22:28 +0100
+Subject: [PATCH] fix ppc64 arch tuple
+
+---
+ src/basic/architecture.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git src/basic/architecture.h src/basic/architecture.h
+index 620b522..3ea6e52 100644
+--- src/basic/architecture.h
++++ src/basic/architecture.h
+@@ -77,7 +77,7 @@ int uname_architecture(void);
+ #elif defined(__powerpc64__)
+ #  if __BYTE_ORDER == __BIG_ENDIAN
+ #    define native_architecture() ARCHITECTURE_PPC64
+-#    define LIB_ARCH_TUPLE "ppc64-linux-gnu"
++#    define LIB_ARCH_TUPLE "powerpc64-linux-gnu"
+ #    define SECONDARY_ARCHITECTURE ARCHITECTURE_PPC
+ #  else
+ #    define native_architecture() ARCHITECTURE_PPC64_LE
+-- 
+2.30.0
+

From cdfa05284503ec335d335396f9bf724d6afde271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 21 Jan 2021 22:36:55 +0100
Subject: [PATCH 0287/3482] qbittorrent: update to 4.3.3

---
 srcpkgs/qbittorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index f808c46595ae..4fade2ab2336 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.2
+version=4.3.3
 revision=1
 create_wrksrc=yes
 build_style=qmake
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=b58e377a26c6de91aa61a56cddc9399c52fb9c752444c761a52784943b2b8b4b
+checksum=5966fdceab877fa3fedd9776a5f8ec6ce55308048e1d4a16b819d9b650dbc137
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-svg-devel"

From d923e812ad7b9de76655272e9f9c4fc2e2e8cb84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 21 Jan 2021 23:08:23 +0100
Subject: [PATCH 0288/3482] lollypop: update to 1.4.14

---
 srcpkgs/lollypop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 7cffd5a42a1b..054ae6e240f4 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,6 +1,6 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.4.12
+version=1.4.14
 revision=1
 build_style=meson
 hostmakedepends="cmake git glib-devel gobject-introspection intltool itstool pkg-config"
@@ -13,4 +13,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/${pkgname}-${version}.tar.xz"
-checksum=c089f89ad53a8d8743265ee12bd19a1b8907d6ff20f498ab1bff9cb4c83ec218
+checksum=18d1c3d733bf7ba855064a68183215f1d5717a6162aaca5df482b60c429347b1

From 7ddc7c98d0ddc56aaa72fabd6159b127498940c8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 18 Jan 2021 18:53:43 +0100
Subject: [PATCH 0289/3482] monit: update to 5.27.2.

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 2a50895b6fac..969135db82dd 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.27.1
+version=5.27.2
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=f57408d16185687513a3c4eb3f2bb72eef76331ac16210e9652e846e5c84ed51
+checksum=d8809c78d5dc1ed7a7ba32a5a55c5114855132cc4da4805f8d3aaf8cf46eaa4c
 
 pre_configure() {
 	./bootstrap

From 5f9ae1a18711feee17749e1450a842ee4d5d0ec3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 21 Jan 2021 22:13:15 +0100
Subject: [PATCH 0290/3482] kcgi: update to 0.12.3.

---
 srcpkgs/kcgi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcgi/template b/srcpkgs/kcgi/template
index 05aa2c37eeaf..05edbed8d032 100644
--- a/srcpkgs/kcgi/template
+++ b/srcpkgs/kcgi/template
@@ -1,6 +1,6 @@
 # Template file for 'kcgi'
 pkgname=kcgi
-version=0.12.2
+version=0.12.3
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man SBINDIR=/usr/bin"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="http://kristaps.bsd.lv/kcgi/"
 changelog="https://kristaps.bsd.lv/kcgi/archive.html"
 distfiles="http://kristaps.bsd.lv/kcgi/snapshots/kcgi-${version}.tgz"
-checksum=59e9219ae439f0c4fbffe6584014715c2fc206b8cd00de7aa8d062ddb52c2a0e
+checksum=96b869f50799c245dc25946b160f1dfa0c321eaaf14a1b63e28e58475edee112
 
 seccomp_audit_get_suffix() {
 	case "$1" in

From 67f9e7453e887d9b99a3ed951b88dee4a28edd02 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 22 Jan 2021 00:11:43 +0100
Subject: [PATCH 0291/3482] knot: update to 3.0.4.

---
 srcpkgs/knot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index b371931010b2..b554304a77ac 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.3
+version=3.0.4
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=fbc51897ef0ed0639ebad59b988a91382b9544288a2db8254f0b1de433140e38
+checksum=451d8913a769b7e4bcb3e250a3181b448e28a82cfc58cea6f2509475d7327983
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From 0334252fff8c17477570c181c4edcc2e723da6a8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 01:25:24 +0100
Subject: [PATCH 0292/3482] cross-aarch64-linux-musl: rebuild to fix gccgo

---
 srcpkgs/cross-aarch64-linux-musl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index e5c31cb6583e..35bcd1a96e90 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -7,7 +7,7 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-${_triplet}
 version=0.34
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--with-arch=armv8-a"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"

From 735d22412c2c7facba51104ee5f3e8fbf2d8323c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 01:25:37 +0100
Subject: [PATCH 0293/3482] cross-armv7l-linux-musleabihf: rebuild to fix gccgo

---
 srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 9a54186e9143..b0c0339cd1bf 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -7,7 +7,7 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-${_triplet}
 version=0.34
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"

From cb458fc93afc46c2fa4bc7e6d5b9cb8f452de3a8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 01:25:54 +0100
Subject: [PATCH 0294/3482] cross-arm-linux-musleabihf: rebuild to fix gccgo

---
 srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 2722c5b2feab..4493d2cf4be6 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -7,7 +7,7 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-${_triplet}
 version=0.34
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"

From 33c8cde08ddec1f09a1a10c29c4ecfbd125d9725 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 01:26:07 +0100
Subject: [PATCH 0295/3482] cross-arm-linux-musleabi: rebuild to fix gccgo

---
 srcpkgs/cross-arm-linux-musleabi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 21225952689d..02ccfe195d2e 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -7,7 +7,7 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-${_triplet}
 version=0.34
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--with-arch=armv5te --with-float=soft"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"

From aa5593af27d45a8d6515946a2f8b85ff00035409 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 01:26:19 +0100
Subject: [PATCH 0296/3482] cross-i686-linux-musl: rebuild to fix gccgo

---
 srcpkgs/cross-i686-linux-musl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 19e37dd835c6..1df55566142c 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -7,7 +7,7 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-${_triplet}
 version=0.34
-revision=1
+revision=2
 build_style=void-cross
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"

From 5d5759a17ab657192e58adb82f55293461cac377 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 01:26:31 +0100
Subject: [PATCH 0297/3482] cross-powerpc64le-linux-musl: rebuild to fix gccgo

---
 srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 5401f15542fe..2e86ed57f57c 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -7,7 +7,7 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-${_triplet}
 version=0.34
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"

From a196f57ac44f5102ee04f3f52f5199c2a7588734 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 01:26:39 +0100
Subject: [PATCH 0298/3482] cross-powerpc64-linux-musl: rebuild to fix gccgo

---
 srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index ce0caee811f1..51abb778826f 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -7,7 +7,7 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-${_triplet}
 version=0.34
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"

From c1bbe20f28609ad4deebd39aacd6feb54cd87ef6 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 22 Jan 2021 09:08:53 +1100
Subject: [PATCH 0299/3482] dnsmasq: update to 2.83.

---
 srcpkgs/dnsmasq/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index ce01e13040c0..884ea0557b3d 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -1,6 +1,6 @@
 # Template file for 'dnsmasq'
 pkgname=dnsmasq
-version=2.82
+version=2.83
 revision=1
 conf_files="/etc/dnsmasq.conf"
 hostmakedepends="pkg-config"
@@ -10,8 +10,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 changelog="http://www.thekelleys.org.uk/dnsmasq/CHANGELOG"
-distfiles="http://www.thekelleys.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=62f33bfac1a1b4a5dab8461b4664e414f7d6ced1d2cf141e9cdf9c3c2a424f65
+distfiles="http://www.thekelleys.org.uk/dnsmasq/dnsmasq-${version}.tar.gz"
+checksum=6b67955873acc931bfff61a0a1e0dc239f8b52e31df50e9164d3a4537571342f
 system_accounts="dnsmasq"
 dnsmasq_homedir="/var/chroot"
 
@@ -26,6 +26,7 @@ do_build() {
 	fi
 	make CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" ${makejobs}
 }
+
 do_install() {
 	make PREFIX=/usr BINDIR=/usr/bin DESTDIR=${DESTDIR} install
 

From 957c5dc0a065ab97cc2c51846aa41cffea41912f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 03:47:18 +0100
Subject: [PATCH 0300/3482] linux4.19: fix dotconfigs for ppc/ppc64

---
 srcpkgs/linux4.19/files/ppc-dotconfig   | 8 ++++----
 srcpkgs/linux4.19/files/ppc64-dotconfig | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 18e1ab573e9f..a84d0bbe95c0 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.155 Kernel Configuration
+# Linux/powerpc 4.19.169 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 9.3.0
+# Compiler: gcc (GCC) 10.2.1 20201203
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
+CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
@@ -5191,7 +5191,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -6880,6 +6879,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_PROBE_EVENTS=y
diff --git a/srcpkgs/linux4.19/files/ppc64-dotconfig b/srcpkgs/linux4.19/files/ppc64-dotconfig
index e127c7a2fe02..5957b68d0413 100644
--- a/srcpkgs/linux4.19/files/ppc64-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc64-dotconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.155 Kernel Configuration
+# Linux/powerpc 4.19.169 Kernel Configuration
 #
 
 #
-# Compiler: powerpc64-linux-gnu-gcc (GCC) 9.3.0
+# Compiler: gcc (GCC) 10.2.1 20201203
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
+CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
@@ -6360,7 +6360,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -8713,6 +8712,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_STACK_TRACER is not set
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_PROBE_EVENTS=y

From 943e71e0af6d8a5da7b298e288936a416fe8a089 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 03:47:34 +0100
Subject: [PATCH 0301/3482] linux5.4: fix dotconfigs for ppc/ppc64

---
 srcpkgs/linux5.4/files/ppc-dotconfig   | 8 ++++----
 srcpkgs/linux5.4/files/ppc64-dotconfig | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index 1a5b414c00b6..05dd2bf84ff7 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.75 Kernel Configuration
+# Linux/powerpc 5.4.91 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 9.3.0
+# Compiler: gcc (GCC) 10.2.1 20201203
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
+CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
@@ -5491,7 +5491,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -7439,6 +7438,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y
diff --git a/srcpkgs/linux5.4/files/ppc64-dotconfig b/srcpkgs/linux5.4/files/ppc64-dotconfig
index 1da6642caee8..6fc8230df3d0 100644
--- a/srcpkgs/linux5.4/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc64-dotconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.81 Kernel Configuration
+# Linux/powerpc 5.4.91 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 9.3.0
+# Compiler: gcc (GCC) 10.2.1 20201203
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
+CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
@@ -846,7 +846,6 @@ CONFIG_ZPOOL=y
 CONFIG_ZBUD=y
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=y
-CONFIG_PGTABLE_MAPPING=y
 # CONFIG_ZSMALLOC_STAT is not set
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 CONFIG_IDLE_PAGE_TRACKING=y
@@ -6821,7 +6820,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -9420,6 +9418,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_STACK_TRACER is not set
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y

From 86217892c2d10f794c184a9d600b1aa85589d59d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 21 Jan 2021 21:16:28 +0100
Subject: [PATCH 0302/3482] exiftool: update to 12.16.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index f2baecc24850..a94bce3d7400 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.15
+version=12.16
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=02e07fae4070c6bf7cdeb91075f783fea17c766b7caa23e6834e8bba424551b9
+checksum=c140797d72acdaf04f7ce0629867353510b56fbe99ceaac0742bbc379610756a

From ee2a1b047a5758cfad2d32b091b65e9ccd3528c8 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Wed, 6 Jan 2021 15:11:50 -0300
Subject: [PATCH 0303/3482] rust-analyzer: update to 2021.01.18.

---
 srcpkgs/rust-analyzer/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index 523c095911ee..bde944787c7e 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-analyzer'
 pkgname=rust-analyzer
-version=2020.12.07
+version=2021.01.18
 revision=1
 _ver=${version//./-}
 wrksrc="${pkgname}-${_ver}"
@@ -11,10 +11,14 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="Apache-2.0, MIT"
 homepage="https://rust-analyzer.github.io/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${_ver}.tar.gz"
-checksum=a2c13c5b7894384dfdedeaf7ee49afb2d5e1130f249e38fc012f5925db5ba442
+checksum=009ab946848719bb05bcaddab1cf5a75a45c5a92ae6dc31763adb42c3229f7db
 
 export RUST_ANALYZER_REV=${_ver}
 
+do_check() {
+	: # tests require Rust source code
+}
+
 post_install() {
 	vlicense LICENSE-APACHE
 	vlicense LICENSE-MIT

From c4ce8ce2d89cff2659c521a24dafa697674443e0 Mon Sep 17 00:00:00 2001
From: Allen Sobot <chilledfrogs@disroot.org>
Date: Thu, 21 Jan 2021 19:30:15 +0100
Subject: [PATCH 0304/3482] litterbox: update to 1.7.

---
 srcpkgs/litterbox/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index 80c2bcdb86e1..ace7ae0b5df6 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,6 +1,6 @@
-# Template file for 'litterbox'.
+# Template file for 'litterbox'
 pkgname=litterbox
-version=1.6
+version=1.7
 revision=1
 build_style=gnu-configure
 make_build_target="all"
@@ -11,4 +11,4 @@ maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/litterbox/"
 distfiles="https://git.causal.agency/litterbox/snapshot/litterbox-$version.tar.gz"
-checksum=1995e5d6c8dfab6e28fb19ca5001f6e744d749e1e52445c1d316c64e8aa286a9
+checksum=22c9fa46e4af1fc7d6a375b19a87eb3f73b7baafce96698aafcb58c6287155d3

From aaa1ec3b70caf1e181b53c7b91f3f58afb8084da Mon Sep 17 00:00:00 2001
From: Christopher Brannon <chris@the-brannons.com>
Date: Thu, 21 Jan 2021 07:25:45 -0800
Subject: [PATCH 0305/3482] xen: patch for XSA 360.

---
 srcpkgs/xen/patches/xsa360-4.14.patch | 97 +++++++++++++++++++++++++++
 srcpkgs/xen/template                  |  4 +-
 2 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/xen/patches/xsa360-4.14.patch

diff --git a/srcpkgs/xen/patches/xsa360-4.14.patch b/srcpkgs/xen/patches/xsa360-4.14.patch
new file mode 100644
index 000000000000..1bc185b110dc
--- /dev/null
+++ b/srcpkgs/xen/patches/xsa360-4.14.patch
@@ -0,0 +1,97 @@
+From: Roger Pau Monne <roger.pau@citrix.com>
+Subject: x86/dpci: do not remove pirqs from domain tree on unbind
+
+A fix for a previous issue removed the pirqs from the domain tree when
+they are unbound in order to prevent shared pirqs from triggering a
+BUG_ON in __pirq_guest_unbind if they are unbound multiple times. That
+caused free_domain_pirqs to no longer unmap the pirqs because they
+are gone from the domain pirq tree, thus leaving stale unbound pirqs
+after domain destruction if the domain had mapped dpci pirqs after
+shutdown.
+
+Take a different approach to fix the original issue, instead of
+removing the pirq from d->pirq_tree clear the flags of the dpci pirq
+struct to signal that the pirq is now unbound. This prevents calling
+pirq_guest_unbind multiple times for the same pirq without having to
+remove it from the domain pirq tree.
+
+This is XSA-360.
+
+Fixes: 5b58dad089 ('x86/pass-through: avoid double IRQ unbind during domain cleanup')
+Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+
+--- a/xen/arch/x86/irq.c
++++ b/xen/arch/x86/irq.c
+@@ -1331,7 +1331,7 @@ void (pirq_cleanup_check)(struct pirq *p
+     }
+ 
+     if ( radix_tree_delete(&d->pirq_tree, pirq->pirq) != pirq )
+-        BUG_ON(!d->is_dying);
++        BUG();
+ }
+ 
+ /* Flush all ready EOIs from the top of this CPU's pending-EOI stack. */
+--- a/xen/drivers/passthrough/pci.c
++++ b/xen/drivers/passthrough/pci.c
+@@ -862,6 +862,10 @@ static int pci_clean_dpci_irq(struct dom
+ {
+     struct dev_intx_gsi_link *digl, *tmp;
+ 
++    if ( !pirq_dpci->flags )
++        /* Already processed. */
++        return 0;
++
+     pirq_guest_unbind(d, dpci_pirq(pirq_dpci));
+ 
+     if ( pt_irq_need_timer(pirq_dpci->flags) )
+@@ -872,15 +876,10 @@ static int pci_clean_dpci_irq(struct dom
+         list_del(&digl->list);
+         xfree(digl);
+     }
++    /* Note the pirq is now unbound. */
++    pirq_dpci->flags = 0;
+ 
+-    radix_tree_delete(&d->pirq_tree, dpci_pirq(pirq_dpci)->pirq);
+-
+-    if ( !pt_pirq_softirq_active(pirq_dpci) )
+-        return 0;
+-
+-    domain_get_irq_dpci(d)->pending_pirq_dpci = pirq_dpci;
+-
+-    return -ERESTART;
++    return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0;
+ }
+ 
+ static int pci_clean_dpci_irqs(struct domain *d)
+@@ -897,18 +896,8 @@ static int pci_clean_dpci_irqs(struct do
+     hvm_irq_dpci = domain_get_irq_dpci(d);
+     if ( hvm_irq_dpci != NULL )
+     {
+-        int ret = 0;
+-
+-        if ( hvm_irq_dpci->pending_pirq_dpci )
+-        {
+-            if ( pt_pirq_softirq_active(hvm_irq_dpci->pending_pirq_dpci) )
+-                 ret = -ERESTART;
+-            else
+-                 hvm_irq_dpci->pending_pirq_dpci = NULL;
+-        }
++        int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL);
+ 
+-        if ( !ret )
+-            ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL);
+         if ( ret )
+         {
+             spin_unlock(&d->event_lock);
+--- a/xen/include/asm-x86/hvm/irq.h
++++ b/xen/include/asm-x86/hvm/irq.h
+@@ -160,8 +160,6 @@ struct hvm_irq_dpci {
+     DECLARE_BITMAP(isairq_map, NR_ISAIRQS);
+     /* Record of mapped Links */
+     uint8_t link_cnt[NR_LINK];
+-    /* Clean up: Entry with a softirq invocation pending / in progress. */
+-    struct hvm_pirq_dpci *pending_pirq_dpci;
+ };
+ 
+ /* Machine IRQ to guest device/intx mapping. */
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index 8b6649410d00..bc00c7cc8e0e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.14.1
-revision=1
+revision=2
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
 # TODO: arm / aarch64
@@ -17,7 +17,7 @@ makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Chris Brannon <chris@the-brannons.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.xenproject.org/"
 distfiles="

From 5d517d9cab83f8aebfb35cadb6850d43c0cd6067 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Thu, 21 Jan 2021 14:19:36 +0100
Subject: [PATCH 0306/3482] pipewire: update to 0.3.20

---
 srcpkgs/pipewire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 7ad025fa5a53..79a4d0e28b56 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.19
+version=0.3.20
 revision=1
 build_style=meson
 configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false
@@ -16,7 +16,7 @@ license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=de2e757a57ff313362341f4b18b976c707d397d853c0cd2032975b76d0c540dc
+checksum=7da6d8283aea6b37480e626b57f23b2bf70d6b73470105a5853b213786d1c097
 conf_files="/etc/pipewire/pipewire.conf"
 
 replaces="libpulseaudio-pipewire>=0"

From fd544d369881c8866c6255961b23b611230fcd7f Mon Sep 17 00:00:00 2001
From: mojamuto <carlosme@protonmail.ch>
Date: Thu, 21 Jan 2021 14:32:05 +0100
Subject: [PATCH 0307/3482] rtl8822bu-dkms: update to 20201222.

---
 srcpkgs/rtl8822bu-dkms/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/rtl8822bu-dkms/template b/srcpkgs/rtl8822bu-dkms/template
index 58e70a17235e..548d0b6299cd 100644
--- a/srcpkgs/rtl8822bu-dkms/template
+++ b/srcpkgs/rtl8822bu-dkms/template
@@ -1,8 +1,8 @@
 # Template file for 'rtl8822bu-dkms'
 pkgname=rtl8822bu-dkms
-version=20201020
-revision=2
-_gitrev=66aae0e630e9886acee2386c0623ca479130c8b8
+version=20201222
+revision=1
+_gitrev=fcfd4ecca1512d4cd2db4aa91679576d2a5ab8eb
 wrksrc="rtl8822bu-${_gitrev}"
 depends="dkms"
 short_desc="Realtek 8822BU USB WiFi driver (DKMS)"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.tp-link.com"
 distfiles="https://github.com/EntropicEffect/rtl8822bu/archive/${_gitrev}.tar.gz"
-checksum=0bc16641ffeb59517d935774bd3fcf62a3d51cf6f88f7f76bd520a5e3b8124d2
+checksum=fb2dbcd0385d558af6c74571aaac9020d7cbb9e56cc4780299bd420559f29bb1
 dkms_modules="88x2bu ${version}"
 
 case "$XBPS_TARGET_MACHINE" in

From 8e960a33b83d370ec06c29763aab706a4836c0cb Mon Sep 17 00:00:00 2001
From: Ulf <ulf@ulf-voidlinux.home>
Date: Thu, 21 Jan 2021 11:45:53 +0000
Subject: [PATCH 0308/3482] gphoto2: update to 2.5.26.

---
 srcpkgs/gphoto2/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gphoto2/template b/srcpkgs/gphoto2/template
index dd6907bcf7d9..954bc9e631a1 100644
--- a/srcpkgs/gphoto2/template
+++ b/srcpkgs/gphoto2/template
@@ -1,6 +1,6 @@
 # Template file for 'gphoto2'
 pkgname=gphoto2
-version=2.5.23
+version=2.5.26
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-rpath udevscriptdir=/usr/lib/udev
@@ -8,8 +8,8 @@ configure_args="--disable-static --disable-rpath udevscriptdir=/usr/lib/udev
 hostmakedepends="automake gettext-devel libtool pkg-config"
 makedepends="libgphoto2-devel libjpeg-turbo-devel popt-devel readline-devel"
 short_desc="Digital camera CLI iinterface to libgphoto"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.gphoto.org"
 distfiles="${SOURCEFORGE_SITE}/gphoto/gphoto2-${version}.tar.bz2"
-checksum=df87092100e7766c9d0a4323217c91908a9c891c0d3670ebf40b76903be458d1
+checksum=7653213b05329c1dc2779efea3eff00504e12011436587aedc9aaa1e8665ab2f

From 7f903fe165d435f0b0520cb9eede024963e2aaa0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 21 Jan 2021 20:11:47 +0200
Subject: [PATCH 0309/3482] goodvibes: add proper deps.

---
 srcpkgs/goodvibes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template
index f3b9782ac927..554c9f035290 100644
--- a/srcpkgs/goodvibes/template
+++ b/srcpkgs/goodvibes/template
@@ -1,13 +1,13 @@
 # Template file for 'goodvibes'
 pkgname=goodvibes
 version=0.6.2
-revision=1
+revision=2
 wrksrc="goodvibes-v${version}"
 build_style=meson
 hostmakedepends="appstream-glib desktop-file-utils pkg-config gettext"
 makedepends="amtk-devel dconf-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel libkeybinder3-devel libsoup-devel"
-depends="desktop-file-utils hicolor-icon-theme"
+depends="desktop-file-utils hicolor-icon-theme gst-plugins-good1  gst-plugins-ugly1"
 short_desc="Light and simple internet radio player"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From dc5dc2f92efcd60892bb4b154927bb034cbd3059 Mon Sep 17 00:00:00 2001
From: Ulf <ulf@ulf-voidlinux.home>
Date: Thu, 21 Jan 2021 12:04:24 +0000
Subject: [PATCH 0310/3482] mobile-broadband-provider-info: update to 20201225.

---
 srcpkgs/mobile-broadband-provider-info/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mobile-broadband-provider-info/template b/srcpkgs/mobile-broadband-provider-info/template
index 39b7fe007e33..45cf541e58bd 100644
--- a/srcpkgs/mobile-broadband-provider-info/template
+++ b/srcpkgs/mobile-broadband-provider-info/template
@@ -1,16 +1,16 @@
 # Template file for 'mobile-broadband-provider-info'
 pkgname=mobile-broadband-provider-info
-version=20190618
-revision=2
+version=20201225
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake libxslt"
 checkdepends="libxml2"
 short_desc="Database of mobile broadband service providers"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <void@uw.anonaddy.com>"
 license="custom:Creative Commons Public Domain"
 homepage="https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/"
 distfiles="https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/-/archive/${version}/mobile-broadband-provider-info-${version}.tar.bz2"
-checksum=d0cb1648e7d21c6bd899ab6be0e7963a69521296b43b8b191c9edaf243bf3748
+checksum=0616b3d0580575741d4319ac71ca67c9a378879943d32a67ac0460615767bcdf
 
 pre_configure() {
 	autoreconf -fi

From a726075f7f6fc8f050b0d998df705b3693db522f Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Wed, 20 Jan 2021 18:28:56 +0100
Subject: [PATCH 0311/3482] wasmtime: update to 0.22.1.

---
 srcpkgs/wasmtime/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wasmtime/template b/srcpkgs/wasmtime/template
index ea71785a353b..a8cca31b6956 100644
--- a/srcpkgs/wasmtime/template
+++ b/srcpkgs/wasmtime/template
@@ -1,6 +1,6 @@
 # Template file for 'wasmtime'
 pkgname=wasmtime
-version=0.21.0
+version=0.22.1
 revision=1
 archs="x86_64* i686* aarch64*"
 build_style=cargo
@@ -8,15 +8,15 @@ short_desc="Standalone JIT-style runtime for WebAssembly, using Cranelift"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/bytecodealliance/wasmtime"
-_spec_testsuite_commit=18f83401a47a0e43772cf7d9f216e994bf7c7fa6
+_spec_testsuite_commit=35c50bf6fbb002cfdc1227b0af731bdcaf877714
 _wasm_c_api_commit=d9a80099d496b5cdba6f3fe8fc77586e0e505ddc
 _WASI_commit=71f042514728e425a9b1b251c7f6daaa44301f4a
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/WebAssembly/testsuite/archive/${_spec_testsuite_commit}.tar.gz
  https://github.com/WebAssembly/wasm-c-api/archive/${_wasm_c_api_commit}.tar.gz
  https://github.com/WebAssembly/WASI/archive/${_WASI_commit}.tar.gz"
-checksum="7874feb1026bbef06796bd5ab80e73f15b8e83752bde8dc93994f5bc039a4952
- 9d82be5b4dcfaadb9c0b0455c0c8b2989b942f75b9f698fa8e70329e403f4f74
+checksum="b0587e3297398e221d0e48c01b89788958fde729eec519ad30656ac4ba98d18d
+ 81e22e03b5fcc40706e7adc616479a3312afec10922f028cd576c308341e2641
  aea8cd095e9937f1e14f2c93e026317b197eb2345e7a817fe3932062eb7b792c
  7496df0d28398229f511aba624ddfcf924a1e046e189cac93d4ea53483206e0e"
 
@@ -25,6 +25,11 @@ case ${XBPS_TARGET_MACHINE} in
 		broken="https://github.com/bytecodealliance/wasmtime/issues/2133";;
 esac
 
+# skip, as they require the wasm32-wasi rust target
+do_check() {
+	:
+}
+
 pre_configure() {
 	# move submodules to the proper location
 	rmdir tests/spec_testsuite

From 9fe56619be9c84bbc8c32ff6633b6122e563f551 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Mon, 18 Jan 2021 19:15:35 -0800
Subject: [PATCH 0312/3482] logrotate: update to 3.18.0.

---
 srcpkgs/logrotate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/logrotate/template b/srcpkgs/logrotate/template
index 80be0853c98d..96ee9e272f64 100644
--- a/srcpkgs/logrotate/template
+++ b/srcpkgs/logrotate/template
@@ -1,6 +1,6 @@
 # Template file for 'logrotate'
 pkgname=logrotate
-version=3.17.0
+version=3.18.0
 revision=1
 build_style=gnu-configure
 makedepends="acl-devel popt-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/logrotate/logrotate"
 distfiles="${homepage}/releases/download/${version}/logrotate-${version}.tar.xz"
-checksum=58cc2178ff57faa3c0490181cce041345aeca6cff18dba1c5cd1398bf1c19294
+checksum=841f81bf09d0014e4a2e11af166bb33fcd8429cc0c2d4a7d3d9ceb3858cfccc5
 make_dirs="/etc/logrotate.d 0755 root root"
 
 post_install() {

From cc11e17fab0d514f75a01aa79e44edb06f16bffe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Jan 2021 11:48:07 -0500
Subject: [PATCH 0313/3482] base-files: fix mdns ordering in nsswitch.conf

Using the full `mdns` NSS module in front of `dns` for host lookups
causes long delays, e.g., when a telnet client attempts to do reverse
DNS lookups on a public IP address and nss-mdns is using Avahi for local
mDNS resolution.  Upstream recommends using the `_minimal` module before
DNS, and then short-circuiting with `NOTFOUND=return`, because the
`_minimal` module only addresses queries against the .local domain and
link-local addresses. The full `mdns` module is added after DNS to allow
a more broad mDNS search after DNS fails to find a result.

We prefer `mdns_minimal` and `mdns` to their IPv4-specific `mdns4*`
variants because modern mDNS responders seem to provide both IPv6 and
IPv4 records when IPv6 is configured.

Closes: #28038.
---
 srcpkgs/base-files/files/nsswitch.conf | 2 +-
 srcpkgs/base-files/template            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/base-files/files/nsswitch.conf b/srcpkgs/base-files/files/nsswitch.conf
index f933ed02d63d..be1d1e00f5c1 100644
--- a/srcpkgs/base-files/files/nsswitch.conf
+++ b/srcpkgs/base-files/files/nsswitch.conf
@@ -6,7 +6,7 @@ passwd: 	files
 group: 		files
 shadow: 	files
 
-hosts: 		files mdns mdns4_minimal mdns4 myhostname dns
+hosts: 		files mdns_minimal [NOTFOUND=return] dns mdns
 networks: 	files
 
 protocols: 	files
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 2c93efcfd192..fff3ca5afbdd 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.141
-revision=5
+revision=6
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"

From 193792adb305f347544b2bc95e1dc96b9d637c1b Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Wed, 20 Jan 2021 19:49:45 +0100
Subject: [PATCH 0314/3482] minio: update to 2021.01.16.

---
 srcpkgs/minio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 60ae50cf837d..39d6b53a51b2 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,8 +1,8 @@
 # Template file for 'minio'
 pkgname=minio
-version=2020.12.18
+version=2021.01.16
 revision=1
-_version="${version//./-}T03-27-42Z"
+_version="${version//./-}T02-19-44Z"
 wrksrc=${pkgname}-RELEASE.${_version}
 build_style=go
 go_import_path="github.com/minio/minio"
@@ -13,7 +13,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/minio/minio"
 distfiles="${homepage}/archive/RELEASE.${_version}.tar.gz"
-checksum=9667436f8801bace2218c1f4b1c6d6dfa072f7947589b6d9ff50dda8a0289205
+checksum=78ec140c5cbe1a10774576147847f1bdef1e266017e28268be0cd6d76f538be1
 system_accounts="_minio"
 _minio_homedir="/var/lib/minio"
 _minio_descr="Minio Daemon User"

From 11a1e3b15177dc862f3e463e86e60deac442f26e Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sun, 10 Jan 2021 00:20:12 +0100
Subject: [PATCH 0315/3482] R: Use OpenBLAS where available

Also fixes building of manuals and checks.
---
 srcpkgs/R/template | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index def4ddaa50e9..1ac1b9667a2f 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,18 +1,22 @@
 # Template file for 'R'
 pkgname=R
 version=4.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
- --with-lapack --with-blas --enable-R-shlib --with-tcltk
+ --with-blas$(vopt_if openblas '="-lopenblas"') --with-lapack
+ --enable-R-shlib --with-tcltk
  --enable-memory-profiling
  LIBnn=lib"
 hostmakedepends="gcc-fortran pkg-config perl less which"
 makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
  libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel
- lapack-devel blas-devel zlib-devel bzip2-devel pcre2-devel liblzma-devel
- libcurl-devel tcl-devel tk-devel libxml2-devel"
+ zlib-devel bzip2-devel pcre2-devel liblzma-devel
+ libcurl-devel tcl-devel tk-devel libxml2-devel
+ texlive texlive-fontsextra texinfo
+ $(vopt_if openblas openblas-devel 'blas-devel lapack-devel')"
 depends="xdg-utils less which"
+checkdepends="tzdata tar"
 short_desc="System for statistical computation and graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
@@ -23,11 +27,27 @@ checksum=09983a8a78d5fb6bc45d27b1c55f9ba5265f78fa54a55c13ae691f87c5bb9e0d
 nocross=yes
 shlib_provides="libR.so"
 
+build_options="openblas"
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|aarch64*|armv[67]*|ppc64*)
+		# Prefer accelerated routines where available
+		build_options_default="openblas"
+		;;
+	*) ;;
+esac
+
 pre_configure() {
 	export R_BROWSER=/usr/bin/xdg-open
 	export R_PDFVIEWER=/usr/bin/xdg-open
 }
 
+do_check() {
+	if [ "${XBPS_CHECK_PKGS}" = full ]; then
+		( TEST_MC_CORES=${XBPS_MAKEJOBS} make check )
+	fi
+}
+
 post_install() {
 	# Sanitize Makeconf flags
 	vsed -i -e 's/^\(CFLAGS\|CXXFLAGS\|CXX1XFLAGS\|FFLAGS\|SAFE_FFLAGS\) = .*/\1 = -O2 -g $(LTO)/' \

From 9c9726ec9f98ad20a993c9256b3643d9b52bd571 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 13 Jan 2021 21:33:02 +0100
Subject: [PATCH 0316/3482] gnupg2: update to 2.2.27

Also fix pre-existing build breakage (@ahesford).

Co-authored-by: Roberto Ricci <ricci@disroot.org>
Co-authored-by: Andrew J. Hesford <ajh@sideband.org>

Closes: #27899 [via git-merge-pr]
---
 srcpkgs/gnupg2/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/gnupg2/template b/srcpkgs/gnupg2/template
index fe98ce4c7cd6..8cd59ff07a52 100644
--- a/srcpkgs/gnupg2/template
+++ b/srcpkgs/gnupg2/template
@@ -1,13 +1,14 @@
 # Template file for 'gnupg2'
 pkgname=gnupg2
-version=2.2.26
+version=2.2.27
 revision=1
 wrksrc="gnupg-${version}"
 build_style=gnu-configure
-configure_args="--with-libgcrypt-prefix=${XBPS_CROSS_BASE}
- --with-ksba-prefix=${XBPS_CROSS_BASE} --with-npth-prefix=${XBPS_CROSS_BASE}
- --with-libassuan-prefix=${XBPS_CROSS_BASE} --enable-gpg-is-gpg2
- $(vopt_enable ldap)"
+configure_args="--enable-gpg-is-gpg2 $(vopt_enable ldap)
+ --with-libgcrypt-prefix=${XBPS_CROSS_BASE}/usr
+ --with-libassuan-prefix=${XBPS_CROSS_BASE}/usr
+ --with-ksba-prefix=${XBPS_CROSS_BASE}/usr
+ --with-npth-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config"
 makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
  libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel"
@@ -17,11 +18,13 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/"
 distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2"
-checksum=517569e6c9fad22175df16be5900f94c991c41e53612db63c14493e814cfff6d
+checksum=34e60009014ea16402069136e0a5f63d9b65f90096244975db5cea74b3d02399
 build_options="ldap"
 build_options_default="ldap"
 
-pre_configure() {
+post_patch() {
+	# On at least aarch64, configure sets this even though it doesn't exist
+	vsed -i 's/HAVE_DECL_SYS_SIGLIST/0/' common/signal.c
 	vsed -i '/examples\/systemd-user/d' doc/Makefile.in
 }
 

From ae437efae40ab68dee1d8ac9bf4a76792d72876c Mon Sep 17 00:00:00 2001
From: Robert Karszniewicz <avoidr@posteo.de>
Date: Thu, 21 Jan 2021 23:23:15 +0100
Subject: [PATCH 0317/3482] toxic: update to 0.10.1.

---
 srcpkgs/toxic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/toxic/template b/srcpkgs/toxic/template
index a60e3f28c2c0..bc1daf5e602c 100644
--- a/srcpkgs/toxic/template
+++ b/srcpkgs/toxic/template
@@ -1,6 +1,6 @@
 # Template file for 'toxic'
 pkgname=toxic
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ maintainer="avoidr <avoidr@posteo.de>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/JFreegman/toxic/"
 distfiles="https://github.com/JFreegman/toxic/archive/v${version}.tar.gz"
-checksum=a1435e0e1adc46e93736b653719d0fbecd366341db7feeebe3678980fe2e6d7d
+checksum=b3cfbea28135fbc48c083276160cef02de755b60f6cfe1bd6efc1b5fdd4b92fe
 
 do_build() {
 	make CC=$CC USER_CFLAGS="$CFLAGS" USER_LDFLAGS="$LDFLAGS" ${makejobs}

From 2500dc9d8d6b9800986f01c06bd0dad1e7b07e03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 19 Jan 2021 23:55:02 +0100
Subject: [PATCH 0318/3482] electron9: update to 9.3.5.

---
 .../files/patches/chromium-time64.patch       | 51 +++++++++++++++++++
 ...lectron-exclude-content-test-patches.patch |  2 +-
 srcpkgs/electron9/template                    |  4 +-
 3 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/electron9/files/patches/chromium-time64.patch

diff --git a/srcpkgs/electron9/files/patches/chromium-time64.patch b/srcpkgs/electron9/files/patches/chromium-time64.patch
new file mode 100644
index 000000000000..0330ce057f41
--- /dev/null
+++ b/srcpkgs/electron9/files/patches/chromium-time64.patch
@@ -0,0 +1,51 @@
+Description: allow sandboxed code to call gettime64
+ Add __NR_clock_gettime64 and __NR_clock_nanosleep_time64 to syscall whitelist
+ and clock selection parameter filtering code.
+
+ Add __NR_utimensat_time64 to syscall whitelist
+
+ Conditionalise additions on the new calls existing, because they do not exist
+ on 64-bit architectures.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+===================================================================
+--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -148,7 +148,11 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return Allow();
+ #endif
+ 
++#ifdef __NR_clock_gettime64
++  if (sysno == __NR_clock_gettime || sysno == __NR_clock_gettime64 || sysno == __NR_clock_nanosleep || sysno == __NR_clock_nanosleep_time64) {
++#else
+   if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) {
++#endif
+     return RestrictClockID();
+   }
+ 
+Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+===================================================================
+--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -38,6 +38,10 @@ bool SyscallSets::IsAllowedGettime(int s
+     case __NR_clock_getres:     // Allowed only on Android with parameters
+                                 // filtered by RestrictClokID().
+     case __NR_clock_gettime:    // Parameters filtered by RestrictClockID().
++#ifdef __NR_clock_gettime64
++    case __NR_clock_gettime64:    // Parameters filtered by RestrictClockID().
++    case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
++#endif
+     case __NR_clock_nanosleep:  // Parameters filtered by RestrictClockID().
+     case __NR_clock_settime:    // Privileged.
+ #if defined(__i386__) || \
+@@ -159,6 +163,9 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
++#ifdef __NR_utimensat_time64
++    case __NR_utimensat_time64:
++#endif
+       return true;
+     default:
+       return false;
diff --git a/srcpkgs/electron9/files/patches/electron-exclude-content-test-patches.patch b/srcpkgs/electron9/files/patches/electron-exclude-content-test-patches.patch
index bef16e1f0e20..15735c757705 100644
--- a/srcpkgs/electron9/files/patches/electron-exclude-content-test-patches.patch
+++ b/srcpkgs/electron9/files/patches/electron-exclude-content-test-patches.patch
@@ -4,7 +4,7 @@
    for patch_dir, repo in dirs.items():
      git.import_patches(repo=repo, patch_data=patch_from_dir(patch_dir),
        threeway=threeway is not None,
-+      exclude=['content/test/**', 'test/cctest/wasm/**'],
++      exclude=['content/test/**', 'test/cctest/**'],
        committer_name="Electron Scripts", committer_email="scripts@electron")
  
  
diff --git a/srcpkgs/electron9/template b/srcpkgs/electron9/template
index d598cf62ff7c..9d8ce3dd5e60 100644
--- a/srcpkgs/electron9/template
+++ b/srcpkgs/electron9/template
@@ -1,6 +1,6 @@
 # Template file for 'electron9'
 pkgname=electron9
-version=9.3.4
+version=9.4.1
 _nodever=12.14.1
 _chromiumver=83.0.4103.119
 revision=1
@@ -30,7 +30,7 @@ homepage="https://electronjs.org"
 distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz
  https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz
  https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz"
-checksum="067399edbbadf7d975e293230ee716a441dc63bcc0bbf1ad41bd0e1063588867
+checksum="953e34b156fc9cd49b8f39daf662b279930913eea7bf47265ce60b576dfc7a36
  452cbc58895a46b2b87ba450a3f86897de92ad08ce28ffdbed6b3f12101d3788
  01e4a960be3e26b87c55509ee1cb44a14946a4169d5cdec046dd05058d995b26"
 

From 2331887ee517171d4d6a28d04cf7afbed19e904d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 Jan 2021 19:51:57 +0700
Subject: [PATCH 0319/3482] SDL2: update to 2.0.14.

CVE-2020-14409
---
 srcpkgs/SDL2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 36364dcd248d..9013c2e73e21 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.12
+version=2.0.14
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
 homepage="http://www.libsdl.org/"
 distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863
+checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
 
 # Package build options
 build_options="gles opengl pulseaudio sndio vulkan wayland x11"

From 2cb9623c113eee09672f7239c56720398b1dd895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 22 Jan 2021 08:03:34 +0700
Subject: [PATCH 0320/3482] mutt: update to 2.0.5.

CVE-2021-3181
---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index bf3f40777cea..e0394db84e2e 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,6 +1,6 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=2.0.4
+version=2.0.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.mutt.org"
 changelog="http://mutt.org/relnotes/${version%.*}"
 distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz"
-checksum=45087e78105e9abc7cc37827865d319081587cb53a94412aa4e3118e937991d4
+checksum=e21d5aec0d3110f89d390929e56a38794a94f5843120d9ff59b21da78fd0004d
 
 post_install() {
 	# provided by mime-types

From 124db02f50b874f5081612fddd6c7a3f6767312b Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <>
Date: Thu, 14 Jan 2021 14:18:30 +0100
Subject: [PATCH 0321/3482] flatpak: update to 1.10.1

Close: #27919
---
 srcpkgs/flatpak/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index c7735cb3b665..9c8065af2c00 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,6 +1,6 @@
 # Template file for 'flatpak'
 pkgname=flatpak
-version=1.8.4
+version=1.10.1
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -14,20 +14,24 @@ hostmakedepends="bubblewrap gettext glib-devel libxslt pkg-config bison
 makedepends="appstream-glib-devel gpgme-devel json-glib-devel libcap-devel
  libostree-devel libseccomp-devel polkit-devel dconf-devel fuse-devel"
 depends="bubblewrap gnupg2"
-checkdepends="bubblewrap dbus socat which"
+checkdepends="attr-progs bubblewrap dbus gnupg2 socat which"
 short_desc="Application sandboxing and distribution framework"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://flatpak.org/"
 changelog="https://github.com/flatpak/flatpak/raw/master/NEWS"
 distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz"
-checksum=3066af9a4504d36754ea0b4cd7a32a84743894563e6c9aa2a3134f812b3ccf27
+checksum=c1354f42bf3b5d51aeb4028c9b62fd4ffc673ef2ff6e583c17777f5dafdbdcb7
 
 build_options="gir"
 build_options_default="gir"
 
 system_accounts="_flatpak"
 
+post_patch() {
+	vsed -i -e '/cp.*usr.lib.locale.C/d' tests/make-test-runtime.sh
+}
+
 post_install() {
 	rm -rf $DESTDIR/usr/lib/systemd
 }

From fd01cfe06914df18c52738076ba7df97dfa6e8db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 19 Jan 2021 08:17:53 +0700
Subject: [PATCH 0322/3482] wxWidgets-gtk3: fix config after lib64 change

Also ships license.
---
 srcpkgs/wxWidgets-gtk3/template | 62 +++++++++++++++++----------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/srcpkgs/wxWidgets-gtk3/template b/srcpkgs/wxWidgets-gtk3/template
index ad4dffad9981..e1424cb47723 100644
--- a/srcpkgs/wxWidgets-gtk3/template
+++ b/srcpkgs/wxWidgets-gtk3/template
@@ -1,26 +1,53 @@
 # Template file for 'wxWidgets-gtk3'
 pkgname=wxWidgets-gtk3
 version=3.0.5.1
-revision=1
-configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl --with-libmspack
- --with-libnotify --enable-mediactrl"
-build_style=gnu-configure
+revision=2
 wrksrc="wxWidgets-${version}"
+build_style=gnu-configure
+configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl
+ --with-libmspack --with-libnotify --enable-mediactrl"
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel gst-plugins-base1-devel gstreamer1-devel gtk+3-devel
  libmspack-devel libnotify-devel tiff-devel webkit2gtk-devel glu-devel"
 short_desc="The wxWidgets GUI toolkit library compiled with gtk3 support"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="wxWindows"
+license="custom:wxWindows"
 homepage="https://www.wxwidgets.org"
 distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/wxWidgets-${version}.tar.bz2"
 checksum=440f6e73cf5afb2cbf9af10cec8da6cdd3d3998d527598a53db87099524ac807
 
+post_install() {
+	local _config="gtk3-unicode-3.0"
+	# remove all occurrences of $XBPS_CROSS_TRIPLET in wx-config:
+	#   - mark this build as native build
+	if [ "$CROSS_BUILD" ]; then
+		rename "${XBPS_CROSS_TRIPLET}-" "" \
+			${DESTDIR}/usr/lib/wx/config/* \
+			${DESTDIR}/usr/lib/wx/include/*
+		rename -- "-${XBPS_CROSS_TRIPLET}" "" ${DESTDIR}/usr/lib/*
+
+		sed -i -e "s/${XBPS_CROSS_TRIPLET}-//g" \
+			-e "s/-${XBPS_CROSS_TRIPLET}//g" \
+			${DESTDIR}/usr/lib/wx/config/${_config}
+	fi
+	rm -f ${DESTDIR}/usr/bin/wx-config
+	ln -sf ../lib/wx/config/${_config} ${DESTDIR}/usr/bin/wx-config-gtk3
+	#   - ignore --host option; breaks configure scripts when
+	#     cross compiling (isn’t necessary in our case anyway)
+	sed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
+		-e '/^bindir="\/usr/s,/usr,${exec_prefix},' \
+		-e 's/is_cross().*/is_cross() { false; }/g' \
+		-e '/--\*=\*)/i --host=\*) continue;;' \
+		$DESTDIR/usr/lib/wx/config/gtk3-unicode-3.0
+}
+
 wxWidgets-common_package() {
 	short_desc+=" - common files"
 	pkg_install() {
 		vmove "usr/lib/libwx_baseu*.so.*"
 		vmove usr/share
+		vlicense docs/licendoc.txt
+		vlicense docs/licence.txt
 	}
 }
 
@@ -31,9 +58,6 @@ wxWidgets-common-devel_package() {
 		vmove "usr/bin/wxrc*"
 		vmove "usr/lib/libwx_baseu*.so"
 		vmove usr/include
-		if [ "$CROSS_BUILD" ]; then
-			rename -- "-${XBPS_CROSS_TRIPLET}" "" ${PKGDESTDIR}/usr/lib/*
-		fi
 	}
 }
 
@@ -44,27 +68,5 @@ wxWidgets-gtk3-devel_package() {
 		vmove usr/bin
 		vmove "usr/lib/*.so"
 		vmove usr/lib/wx
-
-		mv ${PKGDESTDIR}/usr/bin/wx-config{,-gtk3}
-		# remove all occurrences of $XBPS_CROSS_TRIPLET
-		# wx-config:
-		#   - mark this build as native build
-		#   - ignore --host option; breaks configure scripts when
-		#     cross compiling (isn’t necessary in our case anyway)
-		if [ "$CROSS_BUILD" ]; then
-			local _config="gtk3-unicode-3.0"
-			mv ${PKGDESTDIR}/usr/lib/wx/include/{${XBPS_CROSS_TRIPLET}-${_config},${_config}}
-
-			rename "${XBPS_CROSS_TRIPLET}-" "" ${PKGDESTDIR}/usr/lib/wx/config/*
-			rename -- "-${XBPS_CROSS_TRIPLET}" "" ${PKGDESTDIR}/usr/lib/*
-
-			sed -i -e "s/${XBPS_CROSS_TRIPLET}-//g" \
-			 -e "s/-${XBPS_CROSS_TRIPLET}//g" \
-			 -e 's/is_cross()  { \[ "xyes" = "xyes" \]; }/is_cross()  { \[ "xno" = "xyes" \]; }/g' \
-			 -e 's/--\*=\*)/--host=\*) continue;;\n\n    --\*=\*)/' \
-			 ${PKGDESTDIR}/usr/lib/wx/config/${_config}
-
-			ln -sf ../lib/wx/config/${_config} ${PKGDESTDIR}/usr/bin/wx-config-gtk3
-		fi
 	}
 }

From f2b27801b51d51745fd1b0435afc88c406a32d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 19 Jan 2021 21:49:12 +0700
Subject: [PATCH 0323/3482] wxWidgets: fix -config script after lib64 change

---
 srcpkgs/wxWidgets/template | 49 +++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template
index 820c9e1133c7..6cca7f994f20 100644
--- a/srcpkgs/wxWidgets/template
+++ b/srcpkgs/wxWidgets/template
@@ -1,7 +1,7 @@
 # Template file for 'wxWidgets'
 pkgname=wxWidgets
 version=3.0.5.1
-revision=1
+revision=2
 configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack
  --with-libnotify --enable-mediactrl --with-gtk=2 --disable-webview"
 build_style=gnu-configure
@@ -18,6 +18,7 @@ distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/
 checksum=440f6e73cf5afb2cbf9af10cec8da6cdd3d3998d527598a53db87099524ac807
 
 post_install() {
+	local _config="gtk2-unicode-3.0"
 	# remove files that are already in wxWidgets-common
 	rm -f ${DESTDIR}/usr/lib/libwx_baseu*
 	rm -rf ${DESTDIR}/usr/bin/wxrc*
@@ -27,6 +28,29 @@ post_install() {
 	for f in "" generic gtk; do
 		rm ${DESTDIR}/usr/include/wx-3.0/wx/$f/notifmsg.h
 	done
+	# remove all occurrences of $XBPS_CROSS_TRIPLET
+	# wx-config:
+	#   - mark this build as native build
+	#   - ignore --host option; breaks configure scripts when
+	#     cross compiling (isn’t necessary in our case anyway)
+	if [ -n "$CROSS_BUILD" ]; then
+		rename "${XBPS_CROSS_TRIPLET}-" "" \
+			${DESTDIR}/usr/lib/wx/config/* \
+			${DESTDIR}/usr/lib/wx/include/*
+		rename -- "-${XBPS_CROSS_TRIPLET}" "" ${DESTDIR}/usr/lib/*
+
+		sed -i -e "s/${XBPS_CROSS_TRIPLET}-//g" \
+			-e "s/-${XBPS_CROSS_TRIPLET}//g" \
+			${DESTDIR}/usr/lib/wx/config/${_config}
+
+	fi
+	sed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
+		-e '/^bindir="\/usr/s,/usr,${exec_prefix},' \
+		-e 's/is_cross()  { .* }/is_cross() { false; }/g' \
+		-e '/--\*=\*)/i --host=\*) continue;;' \
+		${DESTDIR}/usr/lib/wx/config/${_config}
+	ln -sf ../lib/wx/config/${_config} ${PKGDESTDIR}/usr/bin/wx-config-3.0
+	ln -sf wx-config-3.0 ${DESTDIR}/usr/bin/wx-config
 }
 
 wxWidgets-devel_package() {
@@ -37,28 +61,5 @@ wxWidgets-devel_package() {
 		vmove usr/bin
 		vmove "usr/lib/*.so"
 		vmove usr/lib/wx
-
-		ln -sf wx-config-3.0 ${PKGDESTDIR}/usr/bin/wx-config
-
-		# remove all occurrences of $XBPS_CROSS_TRIPLET
-		# wx-config:
-		#   - mark this build as native build
-		#   - ignore --host option; breaks configure scripts when
-		#     cross compiling (isn’t necessary in our case anyway)
-		if [ -n "$CROSS_BUILD" ]; then
-			local _config="gtk2-unicode-3.0"
-			mv ${PKGDESTDIR}/usr/lib/wx/include/{${XBPS_CROSS_TRIPLET}-${_config},${_config}}
-
-			rename "${XBPS_CROSS_TRIPLET}-" "" ${PKGDESTDIR}/usr/lib/wx/config/*
-			rename -- "-${XBPS_CROSS_TRIPLET}" "" ${PKGDESTDIR}/usr/lib/*
-
-			sed -i -e "s/${XBPS_CROSS_TRIPLET}-//g" \
-			 -e "s/-${XBPS_CROSS_TRIPLET}//g" \
-			 -e 's/is_cross()  { \[ "xyes" = "xyes" \]; }/is_cross()  { \[ "xno" = "xyes" \]; }/g' \
-			 -e 's/--\*=\*)/--host=\*) continue;;\n\n    --\*=\*)/' \
-			 ${PKGDESTDIR}/usr/lib/wx/config/${_config}
-
-			ln -sf ../lib/wx/config/${_config} ${PKGDESTDIR}/usr/bin/wx-config-3.0
-		fi
 	}
 }

From 476ac12d584f9f7c64d07b15538a834b0a999dfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 22 Jan 2021 18:05:57 +0700
Subject: [PATCH 0324/3482] tacacs: fix ftbfs

shlib-requires doesn't change.
---
 srcpkgs/tacacs/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/tacacs/template b/srcpkgs/tacacs/template
index d0cc7cce1072..af2e244210f9 100644
--- a/srcpkgs/tacacs/template
+++ b/srcpkgs/tacacs/template
@@ -6,6 +6,7 @@ wrksrc=$pkgname-F$version
 build_style=gnu-configure
 configure_args="--with-libwrap=no"
 hostmakedepends="flex perl"
+makedepends="libnsl-devel"
 short_desc="Modified version of Cisco's tacacs+ (tac_plus) developer's kit"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Cisco"

From fec2f20291ba5ec4831f7640a133528ca984207b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 22 Jan 2021 10:52:38 -0300
Subject: [PATCH 0325/3482] linux4.19: fix arm64 config so build isn't stuck.

---
 srcpkgs/linux4.19/files/arm64-dotconfig | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/linux4.19/files/arm64-dotconfig b/srcpkgs/linux4.19/files/arm64-dotconfig
index 5192a9794538..f9624002a646 100644
--- a/srcpkgs/linux4.19/files/arm64-dotconfig
+++ b/srcpkgs/linux4.19/files/arm64-dotconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.19.132 Kernel Configuration
+# Linux/arm64 4.19.169 Kernel Configuration
 #
 
 #
-# Compiler: aarch64-linux-gnu-gcc (GCC) 9.3.0
+# Compiler: aarch64-linux-musl-gcc (GCC) 10.2.1 20201203
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
+CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
@@ -19,7 +19,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -2212,7 +2212,6 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
@@ -3779,6 +3778,7 @@ CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_DYNAMIC=y
 CONFIG_SPMI=y
 CONFIG_SPMI_MSM_PMIC_ARB=y
 # CONFIG_HSI is not set
@@ -6204,7 +6204,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -7019,6 +7018,8 @@ CONFIG_TIMER_OF=y
 CONFIG_TIMER_ACPI=y
 CONFIG_TIMER_PROBE=y
 CONFIG_CLKSRC_MMIO=y
+CONFIG_DW_APB_TIMER=y
+CONFIG_DW_APB_TIMER_OF=y
 CONFIG_ROCKCHIP_TIMER=y
 CONFIG_OWL_TIMER=y
 CONFIG_ARM_ARCH_TIMER=y
@@ -8650,6 +8651,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_PROBE_EVENTS=y

From 55f197648aa03d7d266fca74c96403f441fd04b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 22 Jan 2021 10:53:04 -0300
Subject: [PATCH 0326/3482] linux5.4: fix arm64 config so build isn't stuck.

---
 srcpkgs/linux5.4/files/arm64-dotconfig | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/linux5.4/files/arm64-dotconfig b/srcpkgs/linux5.4/files/arm64-dotconfig
index 62fd618da338..3f4082418c75 100644
--- a/srcpkgs/linux5.4/files/arm64-dotconfig
+++ b/srcpkgs/linux5.4/files/arm64-dotconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.55 Kernel Configuration
+# Linux/arm64 5.4.91 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 9.3.0
+# Compiler: aarch64-linux-musl-gcc (GCC) 10.2.1 20201203
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
+CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
@@ -1000,7 +1000,6 @@ CONFIG_ZPOOL=y
 CONFIG_ZBUD=y
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
@@ -4535,6 +4534,7 @@ CONFIG_SPI_LOOPBACK_TEST=m
 CONFIG_SPI_SLAVE=y
 CONFIG_SPI_SLAVE_TIME=m
 CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
+CONFIG_SPI_DYNAMIC=y
 CONFIG_SPMI=m
 CONFIG_SPMI_MSM_PMIC_ARB=m
 CONFIG_HSI=m
@@ -7447,7 +7447,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -7794,6 +7793,7 @@ CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_VIRT_DMA=y
 CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
 CONFIG_INFINIBAND_CXGB3=m
@@ -8469,6 +8469,7 @@ CONFIG_COMMON_CLK_G12A=y
 CONFIG_ARMADA_AP_CP_HELPER=y
 CONFIG_ARMADA_37XX_CLK=y
 CONFIG_ARMADA_AP806_SYSCON=y
+CONFIG_ARMADA_AP_CPU_CLK=y
 CONFIG_ARMADA_CP110_SYSCON=y
 CONFIG_QCOM_GDSC=y
 CONFIG_QCOM_RPMCC=y
@@ -8544,6 +8545,8 @@ CONFIG_TIMER_OF=y
 CONFIG_TIMER_ACPI=y
 CONFIG_TIMER_PROBE=y
 CONFIG_CLKSRC_MMIO=y
+CONFIG_DW_APB_TIMER=y
+CONFIG_DW_APB_TIMER_OF=y
 CONFIG_ROCKCHIP_TIMER=y
 CONFIG_OWL_TIMER=y
 CONFIG_TEGRA_TIMER=y
@@ -10542,6 +10545,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y

From ddf6f6a784689ed7d0c06c8d0c1de738721f1930 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 22 Jan 2021 09:14:21 +0100
Subject: [PATCH 0327/3482] github-cli: update to 1.5.0.

---
 srcpkgs/github-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 59500d045881..078d892cfd19 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.4.0
-revision=2
+version=1.5.0
+revision=1
 wrksrc="cli-${version}"
 build_style=go
 build_helper=qemu
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=9f8851264938e48f5ccabe12e4de404ee0f94c8e33c107b818c4e324dbafa558
+checksum=49c42a3b951b67e29bc66e054fedb90ac2519f7e1bfc5c367e82cb173e4bb056
 
 pre_build() {
 	local _date

From 34df065db2ae52053ebb84c808e1d1c4cfcca6ac Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Fri, 22 Jan 2021 11:29:23 +0100
Subject: [PATCH 0328/3482] podget: update to 0.8.8.

---
 srcpkgs/podget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podget/template b/srcpkgs/podget/template
index 554570497902..960a3bbf4bd5 100644
--- a/srcpkgs/podget/template
+++ b/srcpkgs/podget/template
@@ -1,6 +1,6 @@
 # Template file for 'podget'
 pkgname=podget
-version=0.8.7
+version=0.8.8
 revision=1
 build_style=gnu-makefile
 depends="wget"
@@ -9,4 +9,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"
 homepage="http://podget.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/podget/podget/podget-${version}/podget-${version}.tar.gz"
-checksum=5f0a98a5e90ef5fc8091a443412424407ee172f7152ce533503258b0f26d7c11
+checksum=54bc846583d06d93aeaf170e0f9ed854bf9a030ce3a6537d68908bb8d3f284d4

From c1b44d634c088df7a735db00efcc884081c3b514 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 15:34:51 +0100
Subject: [PATCH 0329/3482] gcc: rebuild with gccgo present on cross musl

---
 srcpkgs/gcc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index f7fa99383b13..5417d8d87bb8 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -13,7 +13,7 @@ pkgname=gcc
 # it should be possible to switch back to stable with 10.3 or 11
 version=${_patchver}pre1
 wrksrc=gcc-${version/pre/_pre}
-revision=1
+revision=2
 short_desc="GNU Compiler Collection"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 homepage="http://gcc.gnu.org"

From ebb535ed9f6061105c52564306eb9f46cec6ab31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 22 Jan 2021 10:45:03 -0500
Subject: [PATCH 0330/3482] duiadns: use touch to update timefile in runit
 service

When on an NFS volume, the shell redirection `: > $TIMEFILE` seems to
short-circuit the empty write when the file is already empty, so the
mtime is never updated. Using `touch` yields expected behavior.
---
 srcpkgs/duiadns/files/duiadns/run | 2 +-
 srcpkgs/duiadns/template          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/duiadns/files/duiadns/run b/srcpkgs/duiadns/files/duiadns/run
index 3e0c9119c34d..c60644335b6a 100755
--- a/srcpkgs/duiadns/files/duiadns/run
+++ b/srcpkgs/duiadns/files/duiadns/run
@@ -16,7 +16,7 @@ if command -v snooze >/dev/null 2>&1; then
 
 	exec chpst -u _duiadns:_duiadns \
 		snooze ${PERIOD} -t "${TIMEFILE}" \
-			sh -c "/usr/bin/duiadns '${CONFIG}'; : > '${TIMEFILE}'"
+			sh -c "/usr/bin/duiadns '${CONFIG}'; touch '${TIMEFILE}'"
 else
 	# Fall back to dumb sleep if snooze is not available
 	# PERIOD is just the number of seconds to sleep in this context
diff --git a/srcpkgs/duiadns/template b/srcpkgs/duiadns/template
index cb447d33cdfc..e124007898e0 100644
--- a/srcpkgs/duiadns/template
+++ b/srcpkgs/duiadns/template
@@ -1,7 +1,7 @@
 # Template file for 'duiadns'
 pkgname=duiadns
 version=1.1
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-netifaces python3-netaddr python3-requests"

From ef9c6f9a29c0ead43cf7d48d176db46b3af3aae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 22 Jan 2021 12:51:30 -0300
Subject: [PATCH 0331/3482] shutils/chroot: add newline to warning about unset
 timezone.

The warning is being triggered in CI, though it shouldn't have been hit
at all.
---
 common/xbps-src/shutils/chroot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 73b98bc7200e..2fc17f2ab54d 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -116,7 +116,7 @@ chroot_prepare() {
         ln -sf ../usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
     else
         # Should never happen.
-        msg_warn "No local timezone configuration file created."
+        msg_warn "No local timezone configuration file created.\n"
     fi
 
     for f in dev sys proc host boot; do

From 528cb9290dda790273ba0e53d77419b34838f8b0 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 22 Jan 2021 16:26:37 +0100
Subject: [PATCH 0332/3482] pounce: update to 2.2

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 4933e7d8402b..57959706a54f 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,6 +1,6 @@
 # Template file for 'pounce'
 pkgname=pounce
-version=2.1p1
+version=2.2
 revision=1
 build_style=gnu-configure
 make_build_target="all"
@@ -11,4 +11,4 @@ maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/pounce/"
 distfiles="https://git.causal.agency/pounce/snapshot/pounce-$version.tar.gz"
-checksum=24fbb3287044edd37dd32a365189541c4fc7309c395415e542cc3d554ccd8f91
+checksum=2edde674f3d5d7f92211d25a7a5f0b011d91ab893942c09f9cbde5106e0f9b0c

From 662e06e5f49f118c6cd05975f664c83896388d87 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 22 Jan 2021 16:26:06 +0100
Subject: [PATCH 0333/3482] catgirl: update to 1.5

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index c4f242f1b5f1..24967a8c1f04 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.3
+version=1.5
 revision=1
 build_style=gnu-configure
 make_build_target="all"
@@ -11,4 +11,4 @@ maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
 distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=be00ea0bd3c8a9582c792d2767bc1a671e05dff839a246b533797742fcda8cec
+checksum=bea9fd47a55ad624113cec71c758427f485b841d92da59dbe9bfed4ef5c08c7c

From 54c3521c2c850c88b5fd2152c76870a5ba24dd67 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 21 Jan 2021 17:51:23 +0100
Subject: [PATCH 0334/3482] go: update to 1.15.7

---
 srcpkgs/go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index f4867859b8dc..e89f2599d292 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.15.6
+version=1.15.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://golang.org/"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817
+checksum=8631b3aafd8ecb9244ec2ffb8a2a8b4983cf4ad15572b9801f7c5b167c1a2abc
 nostrip=yes
 noverifyrdeps=yes
 

From 854e4ba0613811ede1412888d63ada3b348938a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 22 Jan 2021 16:31:26 -0300
Subject: [PATCH 0335/3482] wxWidgets-gtk3: add patch so ABI mismatch errors
 aren't fatal.

The version string used by wx to check for a "compatible" ABI includes
the C++ ABI, which changed between GCC 9 and 10 (1013 and 1014,
respectively). This made it so launching a program built with GCC 10
with wxWidgets built with GCC 9 failed. Once wxWidgets was rebuilt with
GCC 10, applications built with GCC 9 would be the ones to fail.
---
 .../patches/nonfatal-abi-check.patch           | 18 ++++++++++++++++++
 srcpkgs/wxWidgets-gtk3/template                |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch

diff --git a/srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch b/srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch
new file mode 100644
index 000000000000..8a2bd5845325
--- /dev/null
+++ b/srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch
@@ -0,0 +1,18 @@
+Taken from
+https://github.com/archlinux/svntogit-packages/blob/71ee17d529f8e0dc5c44d2fffb0dfa69b71daa0b/repos/extra-x86_64/make-abicheck-non-fatal.patch
+
+diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp
+--- src/common/appbase.cpp.abicheck	2015-03-12 17:15:18.000000000 +0100
++++ src/common/appbase.cpp	2015-03-12 17:15:57.000000000 +0100
+@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con
+         msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+                    lib.c_str(), progName.c_str(), prog.c_str());
+ 
+-        wxLogFatalError(msg.c_str());
+-
+-        // normally wxLogFatalError doesn't return
+-        return false;
++        wxLogWarning(msg.c_str());
+     }
+ #undef wxCMP
+ 
diff --git a/srcpkgs/wxWidgets-gtk3/template b/srcpkgs/wxWidgets-gtk3/template
index e1424cb47723..1081bc8853dc 100644
--- a/srcpkgs/wxWidgets-gtk3/template
+++ b/srcpkgs/wxWidgets-gtk3/template
@@ -1,7 +1,7 @@
 # Template file for 'wxWidgets-gtk3'
 pkgname=wxWidgets-gtk3
 version=3.0.5.1
-revision=2
+revision=3
 wrksrc="wxWidgets-${version}"
 build_style=gnu-configure
 configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl

From 2e8e497e637a2fe13947947a82f642e68c7a49ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 22 Jan 2021 17:13:15 -0300
Subject: [PATCH 0336/3482] wxWidgets: add patch so ABI mismatch errors aren't
 fatal.

Same explanation as wxWidgets-gtk3 from the previous commit.
---
 .../wxWidgets/patches/nonfatal-abi-check.patch | 18 ++++++++++++++++++
 srcpkgs/wxWidgets/template                     |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch

diff --git a/srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch b/srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch
new file mode 100644
index 000000000000..8a2bd5845325
--- /dev/null
+++ b/srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch
@@ -0,0 +1,18 @@
+Taken from
+https://github.com/archlinux/svntogit-packages/blob/71ee17d529f8e0dc5c44d2fffb0dfa69b71daa0b/repos/extra-x86_64/make-abicheck-non-fatal.patch
+
+diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp
+--- src/common/appbase.cpp.abicheck	2015-03-12 17:15:18.000000000 +0100
++++ src/common/appbase.cpp	2015-03-12 17:15:57.000000000 +0100
+@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con
+         msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+                    lib.c_str(), progName.c_str(), prog.c_str());
+ 
+-        wxLogFatalError(msg.c_str());
+-
+-        // normally wxLogFatalError doesn't return
+-        return false;
++        wxLogWarning(msg.c_str());
+     }
+ #undef wxCMP
+ 
diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template
index 6cca7f994f20..bd43970594d7 100644
--- a/srcpkgs/wxWidgets/template
+++ b/srcpkgs/wxWidgets/template
@@ -1,7 +1,7 @@
 # Template file for 'wxWidgets'
 pkgname=wxWidgets
 version=3.0.5.1
-revision=2
+revision=3
 configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack
  --with-libnotify --enable-mediactrl --with-gtk=2 --disable-webview"
 build_style=gnu-configure

From 1de631ca6fab78a7e2410c6e6ecdce0cd32df40e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 21:33:21 +0100
Subject: [PATCH 0337/3482] cross-vpkg-dummy: update for gcc10, add libssp for
 musl

also build always, since there is no point in restricting this
only to crosstargets (it will avoid annoyingly rebuilding the
package locally)
---
 srcpkgs/cross-vpkg-dummy/template | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index e2a08d2404d9..b7347d035148 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,6 +1,6 @@
 # Template file for 'cross-vpkg-dummy'
 pkgname=cross-vpkg-dummy
-version=0.35
+version=0.36
 revision=1
 build_style=meta
 short_desc="Dummy meta-pkg for cross building packages with xbps-src"
@@ -54,18 +54,19 @@ conflicts="
 	gcc-objc++>=0"
 shlib_provides="
 	libgcc_s.so.1
-	libgnat-9.so
-	libgnarl-9.so
+	libgnat-10.so
+	libgnarl-10.so
 	libstdc++.so.6
 	libgfortran.so.5"
 
-case "$XBPS_TARGET_MACHINE" in
-*-musl) provides+=" musl-9999_1 musl-devel-9999_1"
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	provides+=" musl-9999_1 musl-devel-9999_1"
+	# bundled in musl crosstoolchains but not glibc
+	provides+=" libssp-9999_1 libssp-devel-9999_1"
 	conflicts+=" musl>=0"
 	shlib_provides+=" libc.so"
-	;;
-# glibc
-*)	provides+=" glibc-9999_1 glibc-devel-9999_1"
+else
+	provides+=" glibc-9999_1 glibc-devel-9999_1"
 	conflicts+=" glibc>=0"
 	shlib_provides+=" libc.so.6 libm.so.6 librt.so.1 libpthread.so.0"
 	shlib_provides+=" libcrypt.so.1 libdl.so.2 libresolv.so.2"
@@ -73,9 +74,4 @@ case "$XBPS_TARGET_MACHINE" in
 	shlib_provides+=" ld-linux.so.2 ld-linux.so.3 ld-linux-x86_64.so.2"
 	shlib_provides+=" ld-linux-armhf.so.3 ld-linux-aarch64.so.1"
 	shlib_provides+=" ld64.so.2 ld.so.1"
-	;;
-esac
-
-if [ -z "$XBPS_CROSS_BUILD" ]; then
-	broken="This package is only meant to be used by xbps-src to cross compile."
 fi

From b4f5b900aa7f10822518d679a988639adf98252f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 21:58:51 +0100
Subject: [PATCH 0338/3482] cross-vpkg-dummy: forgot to add a shlib_provides
 for libssp

---
 srcpkgs/cross-vpkg-dummy/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index b7347d035148..9de559bce03e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,6 +1,6 @@
 # Template file for 'cross-vpkg-dummy'
 pkgname=cross-vpkg-dummy
-version=0.36
+version=0.37
 revision=1
 build_style=meta
 short_desc="Dummy meta-pkg for cross building packages with xbps-src"
@@ -63,6 +63,7 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	provides+=" musl-9999_1 musl-devel-9999_1"
 	# bundled in musl crosstoolchains but not glibc
 	provides+=" libssp-9999_1 libssp-devel-9999_1"
+	shlib_provides+=" libssp.so.0"
 	conflicts+=" musl>=0"
 	shlib_provides+=" libc.so"
 else

From f7fbd1385409741c3d762aaf3e9064ffc25288a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 22 Jan 2021 18:23:55 +0700
Subject: [PATCH 0339/3482] opentoonz: fix ftbfs

---
 srcpkgs/opentoonz/patches/invalid-char.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/opentoonz/patches/invalid-char.patch

diff --git a/srcpkgs/opentoonz/patches/invalid-char.patch b/srcpkgs/opentoonz/patches/invalid-char.patch
new file mode 100644
index 000000000000..a2d6b684419b
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/invalid-char.patch
@@ -0,0 +1,10 @@
+--- toonz/sources/common/twain/twain.h.orig	2021-01-22 18:20:20.834440241 +0700
++++ toonz/sources/common/twain/twain.h	2021-01-22 18:20:28.671469813 +0700
+@@ -2209,7 +2209,6 @@
+ #elif defined(TWH_CMP_GNU)
+ #pragma pack(pop, before_twain)
+ #elif defined(TWH_CMP_BORLAND)
+-#pragma option –a.
+ #elif defined(TWH_CMP_XCODE)
+ #if PRAGMA_STRUCT_ALIGN
+ #pragma options align = reset

From 11106c5970d67f6ddfce001f276238f8c083dd6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 23 Jan 2021 09:04:08 +0700
Subject: [PATCH 0340/3482] fingerprint-gui: patch for musl-1.2.x

---
 srcpkgs/fingerprint-gui/patches/time64.patch | 29 ++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/fingerprint-gui/patches/time64.patch

diff --git a/srcpkgs/fingerprint-gui/patches/time64.patch b/srcpkgs/fingerprint-gui/patches/time64.patch
new file mode 100644
index 000000000000..ba8a7f45cff5
--- /dev/null
+++ b/srcpkgs/fingerprint-gui/patches/time64.patch
@@ -0,0 +1,29 @@
+Index: src/FingerprintHelper.cpp
+===================================================================
+--- src/FingerprintHelper.cpp.orig
++++ src/FingerprintHelper.cpp
+@@ -75,9 +75,12 @@ void pluginMessage(const char *msg){
+ // Send <enter> to uinput
+ bool uinputSendEnter(int uinput){
+     struct input_event event;
++    struct timeval tv = { 0, 0 };
+     memset(&event,0,sizeof(event));
+     // PRESS
+-    gettimeofday(&event.time,NULL);
++    gettimeofday(&tv,NULL);
++    event.input_event_sec = tv.tv_sec;
++    event.input_event_usec = tv.tv_usec;
+     event.type=EV_KEY;
+     event.code=KEY_ENTER;
+     event.value=1;
+@@ -93,7 +96,9 @@ bool uinputSendEnter(int uinput){
+         return false;
+     }
+     // RELEASE
+-    gettimeofday(&event.time,NULL);
++    gettimeofday(&tv,NULL);
++    event.input_event_sec = tv.tv_sec;
++    event.input_event_usec = tv.tv_usec;
+     event.type=EV_KEY;
+     event.code=KEY_ENTER;
+     event.value=0;

From a1907ebc40c75c9fa020239a9c7cb0e75f203ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 23 Jan 2021 10:18:11 +0700
Subject: [PATCH 0341/3482] python3-saml2: update to 6.5.1.

CVE-2021-21238
CVE-2021-21239
---
 srcpkgs/python3-saml2/template | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template
index 630660ce5ab7..07b7e142efae 100644
--- a/srcpkgs/python3-saml2/template
+++ b/srcpkgs/python3-saml2/template
@@ -1,19 +1,29 @@
 # Template file for 'python3-saml2'
 pkgname=python3-saml2
-version=6.4.1
+version=6.5.1
 revision=1
 wrksrc="pysaml2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-cryptography python3-openssl python3-dateutil
- python3-pytz python3-requests python3-six python3-defusedxml"
+ python3-pytz python3-requests python3-six python3-defusedxml
+ python3-xmlschema"
 checkdepends="python3-pytest python3-mock xmlsec1-devel $depends"
 short_desc="Python3 implementation of SAML Version 2 Standard"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/IdentityPython/pysaml2"
 distfiles="https://github.com/IdentityPython/pysaml2/archive/v${version}.tar.gz"
-checksum=341fe81e1fdff72e6082ba81645a9b75dab7482cf9b878f566d023311169f8c0
+checksum=3940f4b7da41f42d4155a21d50d28145b5bfec4724300553f09e4fe647f76cf9
+
+post_patch() {
+	# importlib_resources just delegate to importlib.resources
+	# in Python 3.9
+	vsed -i -e 's/importlib_resources/importlib.resources/' \
+		src/saml2/xml/schema/__init__.py \
+		src/saml2/sigver.py
+	vsed -i -e '/importlib_resources/d' setup.cfg
+}
 
 do_check() {
 	# Ignore tests that depend on packages not provided by Void

From 52c778dc49ee2c3d389f9ed1bd27d05972e56a57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 23 Jan 2021 10:55:39 +0700
Subject: [PATCH 0342/3482] python3-Sphinx: update to 3.4.3.

---
 srcpkgs/python3-Sphinx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Sphinx/template b/srcpkgs/python3-Sphinx/template
index e7425648cfdd..99ed0a8019b7 100644
--- a/srcpkgs/python3-Sphinx/template
+++ b/srcpkgs/python3-Sphinx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Sphinx'
 pkgname=python3-Sphinx
-version=3.4.1
+version=3.4.3
 revision=1
 wrksrc=Sphinx-${version}
 build_style=python3-module
@@ -18,7 +18,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://sphinx-doc.org"
 distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz"
-checksum=e450cb205ff8924611085183bf1353da26802ae73d9251a8fcdf220a8f8712ef
+checksum=41cad293f954f7d37f803d97eb184158cfd90f51195131e94875bc07cd08b93c
 conflicts="python-Sphinx>=0"
 
 do_check() {

From 8e97883e9818900cebab5c95fd0cb577f4874548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 23 Jan 2021 10:55:44 +0700
Subject: [PATCH 0343/3482] python3-elementpath: update to 2.1.1.

---
 srcpkgs/python3-elementpath/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 697c055ada6a..039c2b1f877c 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.0.5
+version=2.1.1
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=d9612efed8ec2a5611f8fac90111e4c49464084eae9087028e63ac4b0b99cd90
+checksum=7ac47a1a0da75ccde8a7427954a05a8d8d341a6032c8e272c4d471babcc63e02
 
 post_patch() {
 	# locale handling in musl is NOT that ideal,

From 20711a14777f37b3a01d29d0843843fc724a8c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 23 Jan 2021 10:55:49 +0700
Subject: [PATCH 0344/3482] python3-fido2: update to 0.9.0.

---
 srcpkgs/python3-fido2/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-fido2/template b/srcpkgs/python3-fido2/template
index c489c0ad612d..4cdc7f23cac7 100644
--- a/srcpkgs/python3-fido2/template
+++ b/srcpkgs/python3-fido2/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-fido2'
 pkgname=python3-fido2
 _pkgname=fido2
-version=0.8.1
-revision=3
+version=0.9.0
+revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/Yubico/python-fido2"
 distfiles="${PYPI_SITE}/f/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=449068f6876f397c8bb96ebc6a75c81c2692f045126d3f13ece21d409acdf7c3
+checksum=468f8657cc5b8b149e38a1735fbf5cd65e01a340a11a585caf4e6bade8c4b735
 
 post_install() {
 	vlicense COPYING

From e04e2b7ed24c8ba9a35dee0ab83df89c7b529177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 23 Jan 2021 10:55:55 +0700
Subject: [PATCH 0345/3482] python3-usb: update to 1.1.1.

---
 srcpkgs/python3-usb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index b86f203fcd7b..5d3c1b77d1b6 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.1.0
-revision=4
+version=1.1.1
+revision=1
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=d69ed64bff0e2102da11b3f49567256867853b861178689671a163d30865c298
+checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
 
 post_install() {
 	vlicense LICENSE

From c9f8570f222756192df064f3c738f71bf444a475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 23 Jan 2021 10:56:02 +0700
Subject: [PATCH 0346/3482] python3-yoyo-migrations: update to 7.3.1.

---
 srcpkgs/python3-yoyo-migrations/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-yoyo-migrations/template b/srcpkgs/python3-yoyo-migrations/template
index 4b9cd4f566b3..a6ae96d6856d 100644
--- a/srcpkgs/python3-yoyo-migrations/template
+++ b/srcpkgs/python3-yoyo-migrations/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-yoyo-migrations'
 pkgname=python3-yoyo-migrations
-version=7.2.1
+version=7.3.1
 revision=1
 wrksrc=yoyo-migrations-$version
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="Apache-2.0"
 homepage="https://ollycope.com/software/yoyo/latest/"
 distfiles="$PYPI_SITE/y/yoyo-migrations/yoyo-migrations-$version.tar.gz"
-checksum=89b6d51e9fcc8f7b413ebfa99576d19a71c0a04a0917898e45ad02c711e5f0da
+checksum=24593b5bc25d43f1395843ed9d4605f0227e258706db93bdb31ad5a6f46c8ab3
 
 do_check() {
 	:

From b6af73b66e2c991815839b765a331cf8549aa5c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 23 Jan 2021 10:57:20 +0700
Subject: [PATCH 0347/3482] python3-PyVirtualDisplay: update to 2.0.

---
 srcpkgs/python3-PyVirtualDisplay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-PyVirtualDisplay/template b/srcpkgs/python3-PyVirtualDisplay/template
index 5321d2c98fbb..86726c705668 100644
--- a/srcpkgs/python3-PyVirtualDisplay/template
+++ b/srcpkgs/python3-PyVirtualDisplay/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyVirtualDisplay'
 pkgname=python3-PyVirtualDisplay
-version=1.3.2
-revision=2
+version=2.0
+revision=1
 wrksrc=PyVirtualDisplay-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/ponty/pyvirtualdisplay"
 distfiles="${PYPI_SITE}/P/PyVirtualDisplay/PyVirtualDisplay-${version}.tar.gz"
-checksum=3fa85a6e490e45eab64e6be19841e0ab15ec8054c97f162079a061da6a93eba0
+checksum=3cdacd70970a74d163a2417d8581f43a56bb1ac8d31c71a1a6a4348969062d65
 
 do_check() {
 	: needs Xvnc Xephyr GUI, test EasyProcess and pytest-xvfb instead

From 24ce263ea4181ae9faa7fadaac589b99110e8593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 23 Jan 2021 11:21:53 +0700
Subject: [PATCH 0348/3482] fwupd: fix cross build

---
 srcpkgs/fwupd/patches/fix-cross.patch | 37 ----------------------
 srcpkgs/fwupd/template                | 44 +++++++++++++--------------
 2 files changed, 21 insertions(+), 60 deletions(-)
 delete mode 100644 srcpkgs/fwupd/patches/fix-cross.patch

diff --git a/srcpkgs/fwupd/patches/fix-cross.patch b/srcpkgs/fwupd/patches/fix-cross.patch
deleted file mode 100644
index 36a2bd108962..000000000000
--- a/srcpkgs/fwupd/patches/fix-cross.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git meson.build meson.build
-index c0463ef..c7d1567 100644
---- meson.build
-+++ meson.build
-@@ -241,6 +241,13 @@ if get_option('plugin_uefi')
-   endif
-   conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME)
-   r = run_command([python3, 'po/test-deps'])
-+  if meson.is_cross_build()
-+    qemu = '/usr/bin/qemu-' + gnu_efi_arch + '-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/bin/python3'
-+    r = run_command('sh', '-c', qemu_python3_cmd + ' po/test-deps')
-+  else
-+    r = run_command([python3, 'po/test-deps'])
-+  endif
-   if r.returncode() != 0
-     error(r.stderr())
-   endif
-diff --git po/meson.build po/meson.build
-index 6e78d2e..3fdedb7 100644
---- po/meson.build
-+++ po/meson.build
-@@ -5,6 +5,12 @@ i18n.gettext(meson.project_name(),
-   ]
- )
- 
-+if meson.is_cross_build()
-+  python3_cmd = qemu_python3_cmd
-+else
-+  python3_cmd = python3.path()
-+endif
-+
- if get_option('plugin_uefi')
--meson.add_install_script('make-images.sh', localedir, python3.path())
-+meson.add_install_script('make-images.sh', localedir, python3_cmd)
- endif
-
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 63623c362ee1..f5302a83261c 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -9,16 +9,15 @@ configure_args="-Dsupported_build=true
  -Dconsolekit=false -Dgtkdoc=true -Dintrospection=true
  -Dsystemd=false -Dplugin_altos=false -Dtests=false
  -Dpkcs7=false -Db_lto=false -Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
- -Defi-ldsdir=${XBPS_CROSS_BASE}/usr/lib -Defi-ld=${XBPS_CROSS_BASE}/usr/bin/ld
- -Defi-objcopy=${XBPS_CROSS_BASE}/usr/bin/objcopy
+ -Defi-ldsdir=${XBPS_CROSS_BASE}/usr/lib -Defi-ld=${XBPS_CROSS_BASE}/bin/ld
+ -Defi-objcopy=${XBPS_CROSS_BASE}/bin/objcopy
  -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib -Delogind=true"
 hostmakedepends="dejavu-fonts-ttf gnutls-tools help2man pkg-config gcab
- vala glib-devel polkit gettext gtk-doc"
+ vala glib-devel polkit gettext gtk-doc pango python3-gobject python3-Pillow"
 makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel
  gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel
- sqlite-devel libsoup-devel gcab-devel pango-devel python3-gobject
- python3-Pillow elogind-devel tpm2-tss-devel libjcat-devel
- libcurl-devel"
+ sqlite-devel libsoup-devel gcab-devel pango-devel elogind-devel
+ tpm2-tss-devel libjcat-devel libcurl-devel"
 depends="udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -32,24 +31,30 @@ checksum=bc7a1eb5e494810e2622442c2942b1a06d926c906db3b2612c3e8c892806ff56
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*|arm*|aarch64*) _have_uefi=yes;;
+	x86_64*|i686*)
+		_have_uefi=yes
+		_plugin_msr=yes
+		_plugin_dell=yes
+		;;
+	arm*|aarch64*)
+		_have_uefi=yes;;
 esac
 
-case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*) ;;
-	*) configure_args+=" -Dplugin_msr=false";;
-esac
+if [ -z "$_plugin_msr" ]; then
+	configure_args+=" -Dplugin_msr=false"
+fi
+
+if [ "$_plugin_dell" ]; then
+	makedepends+=" libsmbios-devel"
+else
+	configure_args+=" -Dplugin_dell=false"
+fi
 
 if [ -n "$_have_uefi" ]; then
 	hostmakedepends+=" efivar"
 	makedepends+=" libefivar-devel gnu-efi-libs"
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*) makedepends+=" libsmbios-devel";;
-		*) configure_args+=" -Dplugin_dell=false";;
-	esac
 else
 	configure_args+=" -Dplugin_uefi=false -Dplugin_redfish=false"
-	configure_args+=" -Dplugin_dell=false"
 fi
 
 if [ "$CROSS_BUILD" ]; then
@@ -58,15 +63,8 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -Dman=false"
 	# steal man pages from native package
 	hostmakedepends+=" fwupd"
-else
-	configure_args+=" -Dman=true"
 fi
 
-pre_configure() {
-	# Replace the values from our patch into the system itself
-	vsed -i -e "s|@XBPS_CROSS_BASE@|${XBPS_CROSS_BASE}|g" meson.build
-}
-
 post_install() {
 	if [ "$CROSS_BUILD" ]; then
 		for _page in dbxtool dfu-tool fwupdagent fwupdate fwupdmgr fwupdtool fwupdtpmevlog

From 233ddb571665583d3f01c74716dfe40c8ea93d5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 23 Jan 2021 14:38:41 +0700
Subject: [PATCH 0349/3482] subfinder: build with go.mod

Otherwise, ftbfs.
---
 srcpkgs/subfinder/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/subfinder/template b/srcpkgs/subfinder/template
index 16d3b947c13d..029dcdd93b5b 100644
--- a/srcpkgs/subfinder/template
+++ b/srcpkgs/subfinder/template
@@ -1,11 +1,11 @@
 # Template file for 'subfinder'
 pkgname=subfinder
 version=2.4.5
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/projectdiscovery/subfinder"
-go_package="${go_import_path}/v2/cmd/subfinder"
-hostmakedepends="git"
+build_wrksrc=v2
+go_import_path="github.com/projectdiscovery/subfinder/v2"
+go_package="./cmd/subfinder"
 short_desc="Passive subdomain discovery tool"
 maintainer="w. fnintr <wfnintr@null.net>"
 license="MIT"
@@ -14,5 +14,5 @@ distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=1adbd9c180f7ca6378796748491e23a808e423268bc61fe63af0206877f0ba68
 
 post_install() {
-	vlicense LICENSE.md
+	vlicense ../LICENSE.md
 }

From 3950e6d483b4553c97807360b8ddff3a1b7cdf8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 23 Jan 2021 17:41:12 +0700
Subject: [PATCH 0350/3482] gopls: update to 0.6.4.

---
 srcpkgs/gopls/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 8550ce7c3720..e5da40e5b503 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,17 +1,16 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.5.2
+version=0.6.4
 revision=1
 wrksrc=tools-gopls-v${version}
 build_style=go
 go_import_path=golang.org/x/tools/gopls
-hostmakedepends="git"
 short_desc="Official language server for the Go language"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=7a0f7a3147a804df04f86d4d6efd6112f33f18bb469487005c713cc976cead6e
+checksum=4e90f083d3659a0640538e3e4b047b8474de5c9a69525e535b840281734fc3a5
 
 post_install() {
 	vlicense LICENSE

From 63ef37a49429603242e0c16866ef387015a44bd7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Jan 2021 12:26:19 +0100
Subject: [PATCH 0351/3482] parallel: update to 20210122.

---
 srcpkgs/parallel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index 957751a502b1..2d7cee4615c0 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20201222
+version=20210122
 revision=1
 build_style=gnu-configure
 depends="perl"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/parallel/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=b6e41f95ec4662177a6cd29856a00daaeebac67826dd17768c0c085fb7787d8e
+checksum=b4f1b6d3de4aea71f7c763ae6ba80d5e499c12869b00b66904778546cdc7b3f3
 
 pre_configure() {
 	# no html and pdf doc

From 621eda8df4edb54aa3bfeec465e7566b390759bf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Jan 2021 12:28:02 +0100
Subject: [PATCH 0352/3482] perl-Net-SSLeay: update to 1.90.

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 7a3280b7f675..1033a5ac930e 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
-version=1.88
-revision=5
+version=1.90
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl libressl"
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-2.0"
 homepage="https://metacpan.org/release/Net-SSLeay"
 distfiles="${CPAN_SITE}/Net/${pkgname/perl-/}-$version.tar.gz"
-checksum=2000da483c8471a0b61e06959e92a6fca7b9e40586d5c828de977d3d2081cfdd
+checksum=f8696cfaca98234679efeedc288a9398fcf77176f1f515dbc589ada7c650dc93

From e8578238f5f8d140710dc5ed8ef9d75d78ed92e2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Jan 2021 12:28:52 +0100
Subject: [PATCH 0353/3482] python3-ropgadget: update to 6.5.

---
 srcpkgs/python3-ropgadget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ropgadget/template b/srcpkgs/python3-ropgadget/template
index 21e9c31d2dfc..ab8e6bbc455d 100644
--- a/srcpkgs/python3-ropgadget/template
+++ b/srcpkgs/python3-ropgadget/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ropgadget'
 pkgname=python3-ropgadget
-version=6.4
+version=6.5
 revision=1
 wrksrc="ROPGadget-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/JonathanSalwan/ROPgadget"
 distfiles="${PYPI_SITE}/R/ROPGadget/ROPGadget-${version}.tar.gz"
-checksum=51d7cbdf51ac8b3f3f00bc0d4ae44433ef58d3bf5495efb316ec918654f1e6c3
+checksum=4c0e56f2ba0aef13b2c8ca286aad663525b92020b11bacd16791f5236247905c

From de1dd6b80f624a885dc7d2a41cff556928745500 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Jan 2021 12:28:58 +0100
Subject: [PATCH 0354/3482] python3-boto3: update to 1.16.58.

---
 srcpkgs/python3-boto3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index b3a17ca435b7..d14270addb8f 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.16.54
+version=1.16.58
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=29b031327dcd60cbb2eabe704ee7e4f0184513b85645057241fc0af16acae412
+checksum=dd813463f50c969c367282ad8857ba6acaf15ce35edda383da643d00907cebfb
 
 post_install() {
 	vlicense LICENSE

From 2aab0ea3a7b727b5780e12f4ec52f1f10cd8880e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Jan 2021 12:35:17 +0100
Subject: [PATCH 0355/3482] stress-ng: update to 0.12.02.

---
 srcpkgs/stress-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index fc160fe062bc..010b901b2e4a 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.01
+version=0.12.02
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=d354bbbb1500cfe043c761014dc9c3f62779747fafea8a19af94402327f6d3fc
+checksum=f847be115f60d3ad7d37c806fd1bfb1412aa3c631fca581d6dc233322f50d6a5

From 73c46e8b96ec83ac87b403bf91f0b6dc8437116b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Jan 2021 12:45:42 +0100
Subject: [PATCH 0356/3482] s-nail: update to 14.9.21.

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 9c33af58b661..6c2c55085aa9 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,6 +1,6 @@
 # Template file for 's-nail'
 pkgname=s-nail
-version=14.9.20
+version=14.9.21
 revision=1
 build_helper="qemu"
 hostmakedepends="perl"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-4-Clause, BSD-3-Clause, BSD-2-Clause, ISC"
 homepage="https://git.sdaoden.eu/cgit/s-nail.git"
 distfiles="https://www.sdaoden.eu/downloads/s-nail-${version}.tar.xz"
-checksum=06aa2418d0b9dead568efb589c3da2e36e0da017c285260db5a2efa8a999e4ea
+checksum=bf21d72531f85b8882c5a583ce96c901104ce0102a287c7ad680ef068c2ceafd
 
 provides="mail-${version}_${revision}"
 

From 1b9128bf3abbf5ce479c28cc2a55fc264bd9bec2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Jan 2021 14:43:47 +0100
Subject: [PATCH 0357/3482] perl-Path-Tiny: update to 0.116.

---
 srcpkgs/perl-Path-Tiny/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Path-Tiny/template b/srcpkgs/perl-Path-Tiny/template
index d29f6ae3d0ee..9de37780962e 100644
--- a/srcpkgs/perl-Path-Tiny/template
+++ b/srcpkgs/perl-Path-Tiny/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Path-Tiny'
 pkgname=perl-Path-Tiny
-version=0.114
-revision=2
+version=0.116
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Path-Tiny"
 distfiles="${CPAN_SITE}/Object/DAGOLDEN/Path-Tiny-${version}.tar.gz"
-checksum=cd0f88f37a58fc3667ec065767fe01e73ee6efa18a112bfd3508cf6579ca00e1
+checksum=0379108b2aee556f877760711e03ce8775a98859cdd03cb94aaf4738a37a62d3

From 3724eb6617f6c650a0acd4b21cb9097777159eba Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Jan 2021 14:45:36 +0100
Subject: [PATCH 0358/3482] pinentry: update to 1.1.1.

---
 srcpkgs/pinentry/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pinentry/template b/srcpkgs/pinentry/template
index edee8e78cbd9..c14de641495c 100644
--- a/srcpkgs/pinentry/template
+++ b/srcpkgs/pinentry/template
@@ -2,8 +2,8 @@
 # NOTE: keep this pkg synchronized with srcpkgs/pinentry-gtk.
 # NOTE: it's splitted this way to avoid cyclic dependencies.
 pkgname=pinentry
-version=1.1.0
-revision=6
+version=1.1.1
+revision=1
 build_style=gnu-configure
 configure_args="--without-libcap --enable-pinentry-tty
  --enable-pinentry-curses --enable-fallback-curses
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.gnupg.org/related_software/pinentry/index.html"
 distfiles="https://gnupg.org/ftp/gcrypt/pinentry/pinentry-${version}.tar.bz2"
-checksum=68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570
+checksum=cd12a064013ed18e2ee8475e669b9f58db1b225a0144debdb85a68cecddba57f
 
 alternatives="pinentry:pinentry:/usr/bin/pinentry-curses"
 

From 0bc4eb8e7c3c58effe3401f743da1e3e9fc511df Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Jan 2021 14:45:37 +0100
Subject: [PATCH 0359/3482] pinentry-gtk: update to 1.1.1.

---
 srcpkgs/pinentry-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pinentry-gtk/template b/srcpkgs/pinentry-gtk/template
index 8d0897cc112b..7f30fecf7eaa 100644
--- a/srcpkgs/pinentry-gtk/template
+++ b/srcpkgs/pinentry-gtk/template
@@ -4,8 +4,8 @@
 _desc="PIN or passphrase entry dialogs for GnuPG"
 
 pkgname=pinentry-gtk
-version=1.1.0
-revision=6
+version=1.1.1
+revision=1
 wrksrc="pinentry-${version}"
 build_style=gnu-configure
 configure_args="--without-libcap --enable-fallback-curses
@@ -21,7 +21,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.gnupg.org/related_software/pinentry/index.html"
 distfiles="https://gnupg.org/ftp/gcrypt/pinentry/pinentry-${version}.tar.bz2"
-checksum=68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570
+checksum=cd12a064013ed18e2ee8475e669b9f58db1b225a0144debdb85a68cecddba57f
 
 alternatives="pinentry:pinentry:/usr/bin/pinentry-gtk-2"
 

From 5927adc2fc9924b41c5eb196bfc1c919f2f391bc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Jan 2021 14:46:19 +0100
Subject: [PATCH 0360/3482] python3-pyinfra: update to 1.3.4.

---
 srcpkgs/python3-pyinfra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 5eb2c77c2c0e..953ef3823515 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.3.3
-revision=2
+version=1.3.4
+revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=f6a7575f0f5ad337f988916296ee5b756f2be4ac24d047b5a6130d71b2acc8c1
+checksum=c33f1c4e716fc0aba7d49f36467c5983e37e9d02ad94c3036ba07d8c61fab5c3
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 0f2b654b9aa9a881da732282dfe99f084c9b63a5 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Sat, 23 Jan 2021 13:38:47 +0100
Subject: [PATCH 0361/3482] mkvtoolnix: update to 52.0.0

---
 srcpkgs/mkvtoolnix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 762931af923a..0e0948a8f03d 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=51.0.0
+version=52.0.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -16,7 +16,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=c17aa010a13c943b1347c5a20f7f6e05337a7d90317f525345813bcbcdcf4c70
+checksum=ba48b036f9cd30dcbc98835bc938e316d1d8c8e0c57270e8b49469172954c797
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From c741abfc62351baa30d6d69437ca29b4e797a3e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 23 Jan 2021 15:46:59 +0100
Subject: [PATCH 0362/3482] libtorrent-rasterbar: ignore 2.*

---
 srcpkgs/libtorrent-rasterbar/update | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/libtorrent-rasterbar/update b/srcpkgs/libtorrent-rasterbar/update
index 1e40d58c7c34..db300c9b2742 100644
--- a/srcpkgs/libtorrent-rasterbar/update
+++ b/srcpkgs/libtorrent-rasterbar/update
@@ -1,2 +1,3 @@
 site='https://github.com/arvidn/libtorrent/releases'
 pattern='libtorrent-rasterbar-\K[\d\.]+(?=\.tar\.gz")'
+ignore="2.*"

From 4713aed3b7de65af5d797142ff90d382e1f7389c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 23 Jan 2021 15:53:22 +0100
Subject: [PATCH 0363/3482] Z80Explorer: update to 1.0.2

---
 srcpkgs/Z80Explorer/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/Z80Explorer/template b/srcpkgs/Z80Explorer/template
index 4125581ad611..1c7c52d8fbca 100644
--- a/srcpkgs/Z80Explorer/template
+++ b/srcpkgs/Z80Explorer/template
@@ -1,8 +1,8 @@
 # Template file for 'Z80Explorer'
 pkgname=Z80Explorer
-version=1.01
+version=1.02
 revision=1
-_z80_githash=f3d04cfb36018f1969428cb820af0f50683238e1
+_z80_githash=6abf07adb65fcb2343f74c7a014cd6421a7dad5d
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools p7zip"
 makedepends="qt5-devel qt5-script-devel"
@@ -12,8 +12,8 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/gdevic/Z80Explorer"
 distfiles="https://github.com/gdevic/Z80Explorer/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz
  https://github.com/gdevic/Z80Explorer_Z80/archive/${_z80_githash}.tar.gz>${pkgname}_Z80-${version}.tar.gz"
-checksum="866051047db4bbfb8740245fe55811f443d12ab406b306b36d9d9d102b4d79d8
- f05f9cb128ef14b51fa0f782aa75cc2537c30aa90f64d5f97bbdbd41a815bf87"
+checksum="8140eaeff215e49df2c0abb7c10f84c4c721adaced6a756d30e584348078b29b
+ f6980e5bf3cadcc050d70a359fae7813d3d3b1805935a57dea564caed67b3192"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" ${makedepends}"

From 2e6e0d6e800281fb9aada34e0838ac7dcfd525f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 23 Jan 2021 10:59:34 -0500
Subject: [PATCH 0364/3482] base-files: Restore mdns ordering in nsswitch.conf

Placing mdns after dns in the host database resolution can cause
unintuitive failures for users without nss-mdns or mDNSResponder. When
looking up an invalid host, having order "dns mdns" will cause a dns
"notfound" result to fall through to mdns, which will yield
"unavailable" for users without an mdns provider. This causes clients
like ssh to report "Device or resource busy" rather than a more
meaningful message to indicate that the hostname is not valid. Flipping
back to order "mdns dns" will case an "unavailable" mdns result to fall
through to dns, which then returns "notfound" that clients interpret as
expected.

Because both mDNSResponder and nss-mdns offer a generic mdns provider.
The mdns4 and mdns4_minimal providers offered by nss-mdns are subsets of
the generic mdns provider, so there is no value in restoring the
original "mdns mdns4_minimal mdns4" ordering (in fact, this may have
caused failed mdns lookups to be repeated three times). All have been
coalesced into the single mdns provider.

This (partially) reverts commit cc11e17fab0d514f75a01aa79e44edb06f16bffe.
---
 srcpkgs/base-files/files/nsswitch.conf | 2 +-
 srcpkgs/base-files/template            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/base-files/files/nsswitch.conf b/srcpkgs/base-files/files/nsswitch.conf
index be1d1e00f5c1..f0355d90be4a 100644
--- a/srcpkgs/base-files/files/nsswitch.conf
+++ b/srcpkgs/base-files/files/nsswitch.conf
@@ -6,7 +6,7 @@ passwd: 	files
 group: 		files
 shadow: 	files
 
-hosts: 		files mdns_minimal [NOTFOUND=return] dns mdns
+hosts: 		files mdns dns
 networks: 	files
 
 protocols: 	files
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index fff3ca5afbdd..8040a801110c 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.141
-revision=6
+revision=7
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"

From b92ed08ed701b834b3f528f8c63a2fb2a31195b7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Jan 2021 17:27:18 +0100
Subject: [PATCH 0365/3482] linux5.10: update to 5.10.10.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 189e7c87c9d5..f7dd7929610a 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.9
+version=5.10.10
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=7f733e0dd8bbb6929aae2191cf6b9dc0b0ec1dad77ab3f5d3aad1b7fe96c4751
+checksum=60ed866fa951522a5255ea37ec3ac2006d3f3427d4783a13ef478464f37cdb19
 python_version=3
 patch_args="-Np1"
 

From f82d60ad8052e5c53950221b464006a9334c6232 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 22 Jan 2021 22:52:17 +0200
Subject: [PATCH 0366/3482] notcurses: update to 2.1.7.

---
 common/shlibs              | 1 +
 srcpkgs/notcurses/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 670be76ec65a..8c6b5d9d0149 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3984,6 +3984,7 @@ libbson-1.0.so.0 libbson-1.17.0_1
 libsonic.so.0 libsonic-0.2.0_1
 libtickit.so.3 libtickit-0.4.1_1
 libnotcurses.so.2 notcurses-2.0.4_1
+libnotcurses-core.so.2 notcurses-2.1.7_1
 libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 3afd8383196b..09da539f5c44 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.1.5
+version=2.1.7
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=22ebd54880031e810829c9bdfaa5668b8e3236151d2818224947fb30ed349615
+checksum=f6be3cf9654f2a9ccb30ed89aacf248f4edcf5a3c61d2353560e161166fc2d35
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From 211bcc815b1b4ca7d70f1ca9e3bdad31d297dd01 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 23 Jan 2021 17:20:41 +0200
Subject: [PATCH 0367/3482] README.md: add -musl to the xbps-static-latest
 filename.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ec8cfabf83a8..17111d471b77 100644
--- a/README.md
+++ b/README.md
@@ -418,7 +418,7 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
 
     $ wget http://alpha.de.repo.voidlinux.org/static/xbps-static-latest.<arch>-musl.tar.xz
     $ mkdir ~/XBPS
-    $ tar xvf xbps-static-latest.<arch>.tar.xz -C ~/XBPS
+    $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
 If your system does not support `user namespaces`, a privileged group is required to be able to use

From 50e1ae577f53732c7c9e3871440a802201623abc Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@ae-design.ws>
Date: Fri, 22 Jan 2021 14:11:24 +0100
Subject: [PATCH 0368/3482] webkit2gtk: build with enchant2 instead of enchant

---
 srcpkgs/webkit2gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 2259ad80b172..8b617cb39723 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
 version=2.30.4
-revision=2
+revision=3
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -28,7 +28,7 @@ hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
  geoclue2 libharfbuzz $(vopt_if wayland wayland-devel)"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
- libsoup-devel libxslt-devel gnutls-devel icu-devel enchant-devel
+ libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
  dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel

From 83c834a56cf11505a4e4bbe0a2c2331ce3f0068b Mon Sep 17 00:00:00 2001
From: Bleznudd <bleznudd@pm.me>
Date: Wed, 13 Jan 2021 16:20:33 +0100
Subject: [PATCH 0369/3482] setzer: update to 0.3.9.

---
 srcpkgs/setzer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/setzer/template b/srcpkgs/setzer/template
index 3d45b9be3d05..df80eaee0111 100644
--- a/srcpkgs/setzer/template
+++ b/srcpkgs/setzer/template
@@ -1,14 +1,14 @@
 # Template file for 'setzer'
 pkgname=setzer
-version=0.3.7
+version=0.3.9
 revision=1
 wrksrc=Setzer-${version}
 build_style=meson
 hostmakedepends="gettext"
-depends="poppler-glib virtual?tex gspell python3-xdg python3-gobject gtksourceview4"
+depends="poppler-glib virtual?tex gspell python3-xdg python3-gobject gtksourceview4 python3-PyPDF2"
 short_desc="Simple yet full-featured LaTeX editor written in Python with Gtk"
 maintainer="Bleznudd <bleznudd@pm.me>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/cvfosammmm/setzer"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=04675ecb73d9fdad875665756d80587e72e06c03d85f358232e6dd1e3487b42d
+checksum=abddd4b85f41a84fc0ce18377cf955df8f9a10e0350133692e187f74f0828dad

From 5030cf5d412e383e7673a064c77c658e9fbbed81 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Sat, 23 Jan 2021 11:28:23 -0700
Subject: [PATCH 0370/3482] mu: update to 1.4.15

---
 srcpkgs/mu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
index 30b8b446ae2d..9a6f1e8badaf 100644
--- a/srcpkgs/mu/template
+++ b/srcpkgs/mu/template
@@ -1,6 +1,6 @@
 # Template file for 'mu'
 pkgname=mu
-version=1.4.14
+version=1.4.15
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config texinfo glib-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamin Slade <slade@jnanam.net>"
 license="GPL-3.0-or-later"
 homepage="https://www.djcbsoftware.nl/code/mu/"
 distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=df6410dbe4cbe74f1495a996a558e1429f83f1aaf1588f5cb8df73a9baff60ba
+checksum=f7524e17de09470d1369bc1b3959b1f8ac1286eff2d442db33f8355726f8342a
 
 if [ ! "$CROSS_BUILD" ]; then
 	hostmakedepends+=" emacs"

From fdc87c604c05b472968bf797f96e270a39b904ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 23 Jan 2021 22:17:00 +0100
Subject: [PATCH 0371/3482] ratpoison: needs texinfo to fix ftbfs

---
 srcpkgs/ratpoison/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ratpoison/template b/srcpkgs/ratpoison/template
index dc32b90a8845..8e58489a2421 100644
--- a/srcpkgs/ratpoison/template
+++ b/srcpkgs/ratpoison/template
@@ -3,7 +3,7 @@ pkgname=ratpoison
 version=1.4.9
 revision=1
 build_style=gnu-configure
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config texinfo"
 makedepends="libICE-devel libXft-devel libXinerama-devel libXrandr-devel
  libXtst-devel readline-devel"
 depends="perl"

From 2c812ece5e6cb75e34c2bb85c9efc71fc4d56767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 23 Jan 2021 22:39:15 +0100
Subject: [PATCH 0372/3482] p8-platform: fix buld; xlint

---
 srcpkgs/p8-platform/template | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/p8-platform/template b/srcpkgs/p8-platform/template
index a14ff56caa9b..55c844853c5f 100644
--- a/srcpkgs/p8-platform/template
+++ b/srcpkgs/p8-platform/template
@@ -2,23 +2,19 @@
 pkgname=p8-platform
 version=2.1.0.1
 revision=3
+wrksrc="platform-${pkgname}-${version}"
 build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=1"
 short_desc="Platform support library used by libCEC (Pulse Eight Edition)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/Pulse-Eight/platform"
 distfiles="https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz"
 checksum=064f8d2c358895c7e0bea9ae956f8d46f3f057772cb97f2743a11d478a0f68a0
-configure_args+=" -DBUILD_SHARED_LIBS=1"
-wrksrc="platform-${pkgname}-${version}"
 
-post_install() {
-	vmkdir usr/lib
-	if [ -d $DESTDIR/usr/lib64 ]; then
-		mv $DESTDIR/usr/lib64/* $DESTDIR/usr/lib
-	fi
-	mv $DESTDIR/$wrksrc/build/lib*/* $DESTDIR/usr/lib
-	sed -i "s#$wrksrc/build/##" $DESTDIR/usr/lib/p8-platform/p8-platform-config.cmake $DESTDIR/usr/lib/pkgconfig/p8-platform.pc
+pre_configure() {
+	vsed -i CMakeLists.txt \
+		-e 's;DESTINATION ${CMAKE_INSTALL_LIBDIR};DESTINATION lib;'
 }
 
 p8-platform-devel_package() {

From 3bd8f6ae80118b39190d2f47bc9a18759e33bdb5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 22 Jan 2021 22:31:33 +0200
Subject: [PATCH 0373/3482] libktorrent: update to 20.12.1.

---
 srcpkgs/libktorrent/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libktorrent/template b/srcpkgs/libktorrent/template
index 4bfa0e7a6734..b72b5b90a6f4 100644
--- a/srcpkgs/libktorrent/template
+++ b/srcpkgs/libktorrent/template
@@ -1,22 +1,26 @@
 # Template file for 'libktorrent'
 pkgname=libktorrent
-version=2.2.0
+version=20.12.1
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake python doxygen"
+hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake python3 doxygen"
 makedepends="qt5-devel karchive-devel ksolid-devel kio-devel ki18n-devel
 	kcrash-devel gmp-devel qca-qt5-devel"
 short_desc="BitTorrent protocol implementation"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://ktorrent.pwsp.net"
-distfiles="https://github.com/KDE/libktorrent/archive/v${version}.tar.gz"
-checksum=c6f684611f1af6805b7e8caf022288cf6751df6da05ba261013435846b5de006
+homepage="https://apps.kde.org/en/ktorrent"
+distfiles="${KDE_SITE}/release-service/${version}/src/libktorrent-${version}.tar.xz"
+checksum=bbaa68598993cf83e21d036b53b901efa190ea5e49b394ccc23f3e62c0caaca2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
 fi
 
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}
+
 libktorrent-devel_package() {
 	depends="${sourcepkg}-${version}_${revision} gmp-devel"
 	pkg_install() {

From d6b9b7400e785bfaba08228a40783892d96ec0fd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 22 Jan 2021 22:31:38 +0200
Subject: [PATCH 0374/3482] ktorrent: update to 20.12.1.

---
 srcpkgs/ktorrent/files/README.voidlinux |  2 ++
 srcpkgs/ktorrent/template               | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/ktorrent/files/README.voidlinux

diff --git a/srcpkgs/ktorrent/files/README.voidlinux b/srcpkgs/ktorrent/files/README.voidlinux
new file mode 100644
index 000000000000..6a810ee912d2
--- /dev/null
+++ b/srcpkgs/ktorrent/files/README.voidlinux
@@ -0,0 +1,2 @@
+ktorrent needs geoip data in the legacy format to show some information.
+The data can be fetched with the geoipupdate utility.
diff --git a/srcpkgs/ktorrent/template b/srcpkgs/ktorrent/template
index 77209881a1cb..b448b8a4fe21 100644
--- a/srcpkgs/ktorrent/template
+++ b/srcpkgs/ktorrent/template
@@ -1,20 +1,21 @@
 # Template file for 'ktorrent'
 pkgname=ktorrent
-version=5.2.0
+version=20.12.1
 revision=1
 build_style=cmake
+configure_args="-DWITH_SYSTEM_GEOIP=ON"
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake gettext"
 makedepends="qt5-devel qt5-script-devel ki18n-devel kio-devel kxmlgui-devel
  knotifications-devel ksolid-devel kconfig-devel kcoreaddons-devel kdoctools-devel
  kross-devel kcmutils-devel sonnet-devel kdbusaddons-devel kcrash-devel
  karchive-devel knotifyconfig-devel libktorrent-devel kplotting-devel
- gmp-devel taglib-devel kdnssd-devel kdewebkit-devel"
+ gmp-devel taglib-devel kdnssd-devel kdewebkit-devel geoip-devel syndication-devel"
 short_desc="BitTorrent client based on the KDE platform"
 maintainer="Norbert Vegh <vegh@norvegh.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/internet/ktorrent"
-distfiles="${KDE_SITE}/ktorrent/${version}/ktorrent-${version}.tar.xz"
-checksum=d1031d745c1ace02d11b59c426610aee779d208e3d1ae81f8559c265173732ff
+distfiles="${KDE_SITE}/release-service/${version}/src/ktorrent-${version}.tar.xz"
+checksum=8c5f52d9b4597c117c0ed189c2ada3b9716bc0d5ceb53fde66f6a009bee68354
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -25,3 +26,11 @@ pre_configure() {
 	# The ECM FindTaglib.cmake gives different variable names
 	grep -rl TAGLIB_ | xargs -n1 sed -i -e "s;TAGLIB_;Taglib_;g"
 }
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}
+
+post_install() {
+	vdoc "${FILESDIR}/README.voidlinux"
+}

From d59a755c2a8c38cbfe1394859ad91ad01bec56eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 19 Jan 2021 23:55:22 +0100
Subject: [PATCH 0375/3482] electron10: update to 10.3.0.

---
 .../files/patches/chromium-time64.patch       | 51 +++++++++++++++++++
 srcpkgs/electron10/template                   |  4 +-
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/electron10/files/patches/chromium-time64.patch

diff --git a/srcpkgs/electron10/files/patches/chromium-time64.patch b/srcpkgs/electron10/files/patches/chromium-time64.patch
new file mode 100644
index 000000000000..0330ce057f41
--- /dev/null
+++ b/srcpkgs/electron10/files/patches/chromium-time64.patch
@@ -0,0 +1,51 @@
+Description: allow sandboxed code to call gettime64
+ Add __NR_clock_gettime64 and __NR_clock_nanosleep_time64 to syscall whitelist
+ and clock selection parameter filtering code.
+
+ Add __NR_utimensat_time64 to syscall whitelist
+
+ Conditionalise additions on the new calls existing, because they do not exist
+ on 64-bit architectures.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+===================================================================
+--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -148,7 +148,11 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return Allow();
+ #endif
+ 
++#ifdef __NR_clock_gettime64
++  if (sysno == __NR_clock_gettime || sysno == __NR_clock_gettime64 || sysno == __NR_clock_nanosleep || sysno == __NR_clock_nanosleep_time64) {
++#else
+   if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) {
++#endif
+     return RestrictClockID();
+   }
+ 
+Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+===================================================================
+--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -38,6 +38,10 @@ bool SyscallSets::IsAllowedGettime(int s
+     case __NR_clock_getres:     // Allowed only on Android with parameters
+                                 // filtered by RestrictClokID().
+     case __NR_clock_gettime:    // Parameters filtered by RestrictClockID().
++#ifdef __NR_clock_gettime64
++    case __NR_clock_gettime64:    // Parameters filtered by RestrictClockID().
++    case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
++#endif
+     case __NR_clock_nanosleep:  // Parameters filtered by RestrictClockID().
+     case __NR_clock_settime:    // Privileged.
+ #if defined(__i386__) || \
+@@ -159,6 +163,9 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
++#ifdef __NR_utimensat_time64
++    case __NR_utimensat_time64:
++#endif
+       return true;
+     default:
+       return false;
diff --git a/srcpkgs/electron10/template b/srcpkgs/electron10/template
index 26d6309c819b..e529c6341ffe 100644
--- a/srcpkgs/electron10/template
+++ b/srcpkgs/electron10/template
@@ -1,6 +1,6 @@
 # Template file for 'electron10'
 pkgname=electron10
-version=10.2.0
+version=10.3.0
 _nodever=12.16.3
 _chromiumver=85.0.4183.121
 revision=1
@@ -30,7 +30,7 @@ homepage="https://electronjs.org"
 distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz
  https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz
  https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz"
-checksum="e1de6c43215594936af7b8f40f383e28069a8e4666bae1e447491353a506c6d4
+checksum="2938b0fd433d2a3f89eecaf3d28ecfec333ab15da84ae2e0a0db70cc3b047d75
  e018547e54566410fb365d9f3dae10037c30fca5debe6ba8baceef3ad3b03d28
  dcd0a1e619ff326399ca8fd87f61c255f4d1e9bff47860064993f01e4ff37fe1"
 

From f245d61490a1087e8b2aabefe6f7ab0cd6b5ce93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 12:02:03 +0700
Subject: [PATCH 0376/3482] 0ad: fix build for gcc-10

---
 srcpkgs/0ad/patches/build-fcollada-once.patch | 23 ++++++++++
 srcpkgs/0ad/patches/template-misuse.patch     | 43 +++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 srcpkgs/0ad/patches/build-fcollada-once.patch
 create mode 100644 srcpkgs/0ad/patches/template-misuse.patch

diff --git a/srcpkgs/0ad/patches/build-fcollada-once.patch b/srcpkgs/0ad/patches/build-fcollada-once.patch
new file mode 100644
index 000000000000..f65fdcf7d81e
--- /dev/null
+++ b/srcpkgs/0ad/patches/build-fcollada-once.patch
@@ -0,0 +1,23 @@
+Index: libraries/source/fcollada/src/Makefile
+===================================================================
+--- libraries/source/fcollada/src/Makefile.orig
++++ libraries/source/fcollada/src/Makefile
+@@ -224,7 +224,7 @@ OBJECTS_RELEASE = $(addprefix output/rel
+ OBJECTS_TEST = $(addprefix output/test/,$(SOURCE:.cpp=.o) $(TEST_SOURCE:.cpp=.o))
+ OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OBJECTS_TEST)
+ 
+-all: output/libFColladaSD.a output/libFColladaSR.a install
++all: output/libFColladaSR.a install
+ 
+ output_dirs:
+ 	bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}'
+@@ -244,8 +244,7 @@ output/libFColladaSR.a: $(OBJECTS_RELEAS
+ output/FColladaTest: $(OBJECTS_TEST) | output_dirs
+ 	$(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS)
+ 
+-install: output/libFColladaSD.a output/libFColladaSR.a
+-	cp output/libFColladaSD.a ../lib/libFColladaSD.a
++install: output/libFColladaSR.a
+ 	cp output/libFColladaSR.a ../lib/libFColladaSR.a
+ 
+ dfile = $(@:.o=.d)
diff --git a/srcpkgs/0ad/patches/template-misuse.patch b/srcpkgs/0ad/patches/template-misuse.patch
new file mode 100644
index 000000000000..7ae376ff1fed
--- /dev/null
+++ b/srcpkgs/0ad/patches/template-misuse.patch
@@ -0,0 +1,43 @@
+Index: libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp
+===================================================================
+--- libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp.orig
++++ libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp
+@@ -329,16 +329,3 @@ void FArchiveXML::WritePhysicsRigidBodyP
+ 		FArchiveXML::LetWriteObject(physicsRigidBodyParameters->GetPhysicsShape(i), techniqueNode);
+ 	}
+ }
+-
+-template <class TYPE, int QUAL>
+-xmlNode* FArchiveXML::AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT<TYPE,QUAL>& value)
+-{
+-	xmlNode* paramNode = AddChild(parentNode, name);
+-	AddContent(paramNode, FUStringConversion::ToString((TYPE&) value));
+-	if (value.IsAnimated())
+-	{
+-		const FCDAnimated* animated = value.GetAnimated();
+-		FArchiveXML::WriteAnimatedValue(animated, paramNode, name);
+-	}
+-	return paramNode;
+-}
+Index: libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h
+===================================================================
+--- libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h.orig
++++ libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h
+@@ -573,4 +573,17 @@ public:
+ 	static xmlNode* WriteLibrary(FCDLibrary<T>* library, xmlNode* node);
+ };
+ 
++template <class TYPE, int QUAL>
++xmlNode* FArchiveXML::AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT<TYPE,QUAL>& value)
++{
++	xmlNode* paramNode = AddChild(parentNode, name);
++	AddContent(paramNode, FUStringConversion::ToString((TYPE&) value));
++	if (value.IsAnimated())
++	{
++		const FCDAnimated* animated = value.GetAnimated();
++		FArchiveXML::WriteAnimatedValue(animated, paramNode, name);
++	}
++	return paramNode;
++}
++
+ #endif //_FCPARCHIVECOLLADA_H_

From 62444a29c5656ab2c2aa67489c35aeb28e63e37b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 12:20:16 +0700
Subject: [PATCH 0377/3482] python3-pyscard: depend on libpcsclite

---
 srcpkgs/python3-pyscard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index e8cf1f049548..4046fa5055e1 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -2,12 +2,12 @@
 pkgname=python3-pyscard
 _pkgname=pyscard
 version=2.0.0
-revision=2
+revision=3
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
 makedepends="python3-devel pcsclite-devel"
-depends="python3 pcsclite"
+depends="python3 pcsclite libpcsclite"
 short_desc="Python library for smartcard"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"

From 90c1aa78299d2d4251184d52e53d5c7360cf8e61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 12:25:26 +0700
Subject: [PATCH 0378/3482] python3-fido2: fix do_check()

---
 srcpkgs/python3-fido2/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-fido2/template b/srcpkgs/python3-fido2/template
index 4cdc7f23cac7..687bd0659038 100644
--- a/srcpkgs/python3-fido2/template
+++ b/srcpkgs/python3-fido2/template
@@ -8,7 +8,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-six python3-cryptography python3-pyscard"
 # Missing fakefs will be pulled from pypi
-checkdepends="$depends python3-mock"
+checkdepends="$depends python3-mock python3-pytest"
 short_desc="Library for FIDO2 functionality"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-2-Clause"
@@ -16,6 +16,11 @@ homepage="https://github.com/Yubico/python-fido2"
 distfiles="${PYPI_SITE}/f/${_pkgname}/${_pkgname}-${version}.tar.gz"
 checksum=468f8657cc5b8b149e38a1735fbf5cd65e01a340a11a585caf4e6bade8c4b735
 
+post_extract() {
+	# pytest mis-recognises this file as a test case
+	rm -f examples/test_config.py
+}
+
 post_install() {
 	vlicense COPYING
 }

From 41a2d85bf2b4acacda163f632aea119fab3f4c9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 12:32:37 +0700
Subject: [PATCH 0379/3482] python3-EasyProcess: fix do_check()

---
 srcpkgs/python3-EasyProcess/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/python3-EasyProcess/template b/srcpkgs/python3-EasyProcess/template
index 034df5dc09c5..51854a737d72 100644
--- a/srcpkgs/python3-EasyProcess/template
+++ b/srcpkgs/python3-EasyProcess/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-pytest python3-nose python3-PyVirtualDisplay inetutils
- xorg-server-xvfb"
+ xorg-server-xvfb python3-six"
 short_desc="Easy to use python subprocess interface"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-2-Clause"
@@ -15,10 +15,6 @@ homepage="https://github.com/ponty/easyprocess"
 distfiles="${PYPI_SITE}/E/EasyProcess/EasyProcess-${version}.tar.gz"
 checksum=fb948daac01f64c1e49750752711253614846c6fc7e5692a718a7408f2ffb984
 
-do_check() {
-	PYTHONPATH=$(pwd)/build/lib pytest
-}
-
 post_install() {
 	vlicense LICENSE.txt
 }

From b69de1cc1118ea961e86ee51d22e35f07ddf98ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 12:36:26 +0700
Subject: [PATCH 0380/3482] python3-pytest-xvfb: fix do_check()

---
 srcpkgs/python3-pytest-xvfb/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/python3-pytest-xvfb/template b/srcpkgs/python3-pytest-xvfb/template
index 0e002f07acec..e4e0503b7310 100644
--- a/srcpkgs/python3-pytest-xvfb/template
+++ b/srcpkgs/python3-pytest-xvfb/template
@@ -21,6 +21,10 @@ post_extract() {
 	cp "$XBPS_SRCDISTDIR/$pkgname-$version/LICENSE" .
 }
 
+do_check() {
+	python3 setup.py test
+}
+
 post_install() {
 	vlicense LICENSE
 }

From 2b2a8623748862b9c10f0c3221cf9a03de09f28b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 12:40:15 +0700
Subject: [PATCH 0381/3482] python3-usb: build with setuptools_scm

---
 srcpkgs/python3-usb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 5d3c1b77d1b6..8d155e15b600 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
 version=1.1.1
-revision=1
+revision=2
 wrksrc="pyusb-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 32e2827145b7fbf29a064a4957e0a55df4397eed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 23 Jan 2021 14:16:13 +0700
Subject: [PATCH 0382/3482] wrapper: valac: pass --vapidir after real arguments

Due to constant change in vala, some projects includes some old and
pre-generated vapi in their source tree and uses that version
instead of system one.

Pass system vapidir after real arguments in order to prefer its bundled
vapi.
---
 common/hooks/pre-configure/02-script-wrapper.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index 9ca195d5a580..1cbd9df63639 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -112,9 +112,10 @@ vapigen_wrapper() {
 	cat >>${XBPS_WRAPPERDIR}/vapigen<<_EOF
 #!/bin/sh
 exec /usr/bin/vapigen \\
+	 "\$@" \\
 	 --vapidir=${XBPS_CROSS_BASE}/usr/share/vala/vapi \\
 	 --vapidir=${XBPS_CROSS_BASE}/usr/share/vala-${_vala_version}/vapi \\
-	 --girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0 "\$@"
+	 --girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0
 _EOF
 	chmod 755 ${XBPS_WRAPPERDIR}/vapigen
 	ln -sf vapigen ${XBPS_WRAPPERDIR}/vapigen-${_vala_version}
@@ -134,9 +135,10 @@ valac_wrapper() {
 	cat >>${XBPS_WRAPPERDIR}/valac<<_EOF
 #!/bin/sh
 exec /usr/bin/valac \\
+	 "\$@" \\
 	 --vapidir=${XBPS_CROSS_BASE}/usr/share/vala/vapi \\
 	 --vapidir=${XBPS_CROSS_BASE}/usr/share/vala-${_vala_version}/vapi \\
-	 --girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0 "\$@"
+	 --girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0
 _EOF
 	chmod 755 ${XBPS_WRAPPERDIR}/valac
 	ln -sf valac ${XBPS_WRAPPERDIR}/valac-${_vala_version}

From 4e96edc5e3421a363fff8b6f1616fcdb409fd48e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 23 Jan 2021 14:18:24 +0700
Subject: [PATCH 0383/3482] budgie-desktop: remove vapidir hack

---
 srcpkgs/budgie-desktop/template | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 2cf2ddb51237..5f9833ca9cbf 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -19,15 +19,6 @@ homepage="https://github.com/solus-project/budgie-desktop"
 distfiles="${homepage}/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
 checksum=d7219c1dc6d0e3fe54ac33062bfd420ab94158bcfe9409d09c85d7e7a21c67fa
 
-pre_build() {
-	# budgie-desktop uses its own polkit bindings
-	# prepends to override system vapi
-	if [ -f "$XBPS_WRAPPERDIR/valac" ]; then
-		sed -i -e "s,/bin/valac,& --vapidir=$wrksrc/vapi," \
-			"$XBPS_WRAPPERDIR/valac"
-	fi
-}
-
 budgie-desktop-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"

From 418b80a0f9e8cbe5225b0daa9be16652aa258479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 23 Jan 2021 14:19:02 +0700
Subject: [PATCH 0384/3482] vala-panel-appmenu: remove vapidir hack

---
 srcpkgs/vala-panel-appmenu/template | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/srcpkgs/vala-panel-appmenu/template b/srcpkgs/vala-panel-appmenu/template
index 2b854784fe6d..198254fdf474 100644
--- a/srcpkgs/vala-panel-appmenu/template
+++ b/srcpkgs/vala-panel-appmenu/template
@@ -17,15 +17,6 @@ homepage="https://gitlab.com/vala-panel-project/vala-panel-appmenu"
 distfiles="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/$_glhash/vala-panel-appmenu-${version}.tar.xz"
 checksum=2856added014bb6e5238aacda1016e2520d9a58d4ba6d7b33b2707ea48e1c592
 
-pre_build() {
-	# vala-panel-appmenu depends on its own libxfconf-0.vapi
-	# prepends to override system vapi
-	if [ -f "$XBPS_WRAPPERDIR/valac" ]; then
-		sed -i -e "s,/bin/valac,& --vapidir=$wrksrc/vapi," \
-			"$XBPS_WRAPPERDIR/valac"
-	fi
-}
-
 appmenu-gtk-module-devel_package() {
 	short_desc="GTK module for exposing menus - development files"
 	depends="appmenu-gtk-module-${version}_${revision}

From e8014b4af1209532c3d6f81fffd857ca7bc9aa19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 17:18:19 +0700
Subject: [PATCH 0385/3482] python3-sip-PyQt5: depends on python3

---
 srcpkgs/python3-sip-PyQt5/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-sip-PyQt5/template b/srcpkgs/python3-sip-PyQt5/template
index e144a1e91f27..6ef05a2e0b1d 100644
--- a/srcpkgs/python3-sip-PyQt5/template
+++ b/srcpkgs/python3-sip-PyQt5/template
@@ -1,11 +1,12 @@
 # Template file for 'python3-sip-PyQt5'
 pkgname=python3-sip-PyQt5
 version=12.8.1
-revision=1
+revision=2
 wrksrc="PyQt5_sip-$version"
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools sip"
 makedepends="python3-devel"
+depends="python3"
 short_desc="Python 3 PyQt5 SIP bindings with C and C++"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"

From ea7fc9a0fb00dfc0fffd9957aed3f94748b71512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 17:41:07 +0700
Subject: [PATCH 0386/3482] protobuf-vala: fix cross

---
 srcpkgs/protobuf-vala/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/protobuf-vala/template b/srcpkgs/protobuf-vala/template
index cb25bc9a2091..09ed71b320fe 100644
--- a/srcpkgs/protobuf-vala/template
+++ b/srcpkgs/protobuf-vala/template
@@ -1,21 +1,27 @@
 # Template file for 'protobuf-vala'
 pkgname=protobuf-vala
 version=0.1.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="protobuf"
-makedepends="pkg-config libgee08-devel protobuf-devel vala-devel"
+hostmakedepends="protobuf pkg-config vala"
+makedepends="libgee08-devel protobuf-devel vala-devel"
 depends="pkg-config glib-devel"
-short_desc="A plugin for the Google protocol buffer compiler to generate Vala code"
+short_desc="Plugin for the Google protocol buffer compiler to generate Vala code"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="http://launchpad.net/protobuf-vala/"
 distfiles="${homepage}/trunk/${version}/+download/${pkgname}-${version}.tar.xz"
 checksum=c12547813fa22ee2b15967f17146b08e2a4d90800810fe63730332aea6777c48
 
 disable_parallel_build=yes
 
+post_patch() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i -e '/^noinst_PROGRAMS/s/=.*/=/' src/Makefile.in
+	fi
+}
+
 libprotobuf-vala_package() {
 	short_desc+=" - shared library"
 	pkg_install() {

From 6168fd002cd6831ccef9da6fb67ef8fa6a54a798 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 24 Jan 2021 11:39:09 +0100
Subject: [PATCH 0387/3482] kore: update to 4.1.0.

---
 srcpkgs/kore/patches/ppc64.patch | 31 +++++++++++++------------------
 srcpkgs/kore/template            |  4 ++--
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/kore/patches/ppc64.patch b/srcpkgs/kore/patches/ppc64.patch
index 1e06a1927e09..bc486ef3aaab 100644
--- a/srcpkgs/kore/patches/ppc64.patch
+++ b/srcpkgs/kore/patches/ppc64.patch
@@ -425,19 +425,17 @@ index 0000000..b935864
 +#define __NR_pidfd_open		434
 +#define __NR_clone3		435
 +
-diff --git src/seccomp.c src/seccomp.c
-index 505ac0b..14074db 100644
---- src/seccomp.c
-+++ src/seccomp.c
-@@ -426,11 +426,19 @@ seccomp_register_violation(pid_t pid)
- 	int				idx;
- 	struct kore_worker		*kw;
+--- src/seccomp.c.orig	2021-01-24 11:27:12.401550281 +0100
++++ src/seccomp.c	2021-01-24 11:30:18.102787637 +0100
+@@ -460,13 +460,19 @@
  	struct iovec			iov;
-+#if defined(__powerpc__)
-+	unsigned long			regs[32];
-+#else
+ #if defined(__arm__)
+ 	struct pt_regs			regs;
++#elif defined(__powerpc__)
++	unsigned long                   regs[32];
+ #else
  	struct user_regs_struct		regs;
-+#endif
+ #endif
  	long				sysnr;
  	const char			*name;
  
@@ -449,15 +447,12 @@ index 505ac0b..14074db 100644
  	iov.iov_len = sizeof(regs);
  
  	if (ptrace(PTRACE_GETREGSET, pid, 1, &iov) == -1)
-@@ -442,6 +450,8 @@ seccomp_register_violation(pid_t pid)
- 	sysnr = regs.orig_ax;
- #elif SECCOMP_AUDIT_ARCH == AUDIT_ARCH_AARCH64
+@@ -478,6 +484,8 @@
  	sysnr = regs.regs[8];
+ #elif SECCOMP_AUDIT_ARCH == AUDIT_ARCH_ARM
+ 	sysnr = regs.uregs[7];
 +#elif defined(__powerpc__)
 +	sysnr = regs[0];
  #else
- #error "platform not yet supported"
+ #error "platform not supported"
  #endif
--- 
-2.28.0
-
diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index b6b6e75af753..d23943496392 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,6 +1,6 @@
 # Template file for 'kore'
 pkgname=kore
-version=4.0.1
+version=4.1.0
 revision=1
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"
 homepage="https://kore.io"
 distfiles="https://kore.io/releases/kore-${version}.tar.gz"
-checksum=bc8bf755133faf67755c3a4ea53db49f208986efeed734ce6be562a3e5a81057
+checksum=b7d73b005fde0ea01c356a54e4bbd8a209a4dff9cf315802a127ce7267efbe61
 disable_parallel_build=yes
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 6d41341770dd9261a6e62493981140ea1fed5324 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 24 Jan 2021 11:41:52 +0100
Subject: [PATCH 0388/3482] linux5.4: update to 5.4.92.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index b889f9bf128e..60f097ab3da9 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.91
+version=5.4.92
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=0e0161bb034b9ba59e58a20985e49ecfb38104586602f53f37b382f508fc5c17
+checksum=c0937ff98824c4b14cfea68a04340e0beb3c00f1cc02984daf2f3bdf542394fd
 python_version=3
 patch_args="-Np1"
 

From 1dfea2b71972afc71489d6717e2e4103003d8de1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 24 Jan 2021 11:44:08 +0100
Subject: [PATCH 0389/3482] linux4.19: update to 4.19.170.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index d6b48be5bf35..1f109e47a201 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.169
+version=4.19.170
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=c7d24ddb8ecc348ca7bed24111ff98e2a87f74666c8bbbf4f9c57b7c3c25de94
+checksum=dd0d0264f8ef4363d0080054fd344470a73f07aca2cd673e91bf6e77fbe25b4a
 python_version=2 #unverified
 patch_args="-Np1"
 

From 37b8d9681b093cb830cb221cbcdb65be657e5b67 Mon Sep 17 00:00:00 2001
From: Robert Karszniewicz <avoidr@posteo.de>
Date: Sun, 24 Jan 2021 03:34:25 +0100
Subject: [PATCH 0390/3482] utox: update to 0.18.1.

Also remove libsodium dependency.
---
 srcpkgs/utox/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/utox/template b/srcpkgs/utox/template
index 5af30bd0f246..39e0a28eb624 100644
--- a/srcpkgs/utox/template
+++ b/srcpkgs/utox/template
@@ -1,20 +1,20 @@
 # Template file for 'utox'
 pkgname=utox
-version=0.18.0
+version=0.18.1
 revision=1
 wrksrc=uTox
 build_style=cmake
 configure_args="-DENABLE_ASAN=OFF"
 hostmakedepends="pkg-config"
 makedepends="check-devel dbus-devel filter_audio-devel fontconfig-devel
- libXrender-devel libopenal-devel libsodium-devel libvpx-devel opus-devel
+ libXrender-devel libopenal-devel libvpx-devel opus-devel
  toxcore-devel v4l-utils-devel"
 short_desc="Lightweight Tox instant messenger client written in C"
 maintainer="avoidr <avoidr@posteo.de>"
 license="MIT"
 homepage="https://github.com/uTox/uTox/"
 distfiles="https://github.com/uTox/uTox/releases/download/v${version}/uTox-${version}-full.tar.gz"
-checksum=259d502eb1277394d839c5ef035ef4dadd75113e4472edae1fe266a762198e15
+checksum=fc883483d86b1830674f3b08515daa27ae54ab47646c7edc48a067e8d1e8c114
 patch_args="-Np1"
 nocross=yes
 

From f7b17562682567e9b337d8d4bec479a8ef1f2a32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 23 Jan 2021 19:49:15 +0100
Subject: [PATCH 0391/3482] gcc-multilib: update to 10.2.1pre1

---
 .../patches/fix-libiberty_pic.patch           | 22 +++++-----------
 srcpkgs/gcc-multilib/template                 | 25 +++++++------------
 2 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch b/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch
index 134846c45f45..54259bc2bb56 100644
--- a/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch
+++ b/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch
@@ -1,22 +1,12 @@
---- libiberty/Makefile.in	2016-08-05 17:07:27.540554328 +0200
-+++ libiberty/Makefile.in	2016-08-05 17:18:39.727540789 +0200
-@@ -112,8 +112,8 @@
+--- libiberty/Makefile.in	2020-12-03 20:45:14.000000000 +0100
++++ libiberty/Makefile.in	2021-01-23 18:39:45.891324445 +0100
+@@ -111,7 +111,7 @@
  
  INCDIR=$(srcdir)/$(MULTISRCTOP)../include
  
 -COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) \
--               $(HDEFINES) @ac_libiberty_warn_cflags@ -D_GNU_SOURCE
+-               $(HDEFINES) @ac_libiberty_warn_cflags@ -D_GNU_SOURCE \
 +COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -fPIC -I. -I$(INCDIR) \
-+               $(HDEFINES) @ac_libiberty_warn_cflags@ -D_DEFAULT_SOURCE
++               $(HDEFINES) @ac_libiberty_warn_cflags@ -D_DEFAULT_SOURCE \
+                @CET_HOST_FLAGS@
  
- # Just to make sure we don't use a built-in rule with VPATH
- .c.$(objext):
-@@ -401,7 +401,7 @@
- demangle: $(ALL) $(srcdir)/cp-demangle.c
- 	@echo "The standalone demangler, now named c++filt, is now"
- 	@echo "a part of binutils."
--	$(CC) @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) $(HDEFINES) \
-+	$(CC) @DEFS@ $(CFLAGS) $(CPPFLAGS) -fPIC -I. -I$(INCDIR) $(HDEFINES) \
- 	  $(srcdir)/cp-demangle.c -DSTANDALONE_DEMANGLER $(TARGETLIB) -o $@
- 
- ls:
diff --git a/srcpkgs/gcc-multilib/template b/srcpkgs/gcc-multilib/template
index 6d2240d055e9..07ceeccc93d4 100644
--- a/srcpkgs/gcc-multilib/template
+++ b/srcpkgs/gcc-multilib/template
@@ -1,18 +1,18 @@
 # Template file for 'gcc-multilib'
 archs="x86_64"
 _triplet="x86_64-unknown-linux-gnu"
-_majorver=9.3
+_majorver=10.2
 
 pkgname=gcc-multilib
-version=${_majorver}.0
-revision=2
-wrksrc="gcc-${version}"
+version=${_majorver}.1pre1
+revision=1
+wrksrc=gcc-${version/pre/_pre}
 short_desc="GNU Compiler Collection (multilib files)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://gcc.gnu.org"
 license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
-distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz"
-checksum=71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+distfiles="https://dev.alpinelinux.org/~nenolod/gcc-${version/pre/_pre}.tar.xz"
+checksum=772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
 
 hostmakedepends="perl flex tar zip unzip"
 makedepends="zlib-devel libmpc-devel isl15-devel libfl-devel
@@ -71,13 +71,8 @@ do_build() {
 	make ${makejobs}
 }
 do_install() {
-	local _pc_triplet=x86_64-pc-linux-gnu
+	local _pc_triplet=x86_64-pc-linux-gnu _version=${version%pre1}
 	# Install to a tempdir and then only copy relevant files.
-	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		vmkdir usr/lib
-		cd ${DESTDIR}/usr
-		ln -sf lib lib64
-	fi
 	cd ${wrksrc}
 	make DESTDIR=${wrksrc}/${pkgname}-build install
 
@@ -86,14 +81,12 @@ do_install() {
 	vmkdir usr/include/c++/${_majorver}/${_triplet}
 	vmkdir usr/lib/gcc/${_triplet}/${_majorver}
 
-	cp -a ${wrksrc}/${pkgname}-build/usr/lib/gcc/${_pc_triplet}/${version}/32 \
+	cp -a ${wrksrc}/${pkgname}-build/usr/lib/gcc/${_pc_triplet}/${_version}/32 \
 		${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}/
-	cp -a ${wrksrc}/${pkgname}-build/usr/include/c++/${version}/${_pc_triplet}/32 \
+	cp -a ${wrksrc}/${pkgname}-build/usr/include/c++/${_version}/${_pc_triplet}/32 \
 		${DESTDIR}/usr/include/c++/${_majorver}/${_triplet}
 
 	vinstall ${wrksrc}/host-${_pc_triplet}/gcc/specs 644 usr/lib/gcc/${_triplet}/${_majorver}
-
-	rm -f ${DESTDIR}/usr/lib64
 }
 
 gcc-objc-multilib_package() {

From b7e8d54d0aaa6cfd0f8a8b68135677bc004f7f06 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 15:52:59 +0100
Subject: [PATCH 0392/3482] bpftool: don't install bpf-helpers.7, clashes with
 man-pages.

---
 srcpkgs/linux-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index b83a10b1734b..9514eafc31f1 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-tools'
 pkgname=linux-tools
 version=5.10.4
-revision=2
+revision=3
 wrksrc="linux-${version}"
 build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
@@ -128,6 +128,7 @@ do_install() {
 		cd ${wrksrc}/tools/bpf
 		make -W runqslower_install install DESTDIR=${DESTDIR} prefix=/usr
 		make -C bpftool doc-install DESTDIR=${DESTDIR} prefix=/usr/share
+		rm ${DESTDIR}/usr/share/man/man7/bpf-helpers.7
 		mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	esac
 
@@ -139,7 +140,6 @@ bpftool_package() {
 	pkg_install() {
 		vmove "usr/bin/bpf*"
 		vmove usr/share/bash-completion/completions/bpftool
-		vmove "usr/share/man/man7/bpf*"
 		vmove "usr/share/man/man8/bpf*"
 	}
 }

From 296b3a549af44c0b9ff9c0fcca1e915f8a076236 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 15:56:30 +0100
Subject: [PATCH 0393/3482] ugrep: update to 3.1.4.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 2eedab2d46e6..07acebd43aed 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.1.3
+version=3.1.4
 revision=1
 build_style=gnu-configure
 configure_args="--disable-avx"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=6416e06d1358316aafa147aa74e5bc7d05502f1d78d742248b3fdce0f6fbeae1
+checksum=3de80f56e82ac21fda574334a1e55d3a9027c156d4b1ce1b0e96ea99b25cda32

From 1ef0e92410ec9bc13f88210899b413a5f169aa9a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 15:57:20 +0100
Subject: [PATCH 0394/3482] perl-IO-Socket-SSL: update to 2.069.

---
 srcpkgs/perl-IO-Socket-SSL/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index 2066b4c7344f..6821590299ce 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.068
-revision=2
+version=2.069
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=4420fc0056f1827b4dd1245eacca0da56e2182b4ef6fc078f107dc43c3fb8ff9
+checksum=d83c2cae5e8a22ab49c9f2d964726625e9efe56490d756a48a7b149a3d6e278d

From 8d3656dcbc5591b8c63f9cd416e179f4a30ef4e9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 16:07:31 +0100
Subject: [PATCH 0395/3482] skaffold: update to 1.18.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 3997a70ab07f..0638b06689f7 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.17.2
+version=1.18.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=1d23795bc92d77fbfd92ff1068013c35cd0f4fbde24f06f46cff8caa8b7a4972
+checksum=14c9640d32eb81e0b7a82159deab00f6e0f2d68a8d50a64ccea504cf3a2b19fe

From 2c0480f1222317c53b856795e3c04429d7e97cff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 16:08:29 +0100
Subject: [PATCH 0396/3482] nncp: update to 6.0.0.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 3f7d0bedea0b..15609f3801f7 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=5.6.0
+version=6.0.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=1dc83f05f14a3c3b95820046c60b170eb8c8936f142a5b9a1e943e6f4cefbde3
+checksum=42fe8aa54520b3a1abb50d661bbba6a141ce4e749b4816b0d4c6845d67465916
 
 do_build() {
 	make

From 8ae7963ac2153e775bf3ab204b65caea21d157a7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 16:09:02 +0100
Subject: [PATCH 0397/3482] janet: update to 1.14.2.

---
 srcpkgs/janet/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 77674059ea68..9c3c160bf501 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,7 +1,7 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.14.1
-revision=2
+version=1.14.2
+revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
 short_desc="Dynamic Lisp dialect and bytecode VM"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://janet-lang.org/"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=fcdb12c4ca414af346f390f81ea6e2417da182656c1c36377237df57b92cfd34
+checksum=587715eddbe007cbd33f16c89cc3aabc67a69196669b3c6995ce983dc00b54fb
 
 post_install() {
 	vlicense LICENSE

From 5f5813829b68b13dbf57e98df422d28983546111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 22:39:19 +0700
Subject: [PATCH 0398/3482] notmuch: update to 0.31.3.

---
 srcpkgs/notmuch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 64a648ce8290..d96cd07da6a3 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
 # Template file for 'notmuch'
 pkgname=notmuch
-version=0.31.2
+version=0.31.3
 revision=1
 hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo"
 makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://notmuchmail.org"
 distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz
  https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"
-checksum="1456b63e04637094eefe7e6f9a45812ed419392a0322fe8b0f452dd06a4cfbef
+checksum="484041aed08f88f3a528a5b82489b6cda4090764228813bca73678da3a753aca
  4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2"
 skip_extraction="database-v1.tar.xz"
 

From 5d81fe15634029b850c9fbbfefd8b3a94a217544 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 24 Jan 2021 16:32:50 +0100
Subject: [PATCH 0399/3482] lf: update to r19.

Close: #28147
Close: #28148
Close: #28150
---
 srcpkgs/lf/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index a15d195d11df..1b4fc94cfc44 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,17 +1,16 @@
 # Template file for 'lf'
 pkgname=lf
-version=r18
+version=r19
 revision=1
 build_style=go
 go_import_path="github.com/gokcehan/${pkgname}"
 go_ldflags="-X main.gVersion=$version"
-hostmakedepends="git"
 short_desc="Terminal file manager"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/gokcehan/lf"
 distfiles="https://github.com/gokcehan/lf/archive/${version}.tar.gz"
-checksum=b9aba66ee8f0ca8229d4d3c0956fa7a7fd71a7e099e119d5609d29a1d9019344
+checksum=8808069021ee1c0012440edabdc239b9f58f36bdd44d27b07eae7c91b97afdef
 
 post_install() {
 	vlicense LICENSE

From 72f59a1af9bcd363f2e6106615371913520505f0 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 24 Jan 2021 17:11:59 +0100
Subject: [PATCH 0400/3482] jitterentropy: include license files

COPYING says
    ALTERNATIVELY, this product may be distributed under the terms of
    the GNU General Public License, in which case the provisions of the GPL2
    are required INSTEAD OF the above restrictions.  (This clause is
    necessary due to a potential bad interaction between the GPL and
    the restrictions contained in a BSD-style copyright.)
so license= field is not altered

Closes: #28073
---
 srcpkgs/jitterentropy/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/jitterentropy/template b/srcpkgs/jitterentropy/template
index b0a2842ad0ee..8faf44a5b5f5 100644
--- a/srcpkgs/jitterentropy/template
+++ b/srcpkgs/jitterentropy/template
@@ -1,7 +1,7 @@
 # Template file for 'jitterentropy'
 pkgname=jitterentropy
 version=3.0.1
-revision=1
+revision=2
 wrksrc="${pkgname}-library-${version}"
 build_style=gnu-makefile
 short_desc="Hardware RNG based on CPU timing jitter"
@@ -11,6 +11,12 @@ homepage="https://www.chronox.de/jent.html"
 distfiles="https://github.com/smuellerDD/jitterentropy-library/archive/v${version}.tar.gz"
 checksum=015a443ebfaab7bc302caa24dcc124aefe1818046893f49591d2465bd3f58e16
 
+post_install() {
+	vlicense COPYING
+	vlicense COPYING.bsd
+	vlicense COPYING.COPYING.gplv2
+}
+
 jitterentropy-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From b21b90e0b46ec4570c8c064c1cb3bca7f65523e7 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 24 Jan 2021 17:27:18 +0100
Subject: [PATCH 0401/3482] jitterentropy: fixup license file path

---
 srcpkgs/jitterentropy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jitterentropy/template b/srcpkgs/jitterentropy/template
index 8faf44a5b5f5..5a9003fdbbc2 100644
--- a/srcpkgs/jitterentropy/template
+++ b/srcpkgs/jitterentropy/template
@@ -1,7 +1,7 @@
 # Template file for 'jitterentropy'
 pkgname=jitterentropy
 version=3.0.1
-revision=2
+revision=3
 wrksrc="${pkgname}-library-${version}"
 build_style=gnu-makefile
 short_desc="Hardware RNG based on CPU timing jitter"
@@ -14,7 +14,7 @@ checksum=015a443ebfaab7bc302caa24dcc124aefe1818046893f49591d2465bd3f58e16
 post_install() {
 	vlicense COPYING
 	vlicense COPYING.bsd
-	vlicense COPYING.COPYING.gplv2
+	vlicense COPYING.gplv2
 }
 
 jitterentropy-devel_package() {

From 7cd7a19e8f717baa748f981e908308a929816281 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 24 Jan 2021 17:36:40 +0100
Subject: [PATCH 0402/3482] socat: orphan package

---
 srcpkgs/socat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index a163d2099c0a..8f96fccff847 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -7,7 +7,7 @@ configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
 makedepends="readline-devel libressl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
-maintainer="q66 <daniel@octaforge.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.dest-unreach.org/socat/"
 distfiles="http://www.dest-unreach.org/socat/download/socat-${version}.tar.bz2"

From 804794958f1c53348535609d85d9440652a44b04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 17 Dec 2020 00:00:40 +0700
Subject: [PATCH 0403/3482] webkit2gtk: disable sse2 on i686

- be nice with ccache
- also switch maintainer (added by q66)
---
 srcpkgs/webkit2gtk/patches/x86-no-sse2.patch | 19 ++++++++++++++++
 srcpkgs/webkit2gtk/template                  | 24 +++++++++++++++++---
 2 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/webkit2gtk/patches/x86-no-sse2.patch

diff --git a/srcpkgs/webkit2gtk/patches/x86-no-sse2.patch b/srcpkgs/webkit2gtk/patches/x86-no-sse2.patch
new file mode 100644
index 000000000000..c6c4c803bcfa
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/x86-no-sse2.patch
@@ -0,0 +1,19 @@
+ Source: Debian
+--- Source/cmake/WebKitCompilerFlags.cmake.orig	2020-12-15 15:29:50.240722972 +0700
++++ Source/cmake/WebKitCompilerFlags.cmake	2020-12-15 15:29:59.659853014 +0700
+@@ -138,15 +138,6 @@
+     if (CMAKE_COMPILER_IS_GNUCXX)
+         WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-expansion-to-defined)
+     endif ()
+-
+-    # Force SSE2 fp on x86 builds.
+-    if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING)
+-        WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse)
+-        include(DetectSSE2)
+-        if (NOT SSE2_SUPPORT_FOUND)
+-            message(FATAL_ERROR "SSE2 support is required to compile WebKit")
+-        endif ()
+-    endif ()
+ endif ()
+ 
+ if (COMPILER_IS_GCC_OR_CLANG AND NOT MSVC)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 8b617cb39723..54762392d6a6 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,8 @@
 # Template file for 'webkit2gtk'
+# ping q66 before touching this
 pkgname=webkit2gtk
 version=2.30.4
-revision=3
+revision=4
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -24,8 +25,10 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
  -DENABLE_X11_TARGET=$(vopt_if x11 ON OFF)
  -DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)
  -DENABLE_BUBBLEWRAP_SANDBOX=$(vopt_if bubblewrap ON OFF)"
+# Don't remove which from hostmakedepends
+# Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -35,7 +38,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  qt5-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
@@ -53,6 +56,21 @@ desc_option_minibrowser="Build the minibrowser"
 export CFLAGS="-D__WORDSIZE=${XBPS_TARGET_WORDSIZE}"
 export CXXFLAGS="$CFLAGS"
 
+# WebKitCCache.cmake set this variable
+# include_file_mtime was not enabled to avoid a race,
+# but this is run under our control
+export CCACHE_SLOPPINESS=time_macros,include_file_mtime
+
+post_patch() {
+	# Reproducible build
+	# At least, be nice with ccache
+	vsed -i -e '/foreach my.*(keys/s/(keys/(sort keys/' \
+		Source/WebCore/bindings/scripts/CodeGenerator.pm \
+		Source/WebCore/bindings/scripts/CodeGeneratorJS.pm \
+		Source/WebCore/css/makeprop.pl \
+		Source/cmake/tools/scripts/version-stamp.pl
+}
+
 do_check() {
 	:
 }

From 2c0223e58c167ce4078d713becc6144c337a5997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 24 Jan 2021 15:31:08 +0100
Subject: [PATCH 0404/3482] virtualbox-ose: update to 6.1.18

---
 .../018-linux-5.10-r0drv-memobj-fix.patch     | 97 -------------------
 .../019-linux-5.10-address-space-fixes.patch  | 17 ----
 .../020-linux-5.10-framebuffer-fixes.patch    | 47 ---------
 srcpkgs/virtualbox-ose/template               |  6 +-
 4 files changed, 3 insertions(+), 164 deletions(-)
 delete mode 100644 srcpkgs/virtualbox-ose/patches/018-linux-5.10-r0drv-memobj-fix.patch
 delete mode 100644 srcpkgs/virtualbox-ose/patches/019-linux-5.10-address-space-fixes.patch
 delete mode 100644 srcpkgs/virtualbox-ose/patches/020-linux-5.10-framebuffer-fixes.patch

diff --git a/srcpkgs/virtualbox-ose/patches/018-linux-5.10-r0drv-memobj-fix.patch b/srcpkgs/virtualbox-ose/patches/018-linux-5.10-r0drv-memobj-fix.patch
deleted file mode 100644
index ae75c5cbe214..000000000000
--- a/srcpkgs/virtualbox-ose/patches/018-linux-5.10-r0drv-memobj-fix.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-:Index: src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-===================================================================
---- src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c	(Revision 141658)
-+++ src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c	(Arbeitskopie)
-@@ -56,9 +56,12 @@
-  * Whether we use alloc_vm_area (3.2+) for executable memory.
-  * This is a must for 5.8+, but we enable it all the way back to 3.2.x for
-  * better W^R compliance (fExecutable flag). */
--#if RTLNX_VER_MIN(3,2,0) || defined(DOXYGEN_RUNNING)
-+#if RTLNX_VER_RANGE(3,2,0, 5,10,0) || defined(DOXYGEN_RUNNING)
- # define IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
- #endif
-+#if RTLNX_VER_MIN(5,10,0) || defined(DOXYGEN_RUNNING)
-+# define IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC
-+#endif
- 
- /*
-  * 2.6.29+ kernels don't work with remap_pfn_range() anymore because
-@@ -502,7 +505,43 @@
- }
- 
- 
-+#ifdef IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC
- /**
-+ * User data passed to the apply_to_page_range() callback.
-+ */
-+typedef struct LNXAPPLYPGRANGE
-+{
-+    /** Pointer to the memory object. */
-+    PRTR0MEMOBJLNX pMemLnx;
-+    /** The page protection flags to apply. */
-+    pgprot_t       fPg;
-+} LNXAPPLYPGRANGE;
-+/** Pointer to the user data. */
-+typedef LNXAPPLYPGRANGE *PLNXAPPLYPGRANGE;
-+/** Pointer to the const user data. */
-+typedef const LNXAPPLYPGRANGE *PCLNXAPPLYPGRANGE;
-+
-+/**
-+ * Callback called in apply_to_page_range().
-+ *
-+ * @returns Linux status code.
-+ * @param   pPte                Pointer to the page table entry for the given address.
-+ * @param   uAddr               The address to apply the new protection to.
-+ * @param   pvUser              The opaque user data.
-+ */
-+static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser)
-+{
-+    PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser;
-+    PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx;
-+    uint32_t idxPg = (uAddr - (unsigned long)pMemLnx->Core.pv) >> PAGE_SHIFT;
-+
-+    set_pte(pPte, mk_pte(pMemLnx->apPages[idxPg], pArgs->fPg));
-+    return 0;
-+}
-+#endif
-+
-+
-+/**
-  * Maps the allocation into ring-0.
-  *
-  * This will update the RTR0MEMOBJLNX::Core.pv and RTR0MEMOBJ::fMappedToRing0 members.
-@@ -584,6 +623,11 @@
-         else
- # endif
-         {
-+#  if defined(IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC)
-+            if (fExecutable)
-+                pgprot_val(fPg) |= _PAGE_NX; /* Uses RTR0MemObjProtect to clear NX when memory ready, W^X fashion. */
-+#  endif
-+
- # ifdef VM_MAP
-             pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_MAP, fPg);
- # else
-@@ -1851,6 +1895,21 @@
-         preempt_enable();
-         return VINF_SUCCESS;
-     }
-+# elif defined(IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC)
-+    PRTR0MEMOBJLNX pMemLnx = (PRTR0MEMOBJLNX)pMem;
-+    if (   pMemLnx->fExecutable
-+        && pMemLnx->fMappedToRing0)
-+    {
-+        LNXAPPLYPGRANGE Args;
-+        Args.pMemLnx = pMemLnx;
-+        Args.fPg = rtR0MemObjLinuxConvertProt(fProt, true /*fKernel*/);
-+        int rcLnx = apply_to_page_range(current->active_mm, (unsigned long)pMemLnx->Core.pv + offSub, cbSub,
-+                                        rtR0MemObjLinuxApplyPageRange, (void *)&Args);
-+        if (rcLnx)
-+            return VERR_NOT_SUPPORTED;
-+
-+        return VINF_SUCCESS;
-+    }
- # endif
- 
-     NOREF(pMem);
-
diff --git a/srcpkgs/virtualbox-ose/patches/019-linux-5.10-address-space-fixes.patch b/srcpkgs/virtualbox-ose/patches/019-linux-5.10-address-space-fixes.patch
deleted file mode 100644
index ffb704e4aa69..000000000000
--- a/srcpkgs/virtualbox-ose/patches/019-linux-5.10-address-space-fixes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: b/src/VBox/Additions/linux/sharedfolders/regops.c
-===================================================================
---- src/VBox/Additions/linux/sharedfolders/regops.c
-+++ src/VBox/Additions/linux/sharedfolders/regops.c
-@@ -1401,7 +1401,10 @@ static int vbsf_lock_user_pages_failed_c
-     /*
-      * Check that this is valid user memory that is actually in the kernel range.
-      */
--#if RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_MIN(8,1)
-+#if RTLNX_VER_MIN(5,10,0)
-+    if (   access_ok((void *)uPtrFrom, cPages << PAGE_SHIFT)
-+        && uPtrFrom >= TASK_SIZE_MAX)
-+#elif RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_MIN(8,1)
-     if (   access_ok((void *)uPtrFrom, cPages << PAGE_SHIFT)
-         && uPtrFrom >= USER_DS.seg)
- #else
-
diff --git a/srcpkgs/virtualbox-ose/patches/020-linux-5.10-framebuffer-fixes.patch b/srcpkgs/virtualbox-ose/patches/020-linux-5.10-framebuffer-fixes.patch
deleted file mode 100644
index a1bbbd9c3dcd..000000000000
--- a/srcpkgs/virtualbox-ose/patches/020-linux-5.10-framebuffer-fixes.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: b/src/VBox/Additions/linux/drm/vbox_drv.h
-===================================================================
---- src/VBox/Additions/linux/drm/vbox_drv.h
-+++ src/VBox/Additions/linux/drm/vbox_drv.h
-@@ -205,6 +205,13 @@ static inline void drm_gem_object_put(st
- }
- #endif
- 
-+#ifndef TTM_PL_FLAG_SYSTEM
-+#define TTM_PL_FLAG_SYSTEM      (1 << TTM_PL_SYSTEM)
-+#endif
-+#ifndef TTM_PL_FLAG_VRAM
-+#define TTM_PL_FLAG_VRAM        (1 << TTM_PL_VRAM)
-+#endif
-+
- #define DRIVER_AUTHOR       VBOX_VENDOR
- 
- #define DRIVER_NAME         "vboxvideo"
-Index: b/src/VBox/Additions/linux/drm/vbox_ttm.c
-===================================================================
---- src/VBox/Additions/linux/drm/vbox_ttm.c
-+++ src/VBox/Additions/linux/drm/vbox_ttm.c
-@@ -373,11 +373,23 @@ void vbox_ttm_placement(struct vbox_bo *
- 	bo->placement.busy_placement = bo->placements;
- 
- 	if (domain & TTM_PL_FLAG_VRAM)
-+#if RTLNX_VER_MIN(5,10,0)
-+		bo->placements[c].mem_type = TTM_PL_VRAM;
-+		PLACEMENT_FLAGS(bo->placements[c++]) =
-+		    TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED;
-+#else
- 		PLACEMENT_FLAGS(bo->placements[c++]) =
- 		    TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM;
-+#endif
- 	if (domain & TTM_PL_FLAG_SYSTEM)
-+#if RTLNX_VER_MIN(5,10,0)
-+		bo->placements[c].mem_type = TTM_PL_SYSTEM;
-+		PLACEMENT_FLAGS(bo->placements[c++]) =
-+		    TTM_PL_MASK_CACHING;
-+#else
- 		PLACEMENT_FLAGS(bo->placements[c++]) =
- 		    TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
-+#endif
- 	if (!c)
- 		PLACEMENT_FLAGS(bo->placements[c++]) =
- 		    TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
-
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index ff728d6ce40c..c9edf805df8f 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.16
-revision=2
+version=6.1.18
+revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1
+checksum=108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40
 
 nopie=yes
 lib32disabled=yes

From 30442e9c310045b5e98d0038f291e86b479a571a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 24 Jan 2021 21:02:06 +0100
Subject: [PATCH 0405/3482] appdata-tools: fix wrong (it)localedir

---
 srcpkgs/appdata-tools/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe44195874..126997ddee96 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -11,3 +11,8 @@ license="GPL-2"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+post_configure() {
+	vsed -i po/Makefile \
+		-e 's;\(itlocaledir = $(prefix)\)/$(DATADIRNAME)/locale;\1/share/locale;'
+}

From fdf54ec880ff5f7818627f76f7f94ae364c5187e Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@ae-design.ws>
Date: Sat, 23 Jan 2021 14:20:12 +0100
Subject: [PATCH 0406/3482] python-enchant: remove package

pyenchant now requires: Python >=3.5

Closes: #28117 [via git-merge-pr]
---
 srcpkgs/python-enchant/template   | 14 --------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/python-enchant/template

diff --git a/srcpkgs/python-enchant/template b/srcpkgs/python-enchant/template
deleted file mode 100644
index d29c1ad7ac64..000000000000
--- a/srcpkgs/python-enchant/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-enchant'
-pkgname=python-enchant
-version=2.0.0
-revision=4
-wrksrc="pyenchant-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools enchant-devel"
-depends="enchant"
-short_desc="Spellchecking library for Python 3"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="https://github.com/rfk/pyenchant"
-distfiles="${PYPI_SITE}/p/pyenchant/pyenchant-${version}.tar.gz"
-checksum=fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e5e08f74170c..adc3b867bb6d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -60,6 +60,7 @@ replaces="
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
+ python-enchant<=2.0.0_4
  python-jellyfish<=0.6.1_2
  python-matplotlib<=2.2.4_2
  python-matplotlib-data<=2.2.4_2

From 83afacc738d07a9d4d7a0575504c99f556399353 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 23 Jan 2021 09:04:03 +0100
Subject: [PATCH 0407/3482] cmus: update to 2.9.1 and adopt

---
 srcpkgs/cmus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 22052fc3d5d9..fd8e518e2af6 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -1,6 +1,6 @@
 # Template file for 'cmus'
 pkgname=cmus
-version=2.9.0
+version=2.9.1
 revision=1
 build_style=configure
 configure_args="prefix=/usr LD=$CC"
@@ -11,11 +11,11 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
-checksum=e7ea7f5ec52b991cf378a9caf19e479be16a165a5b26adca058de711e72ad2a0
+checksum=6fb799cae60db9324f03922bbb2e322107fd386ab429c0271996985294e2ef44
 build_options="elogind"
 build_options_default="elogind"
 desc_option_elogind="Support MPRIS interface via elogind"

From 4b9b1a3f6add95c5d5964ec79efa9b6d0db456d8 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 23 Jan 2021 12:43:40 +0100
Subject: [PATCH 0408/3482] oath-toolkit: update to 2.6.6

---
 srcpkgs/oath-toolkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oath-toolkit/template b/srcpkgs/oath-toolkit/template
index 3bae5e388a73..2690bccb8176 100644
--- a/srcpkgs/oath-toolkit/template
+++ b/srcpkgs/oath-toolkit/template
@@ -1,6 +1,6 @@
 # Template file for 'oath-toolkit'
 pkgname=oath-toolkit
-version=2.6.5
+version=2.6.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.nongnu.org/oath-toolkit/"
 distfiles="http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d207120c7e7fdd540142d04ca06d83fb3277c8f2fb794a74535d04b2aa0ec219
+checksum=fd68b315c71ba1db47bcc6e67f598568db4131afc33abd23ed682170e3cb946c
 
 oath-toolkit-devel_package() {
 	short_desc+=" - development files"

From 6ba6de9a55820c309f8ed7797d05c982dcd356dd Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 20 Jan 2021 18:20:32 -0600
Subject: [PATCH 0409/3482] Amass: update to 3.11.1.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index f6a2af0825dc..0598c9ff251d 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.10.5
+version=3.11.1
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/..."
@@ -9,4 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=1476e215d3d04532cf6c4467e4975acbe6b4e932ecc29260fca539c8c8cace4e
+checksum=142d18f409acd93e622887181cf84bb9ef4e8bdeb1448158166b252609bbb4c9

From d9497e48c02c1394110b313d7eb07076b383d0fd Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 20 Jan 2021 18:37:54 -0600
Subject: [PATCH 0410/3482] zps: update to 1.2.5.

---
 srcpkgs/zps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zps/template b/srcpkgs/zps/template
index bcd038c48271..239afcb61e5c 100644
--- a/srcpkgs/zps/template
+++ b/srcpkgs/zps/template
@@ -1,6 +1,6 @@
 # Template file for 'zps'
 pkgname=zps
-version=1.2.3
+version=1.2.5
 revision=1
 build_style=cmake
 short_desc="Small utility for listing and reaping zombie processes"
@@ -8,4 +8,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/orhun/zps"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b4a905d85a0ecae983fe72c5a0284f692374cea0e51ade9fe56e567bbbf2c9ed
+checksum=c007107991518c0a6440efb2af76a59aefeac668dda560cbd34de2bbc859b19c

From 1991c0c45e57bf7da348b4420071ccb154825850 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 24 Jan 2021 14:07:14 -0600
Subject: [PATCH 0411/3482] wuzz: update to 0.5.0.

---
 srcpkgs/wuzz/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wuzz/template b/srcpkgs/wuzz/template
index e6cb81b38077..f7c9f04d9ec3 100644
--- a/srcpkgs/wuzz/template
+++ b/srcpkgs/wuzz/template
@@ -1,16 +1,16 @@
 # Template file for 'wuzz'
 pkgname=wuzz
-version=0.4.0
+version=0.5.0
 revision=1
 build_style=go
 go_import_path=github.com/asciimoo/wuzz
 hostmakedepends="git"
 short_desc="Interactive cli tool for HTTP inspection"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="AGPL-3.0"
+license="AGPL-3.0-or-later"
 homepage="https://github.com/asciimoo/wuzz"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=acf8e82481740d1403b744c58918b9089128d91c3c6edc15b76b6e1c97ead645
+checksum=721ea7343698e9f3c69e09eab86b9b1fef828057655f7cebc1de728c2f75151e
 
 post_install() {
 	vlicense LICENSE

From d1514d57e6371c78c742ee041fd2c5464e478814 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 24 Jan 2021 14:08:22 -0600
Subject: [PATCH 0412/3482] gef: update to 2021.01.

---
 srcpkgs/gef/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gef/template b/srcpkgs/gef/template
index 0c2f2d651b3f..9188044d9c9a 100644
--- a/srcpkgs/gef/template
+++ b/srcpkgs/gef/template
@@ -1,7 +1,7 @@
 # Template file for 'gef'
 pkgname=gef
-version=2020.06
-revision=2
+version=2021.01
+revision=1
 pycompile_dirs="usr/share/gef"
 depends="keystone-python3 capstone-python3 unicorn-python3 python3-Ropper"
 short_desc="GDB Enhanced Features for exploit devs & reversers"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://gef.readthedocs.io/en/master/"
 distfiles="https://github.com/hugsy/gef/archive/${version}.tar.gz"
-checksum=334935986c681a346c1cb7944c1e4bbd52f7322f6427dfcba8a0185ff3c551c2
+checksum=59e9c2327a66f125c625affa727feaf43aaf8bf9da0cf1025f428ec8851b1f64
 python_version="3"
 
 do_install() {

From eacabea7ea48643f83e826ca02f5c68278df8d22 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 24 Jan 2021 14:09:25 -0600
Subject: [PATCH 0413/3482] bpytop: update to 1.0.60.

---
 srcpkgs/bpytop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bpytop/template b/srcpkgs/bpytop/template
index d1b7362fb732..9436b9d4be0c 100644
--- a/srcpkgs/bpytop/template
+++ b/srcpkgs/bpytop/template
@@ -1,6 +1,6 @@
 # Template file for 'bpytop'
 pkgname=bpytop
-version=1.0.59
+version=1.0.60
 revision=1
 build_style=gnu-makefile
 depends="python3-psutil"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aristocratos/bpytop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=c95d0034ab6567a72d377d12806f5a89f87a796e72b8993fbbb5efc79e5a9133
+checksum=7fc1a40ac6b9cb8f78f1e0e2e7bd58b9197c333ad4c5a4f2cb464d3f8183835b
 
 pre_configure() {
 	vsed -e '/^update_check/s/\$update_check/false/' -i bpytop.py

From f22ff207273ae73b76d2116e0c29001e496e6cce Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 23 Jan 2021 12:23:45 +0100
Subject: [PATCH 0414/3482] rclone: update to 1.53.4

---
 srcpkgs/rclone/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 56b4353c1aa1..77b36459d307 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,7 +1,7 @@
 # Template file for 'rclone'
 pkgname=rclone
-version=1.53.3
-revision=2
+version=1.53.4
+revision=1
 wrksrc="rclone-v${version}"
 build_style=go
 go_import_path=github.com/rclone/rclone
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://rclone.org/"
 changelog="https://raw.githubusercontent.com/rclone/rclone/master/docs/content/changelog.md"
 distfiles="https://github.com/rclone/rclone/releases/download/v${version}/rclone-v${version}.tar.gz"
-checksum=f1e213bc6fb7c46f9a4cc8604ae0856718434bdafe07fa3ce449ae9a510a5763
+checksum=68b231a917872b36d73f48b19d2ba98fdaca467e9b433105fa7f4dc3b15f556b
 
 pre_build() {
 	if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then

From 93d3db33cb221889fba7be30ec08130544868b04 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 24 Jan 2021 14:19:39 -0600
Subject: [PATCH 0415/3482] surgescript: update to 0.5.5.

---
 common/shlibs                | 2 +-
 srcpkgs/surgescript/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8c6b5d9d0149..4d393eac6042 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -853,7 +853,7 @@ liblua5.1.so.5.1 lua51-5.1.5_1
 liblua5.2.so.5.2 lua52-5.2.4_2
 liblua5.3.so.5.3 lua53-5.3.5_4
 liblua5.4.so.5.4 lua54-5.4.0_1
-libsurgescript.so.0.5.4.4 surgescript-0.5.4.4_2
+libsurgescript.so.0.5.5 surgescript-0.5.5_1
 libburn.so.4 libburn-0.7.2_1
 libKF5Auth.so.5 kauth-5.26.0_1
 libKF5AuthCore.so.5 kauth-5.56.0_1
diff --git a/srcpkgs/surgescript/template b/srcpkgs/surgescript/template
index 54e0b7612411..771677d82d98 100644
--- a/srcpkgs/surgescript/template
+++ b/srcpkgs/surgescript/template
@@ -1,7 +1,7 @@
 # Template file for 'surgescript'
 pkgname=surgescript
-version=0.5.4.4
-revision=2
+version=0.5.5
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 short_desc="Scripting language for games"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://opensurge2d.org/"
 distfiles="http://github.com/alemart/surgescript/archive/v${version}.tar.gz"
-checksum=a1a457cea20d6e8178a44633faae0b7fb3334a5cc79a66e28e42ede430e5a38c
+checksum=c9f59131d5cd921a11fb1335fe93bd754f4b1eefa1ed95aaa0343a28437f3f78
 
 surgescript-devel_package() {
 	short_desc+=" - development files"

From 3a1c0c759de10bbe743967f0925bf9c415c8185f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 24 Jan 2021 14:19:46 -0600
Subject: [PATCH 0416/3482] opensurge: rebuild for surgescript

---
 srcpkgs/opensurge/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensurge/template b/srcpkgs/opensurge/template
index f8fae1cc9a95..5fb036d9253a 100644
--- a/srcpkgs/opensurge/template
+++ b/srcpkgs/opensurge/template
@@ -1,7 +1,7 @@
 # Template file for 'opensurge'
 pkgname=opensurge
 version=0.5.1.2
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="surgescript pkg-config"
 makedepends="allegro5-devel surgescript surgescript-devel"

From 41ddb96f66b73ba818c997f21325fe2fc76ed4a0 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sat, 23 Jan 2021 10:37:15 +0000
Subject: [PATCH 0417/3482] Thunar: update to 4.17.0.

---
 srcpkgs/Thunar/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 3c2bbb8ee38f..2d3b6d277ad7 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,6 +1,6 @@
 # Template file for 'Thunar'
 pkgname=Thunar
-version=4.16.1
+version=4.17.0
 revision=1
 wrksrc=thunar-${version}
 build_style=gnu-configure
@@ -11,13 +11,13 @@ configure_args="--enable-gio-unix --enable-gudev
 hostmakedepends="pkg-config intltool"
 makedepends="exo-devel libexif-devel libgudev-devel libnotify-devel xfce4-panel-devel"
 depends="desktop-file-utils hicolor-icon-theme"
-short_desc="Thunar File Manager"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Thunar File Manager for XFCE"
+maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://docs.xfce.org/xfce/thunar/Start"
 changelog="https://raw.githubusercontent.com/xfce-mirror/thunar/master/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=da2d17d2cb69eb33768690b714cc232ed367cbd71eb9543aaa2a805d05dc3ce1
+checksum=ad004f02d8bda692d76ec2a264e3e1121ae065f3d2ecc9cfe7dd82cd5c69f8a5
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd

From 930e5841e91e5a7bf7c84c8aba28fc024e46e1c0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 24 Jan 2021 14:03:19 -0600
Subject: [PATCH 0418/3482] aide: update to 0.17.

---
 srcpkgs/aide/patches/fix-errorh-include.patch | 11 +++++++++++
 srcpkgs/aide/template                         |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/aide/patches/fix-errorh-include.patch

diff --git a/srcpkgs/aide/patches/fix-errorh-include.patch b/srcpkgs/aide/patches/fix-errorh-include.patch
new file mode 100644
index 000000000000..efc4f883c54a
--- /dev/null
+++ b/srcpkgs/aide/patches/fix-errorh-include.patch
@@ -0,0 +1,11 @@
+--- include/aide.h.orig
++++ include/aide.h
+@@ -33,7 +33,6 @@
+ #if HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif
+-#include "error.h"
+ 
+ #ifndef TEMP_FAILURE_RETRY
+ /* Evaluate EXPRESSION, and repeat as long as it returns -1 with errno'
+
diff --git a/srcpkgs/aide/template b/srcpkgs/aide/template
index adaa571cf2db..e376acbbaad4 100644
--- a/srcpkgs/aide/template
+++ b/srcpkgs/aide/template
@@ -1,6 +1,6 @@
 # Template file for 'aide'
 pkgname=aide
-version=0.16.2
+version=0.17
 revision=1
 build_style=gnu-configure
 configure_args="--with-mhash --with-posix-acl --with-prelink --with-xattr
@@ -15,7 +15,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://aide.github.io/"
 distfiles="https://github.com/aide/aide/releases/download/v${version}/aide-${version}.tar.gz"
-checksum=17f998ae6ae5afb9c83578e4953115ab8a2705efc50dee5c6461cef3f521b797
+checksum=4fd88d1d5ddc70c698c6519ebbc05c8d32c3f6d8137bbfdefeaebaafd6db867b
 
 post_configure() {
 	vsed -i config.h -e 's/cross/ino_t/g'

From 4a41da04268b35cef3faf258083182ba8040e5bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 19 Jan 2021 11:25:39 -0300
Subject: [PATCH 0419/3482] hooks/{pre,post}-install: fix 98-fixup-gir-path.

The libdir changes to use /usr/lib{32,64} instead of /usr/lib broke
cross builds for some packages that use gir, due to issues with copying
over symlinks. Since we haven't managed to track down the root cause for
the installation path, a symlink is a clean enough temporary fix. This
follows the style of the 00-libdir hooks.

Since pre-install runs for the main package and then each subpackage, it
should use PKGDESTDIR (not DESTDIR), which also enables a subpackage
that installs files during pkg_install to work cleanly.

As far as I can see, the previous hook was quite flawed. Since it was a
pre-install hook, the check for a directory would happen *before*
package installation (so nothing would happen). The only reason it did
anything was because it also ran as a step before a subpackage's
pkg_install (most GIR packages have a -devel subpackage), but used
DESTDIR instead of PKGDESTDIR, so it checked and affected the contents
of the main package. Then when the subpackage's pkg_install ran, the
files would have already been copied to the correct folders.

Closes #27437
---
 common/hooks/post-install/00-fixup-gir-path.sh | 11 +++++++++++
 common/hooks/pre-install/98-fixup-gir-path.sh  |  6 ++----
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 common/hooks/post-install/00-fixup-gir-path.sh

diff --git a/common/hooks/post-install/00-fixup-gir-path.sh b/common/hooks/post-install/00-fixup-gir-path.sh
new file mode 100644
index 000000000000..6fdb111fa0b6
--- /dev/null
+++ b/common/hooks/post-install/00-fixup-gir-path.sh
@@ -0,0 +1,11 @@
+# This hook removes the symlink necessary to fix the wrong install path of
+# 'gir' files when cross building packages (see pre-install hook). It's a
+# workaround and not a proper fix. Remove it once the root cause of the problem
+# is fixed.
+
+# Has to be a low number so it runs before remove-empty-dirs
+
+hook() {
+	[ -z "$CROSS_BUILD" ] && return
+	rm -f "${PKGDESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr"
+}
diff --git a/common/hooks/pre-install/98-fixup-gir-path.sh b/common/hooks/pre-install/98-fixup-gir-path.sh
index c81c82572944..64fd1405c4cd 100644
--- a/common/hooks/pre-install/98-fixup-gir-path.sh
+++ b/common/hooks/pre-install/98-fixup-gir-path.sh
@@ -5,8 +5,6 @@
 
 hook() {
 	[ -z "$CROSS_BUILD" ] && return
-	if [ -d "${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr" ]; then
-		cp -a "${DESTDIR}"/usr/{${XBPS_CROSS_TRIPLET}/usr/*,}
-		rm -rf "${DESTDIR}"/usr/${XBPS_CROSS_TRIPLET}/usr
-	fi
+	vmkdir usr/${XBPS_CROSS_TRIPLET}
+	ln -sf ".." "${PKGDESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr"
 }

From 9eda6802501a067830f6e07d22770221de502a48 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:00 +0200
Subject: [PATCH 0420/3482] cinnamon-control-center: update to 4.8.2.

Fix homepage.
---
 .../patches/disable-timezone-tests.patch      | 13 ----------
 srcpkgs/cinnamon-control-center/template      | 24 +++++--------------
 2 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch

diff --git a/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch b/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
deleted file mode 100644
index 964fb8c16123..000000000000
--- a/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- panels/datetime/Makefile.am.orig	2015-05-30 08:26:46.499494572 +0200
-+++ panels/datetime/Makefile.am	2015-05-30 08:26:56.890603931 +0200
-@@ -132,8 +132,8 @@ test_endianess_CFLAGS = $(DATETIME_PANEL
- all-local: check-local
- 
- check-local: test-timezone-gfx test-endianess test-timezone
--	$(builddir)/test-timezone-gfx $(srcdir)/data
--	$(builddir)/test-endianess
-+#	$(builddir)/test-timezone-gfx $(srcdir)/data
-+#	$(builddir)/test-endianess
- #	$(builddir)/test-timezone
- 
- ccpanelsdir = $(PANELS_DIR)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index d818e4223c4a..1d503bdb6e86 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,11 +1,10 @@
 # Template file for 'cinnamon-control-center'
 pkgname=cinnamon-control-center
-version=4.6.2
-revision=3
-build_style=gnu-configure
+version=4.8.2
+revision=1
+build_style=meson
 build_helper=gir
-configure_args="--disable-static --disable-update-mimedb --disable-systemd"
-hostmakedepends="autoconf-archive gettext-devel glib-devel automake
+hostmakedepends="gettext-devel glib-devel
  gobject-introspection intltool libtool pkg-config libxslt"
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
@@ -17,25 +16,14 @@ depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-da
 short_desc="Cinnamon Control Center"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
+homepage="https://github.com/linuxmint/cinnamon-control-center"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=f887d7e185f8ff1ee6f9789219231cba8be820c706b316d35ee5118d2fd898eb
+checksum=407e88fe458af7b25c0dd91d54aad93a72a1464ced285a741ed1ce6249ed61af
 
 do_check() {
 	:
 }
 
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
-post_install() {
-	# Remove unused stuff
-	make -C shell DESTDIR="$DESTDIR" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
-	rm -R "$DESTDIR/usr/share/applications"
-	rm -R "$DESTDIR/etc"
-}
-
 libcinnamon-control-center_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {

From ffe4514991ea5861073057ad79030b0ee37cd619 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:13 +0200
Subject: [PATCH 0421/3482] cinnamon-desktop: update to 4.8.1.

---
 srcpkgs/cinnamon-desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 77dfab737b67..985e05ed4927 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-desktop'
 pkgname=cinnamon-desktop
-version=4.6.4
-revision=2
+version=4.8.1
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dalsa=true"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-desktop"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=8b0f69c4acbeabca723a95ec80905601eec8d563c96ad88a9de3ddac56925ef6
+checksum=cb9aeff385764ba33cf4f7ee2bb5cb7308960670e8fa9f3be38a1d431b20436d
 
 cinnamon-desktop-devel_package() {
 	depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"

From 7de89e804a0656f78157f4275f4d031f55f12001 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:21 +0200
Subject: [PATCH 0422/3482] cinnamon-menus: update to 4.8.2.

Fix homepage.
---
 srcpkgs/cinnamon-menus/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index 4611ddd3ca04..0452a1f464e4 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-menus'
 pkgname=cinnamon-menus
-version=4.6.1
-revision=2
+version=4.8.2
+revision=1
 build_style=meson
 build_helper=gir
 hostmakedepends="glib-devel gobject-introspection intltool libtool pkg-config"
@@ -9,9 +9,9 @@ makedepends="libglib-devel gobject-introspection"
 short_desc="Cinnamon menu specifications"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-menus"
+homepage="https://github.com/linuxmint/cinnamon-menus"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=534cf3e15fed812e1affb544811e10823edbc56360b52a80ffbabc006c467dc6
+checksum=6c19ebcea0d35a7a65cd70f1cdca2c5c739467ac6d2c2a1c38a5d580296707bd
 
 cinnamon-menus-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From faafde7960f1f8b2f5a283e65a928befb4b04717 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:28 +0200
Subject: [PATCH 0423/3482] cinnamon-screensaver: update to 4.8.1.

Fix homepage.
---
 srcpkgs/cinnamon-screensaver/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index e45409aae8a6..2a711b6e88ac 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-screensaver'
 pkgname=cinnamon-screensaver
-version=4.6.0
-revision=2
+version=4.8.1
+revision=1
 build_style=meson
 build_helper=gir
 hostmakedepends="gettext-devel glib-devel gobject-introspection
@@ -14,9 +14,9 @@ conf_files="/etc/pam.d/${pkgname}"
 short_desc="Cinnamon screensaver"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-screensaver"
+homepage="https://github.com/linuxmint/cinnamon-screensaver"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e93349521a24f2b49c8a293ee15798ba341ae8e9b000cf3da5311a162ce8cb60
+checksum=e06a9f28cba55c38d1464d02917eb374de941fd09007608c239a348e7653b675
 
 python_version=3
 pycompile_dirs="/usr/share/cinnamon-screensaver"

From e160e1fe6ec6aa844a6dcfa86ed921f8323288cc Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:36 +0200
Subject: [PATCH 0424/3482] cinnamon-session: update to 4.8.0.

---
 srcpkgs/cinnamon-session/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index bd9d618653c2..c27272b802a3 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-session'
 pkgname=cinnamon-session
-version=4.6.2
-revision=2
+version=4.8.0
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dgconf=false"
@@ -16,4 +16,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-session"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0d4793d8fb828ce8ec6dbedc67a5d244e56d4182b83030d10029eadc0c6723e6
+checksum=66301a1eb748f646c419ced76f3388d8d6af0436716c737842cd85f359bd38d4

From 2849932e3d5c37691516d6de5a912bb958148db5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:42 +0200
Subject: [PATCH 0425/3482] cinnamon-settings-daemon: update to 4.8.5.

Fix homepage.
---
 srcpkgs/cinnamon-settings-daemon/template | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index a41b897347f7..2e5239c2c897 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,12 +1,11 @@
 # Template file for 'cinnamon-settings-daemon'
 pkgname=cinnamon-settings-daemon
-version=4.6.4
-revision=2
-build_style=gnu-configure
+version=4.8.5
+revision=1
+build_style=meson
 build_helper=gir
-configure_args="--disable-static --disable-schemas-compile"
-hostmakedepends="dbus-glib-devel gettext-devel glib-devel automake
- gobject-introspection intltool libtool pkg-config"
+hostmakedepends="dbus-glib-devel gettext-devel glib-devel
+ gobject-introspection intltool pkg-config"
 makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
  libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
  nss-devel polkit-devel pulseaudio-devel upower-devel"
@@ -14,13 +13,9 @@ depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Cinnamon Settings Daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-settings-daemon"
+homepage="https://github.com/linuxmint/cinnamon-settings-daemon"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=5c3d78c562f60cbd6348d1bbb3f7b0a98dbf0b483961b2f82f6b260b956d9db0
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=f2e770113230e04bb5fe887c33b725ac273dcac912a3825ab6b9c821ce92ff32
 
 do_check() {
 	:

From 43608e482fac18bfe66bddd29f6b6c2dd12dcbe5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:50 +0200
Subject: [PATCH 0426/3482] cinnamon-translations: update to 4.8.3.

---
 srcpkgs/cinnamon-translations/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 7c31bd54a00d..8c4f65b38121 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-translations'
 pkgname=cinnamon-translations
-version=4.6.2
-revision=2
+version=4.8.3
+revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext"
 short_desc="Translations for Cinnamon and Nemo"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://translations.launchpad.net/linuxmint/latest/"
 distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz"
-checksum=f79b818c3339dec395a8739ebfdb9079e236eeb9608768d76fecfe77dc231cb4
+checksum=272b4e128b352f8a877bb57eaa4ed85ff72ad1cb25c4c58c8a35d0b093908f93
 
 do_install() {
 	vmkdir usr

From e5ea05be7903a7633ce38a3cda8ec5ac74128833 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:39 +0200
Subject: [PATCH 0427/3482] cinnamon: update to 4.8.6.

Fix homepage.
---
 srcpkgs/cinnamon/template | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index c495532ae6b9..165458ac7da5 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,13 +1,11 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
-version=4.6.7
+version=4.8.6
 revision=1
 build_helper=gir
-build_style=gnu-configure
-configure_args="--disable-static --disable-schemas-compile
- --enable-compile-warnings=no --disable-gtk-doc"
-hostmakedepends="automake libtool pkg-config gobject-introspection gettext
- gettext-devel glib-devel intltool xmlto autoconf-archive gtk-doc"
+build_style=meson
+hostmakedepends="libtool pkg-config gobject-introspection gettext
+ gettext-devel glib-devel intltool xmlto gtk-doc"
 makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
  muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
  startup-notification-devel pulseaudio-devel dbus-glib-devel
@@ -24,10 +22,10 @@ depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
 short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
-changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog"
-distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=fcc6182a074b15d599dd53014086bb77b0bdceb3e667627e9125331f5ad0195e
+homepage="https://github.com/linuxmint/cinnamon"
+changelog="https://raw.githubusercontent.com/linuxmint/cinnamon/${version}/debian/changelog"
+distfiles="https://github.com/linuxmint/cinnamon/archive/${version}.tar.gz"
+checksum=00f82253f44c694c379e29959aa6e57b4878b722df1f08d68f9466272ef64893
 
 python_version=3
 pycompile_dirs="
@@ -45,7 +43,7 @@ pycompile_dirs="
 pre_configure() {
 	# Add polkit agent to required components
 	vsed -e '/RequiredComponents/s/$/polkit-gnome-authentication-agent-1;/' \
-		-i files/cinnamon2d.session.in files/cinnamon.session.in
+		-i cinnamon2d.session.in cinnamon.session.in
 
 	# Check for the cc-panel path, not for the unneeded binary
 	vsed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
@@ -56,6 +54,4 @@ pre_configure() {
 
 	# Remove broken symlink
 	rm -f files/etc/xdg/menus/cinnamon-applications-merged
-
-	NOCONFIGURE=1 ./autogen.sh
 }

From e1876b483ab00d29a951faa1972300ffe0d588cf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:04:27 +0200
Subject: [PATCH 0428/3482] xapps: update to 2.0.6.

Includes changes by @ndowens.

Closes: #26965 [via git-merge-pr]
---
 srcpkgs/xapps/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 1589440927ea..1824998fc756 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,13 +1,13 @@
 # Template file for 'xapps'
 pkgname=xapps
-version=1.8.10
+version=2.0.6
 revision=1
 wrksrc="xapp-${version}"
 build_style=meson
 build_helper="gir"
 hostmakedepends="glib-devel gnome-common pkg-config vala python3 gettext"
-makedepends="gettext-devel gobject-introspection libgnomekbd-devel
- python3-gobject-devel libdbusmenu-gtk3-devel"
+makedepends="gettext-devel libgnomekbd-devel python3-gobject-devel
+ libdbusmenu-gtk3-devel"
 depends="gist inxi xfconf"
 short_desc="Cross-desktop libraries and common resources from Linux Mint"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
@@ -15,12 +15,12 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://github.com/linuxmint/xapps"
 changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
 distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=a0d542de6dc4d6a318bdf1fad88447db270ab2dd0582f0c6f28008cc77337672
+checksum=4541a54760715f54fe6ab6174d4e040f5bfa3a0186b63836f2332a3ddfde3cc6
 
 xapps-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} libgnomekbd-devel libglib-devel
-	gdk-pixbuf-devel"
+	 gdk-pixbuf-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

From 447aeaced01ed51061139a3f76240ff57c9da9e0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:48 +0200
Subject: [PATCH 0429/3482] cjs: update to 4.8.2.

Fix homepage.
---
 srcpkgs/cjs/template | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index 309dab474389..fbf86ea36b64 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,28 +1,29 @@
 # Template file for 'cjs'
 pkgname=cjs
-version=4.6.0
+version=4.8.2
 revision=1
-build_style=gnu-configure
+build_style=meson
 build_helper=gir
-configure_args="--disable-static --disable-profiler"
-hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel dbus mozjs52-devel"
+# XXX: disable tests because they need dbus, X and GTK, same as gjs
+configure_args="-Dskip_dbus_tests=true -Dskip_gtk_tests=true
+ -Dprofiler=disabled -Dinstalled_tests=false"
+hostmakedepends="pkg-config gobject-introspection glib-devel dbus mozjs78-devel"
 makedepends="dbus-glib-devel readline-devel gobject-introspection
- gtk+3-devel mozjs52 mozjs52-devel"
+ gtk+3-devel mozjs78 mozjs78-devel"
 short_desc="Javascript for Cinnamon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
-homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
+homepage="https://github.com/linuxmint/cjs"
 distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
-checksum=47f8abb867881594766fec1398d1b9117012826c5e72ecafb3153a0c8226bf81
-
+checksum=c3248663e0084dbcee1bf4d1db56966c1321983617dbbec9b1253e50614a3f4e
 
+# The deleted lines in meson.build try to build and run a simple program,
+# and that does not work when cross-compiling.
 pre_configure() {
-	cp ${FILESDIR}/ax_code_coverage.m4 m4/
-
-	NOCONFIGURE=1 ./autogen.sh
+	vsed -e '/Check if a minimal SpiderMonkey program compiles/,/^endif/d' -i meson.build
 }
 
+
 cjs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From cd9eddf2884e9b7cff3dd269c5a1a0a4c611f45e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:58 +0200
Subject: [PATCH 0430/3482] muffin: update to 4.8.1.

Fix homepage.
---
 srcpkgs/muffin/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 2a014dd6d822..6c3d645ef6a9 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
 # Template file for 'muffin'
 pkgname=muffin
-version=4.6.3
+version=4.8.1
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -14,9 +14,9 @@ depends="zenity"
 short_desc="Cinnamon window manager based on Mutter"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
-distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e634209f1a1dfec7efc7c741e65014903ea937926070dba3793cac595df3d5a3
+homepage="https://github.com/linuxmint/muffin"
+distfiles="https://github.com/linuxmint/muffin/archive/${version}.tar.gz"
+checksum=d342165270690c8565004cd6aa26aa79620d99e442ee6207061c26a505690407
 shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
  libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
 
@@ -35,7 +35,6 @@ muffin-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
-		vmove "usr/lib/*.so"
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove usr/share/gir-1.0

From 29fa64d482eabc424fef48297f449ba6e1e53e0e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:04:15 +0200
Subject: [PATCH 0431/3482] nemo: update to 4.8.4.

Include changes by @ndowens.

Also by ericonr:
- fix names in .desktop file to differentiate between them
- fix homepage.
---
 srcpkgs/nemo/patches/fix-gir-path.patch | 11 -----------
 srcpkgs/nemo/template                   | 17 ++++++++---------
 2 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/nemo/patches/fix-gir-path.patch

diff --git a/srcpkgs/nemo/patches/fix-gir-path.patch b/srcpkgs/nemo/patches/fix-gir-path.patch
deleted file mode 100644
index 317b031af15f..000000000000
--- a/srcpkgs/nemo/patches/fix-gir-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libnemo-extension/meson.build
-+++ libnemo-extension/meson.build
-@@ -61,7 +61,7 @@
-   dependencies: nemo_extension_deps,
- )
- 
--typelibdir = go_intr.get_pkgconfig_variable('typelibdir', define_variable: ['libdir', get_option('libdir')])
-+typelibdir = go_intr.get_pkgconfig_variable('typelibdir')
- 
- gnome.generate_gir(nemo_extension_lib,
-   sources: nemo_extension_sources + nemo_extension_headers,
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index ef869db4d31a..e89c63f829b8 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo'
 pkgname=nemo
-version=4.6.5
+version=4.8.4
 revision=1
 build_style=meson
 build_helper=gir
@@ -12,21 +12,20 @@ depends="cinnamon-translations dconf gvfs"
 short_desc="Cinnamon file manager (nautilus fork)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
-distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=35f18063c4e9e0f94997454482553f48296eb97afe13bcbd56e99a87ea8eb78e
+homepage="https://github.com/linuxmint/nemo"
+distfiles="https://github.com/linuxmint/nemo/archive/${version}.tar.gz"
+checksum=089740d1a52a98e8bc0cda9d0512822e0b6b12d2a09c3d857b01a3232156f98a
 python_version=3
 
-
 do_check() {
 	:
-	# requires a display
-	# Gtk-WARNING **: 18:34:08.533: cannot open display:
+	# Requires xvfb-run and dbus-run-session;
+	# can't be run inside chroot due to fusermount3
 }
 
-pre_configure() {
+post_patch() {
 	# Rename 'Files' app name to avoid having the same as nautilus
-	sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
+	vsed -i 's/^Name.*=.*/& - Nemo/' data/nemo.desktop.in
 }
 
 libnemo_package() {

From 460da4b460731cd7aa9b56fc018ecb515feb2a13 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:04:20 +0200
Subject: [PATCH 0432/3482] nemo-fileroller: update to 4.8.0.

---
 srcpkgs/nemo-fileroller/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index e33cba72c749..62f53f6365d2 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,7 +1,7 @@
 # Template file for 'nemo-fileroller'
 pkgname=nemo-fileroller
-version=4.6.0
-revision=2
+version=4.8.0
+revision=1
 wrksrc="nemo-extensions-${version}"
 build_wrksrc=nemo-fileroller
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=f656a65ebb4454180f5dcddbb063c14410f38125151e762fc695993685d64edd
+checksum=1b7b85b41c659fe0f93a9b83fadb81a7934c7e7cb2df9eda4a03413b7f5d05c4
 
 pre_configure() {
 	autoreconf -fi

From 38ec09b42c7ed2ba12d63bf5060b55972846c0ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 19 Jan 2021 12:18:22 -0300
Subject: [PATCH 0433/3482] mozjs52: remove package.

---
 srcpkgs/mozjs52-devel                         |  1 -
 .../patches/mozjs52-copy-headers.patch        | 30 ---------
 .../patches/mozjs52-disable-mozglue.patch     | 66 ------------------
 .../mozjs52/patches/mozjs52-fix-soname.patch  | 34 ----------
 .../mozjs52-include-configure-script.patch    | 48 -------------
 srcpkgs/mozjs52/patches/mozjs52.pc.patch      |  8 ---
 srcpkgs/mozjs52/template                      | 67 -------------------
 srcpkgs/mozjs52/update                        |  1 -
 8 files changed, 255 deletions(-)
 delete mode 120000 srcpkgs/mozjs52-devel
 delete mode 100644 srcpkgs/mozjs52/patches/mozjs52-copy-headers.patch
 delete mode 100644 srcpkgs/mozjs52/patches/mozjs52-disable-mozglue.patch
 delete mode 100644 srcpkgs/mozjs52/patches/mozjs52-fix-soname.patch
 delete mode 100644 srcpkgs/mozjs52/patches/mozjs52-include-configure-script.patch
 delete mode 100644 srcpkgs/mozjs52/patches/mozjs52.pc.patch
 delete mode 100644 srcpkgs/mozjs52/template
 delete mode 100644 srcpkgs/mozjs52/update

diff --git a/srcpkgs/mozjs52-devel b/srcpkgs/mozjs52-devel
deleted file mode 120000
index c5eb332bc275..000000000000
--- a/srcpkgs/mozjs52-devel
+++ /dev/null
@@ -1 +0,0 @@
-mozjs52
\ No newline at end of file
diff --git a/srcpkgs/mozjs52/patches/mozjs52-copy-headers.patch b/srcpkgs/mozjs52/patches/mozjs52-copy-headers.patch
deleted file mode 100644
index 69b216151e0a..000000000000
--- a/srcpkgs/mozjs52/patches/mozjs52-copy-headers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8b2d7a77bfb4dbd513763501ed7e9722058ee9af Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 5 Jul 2017 22:45:59 -0700
-Subject: [PATCH] build: Copy headers on install instead of symlinking
-
-Patch ported forward to mozjs52 by Philip Chimento
-<philip.chimento@gmail.com>.
----
- python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
-index 132dcf94..33d489a6 100644
---- a/python/mozbuild/mozbuild/backend/recursivemake.py
-+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -1307,11 +1307,11 @@ def _process_final_target_files(self, obj, files, backend_file):
-                                 raise Exception("Wildcards are only supported in the filename part of "
-                                                 "srcdir-relative or absolute paths.")
- 
--                            install_manifest.add_pattern_symlink(basepath, wild, path)
-+                            install_manifest.add_pattern_copy(basepath, wild, path)
-                         else:
--                            install_manifest.add_pattern_symlink(f.srcdir, f, path)
-+                            install_manifest.add_pattern_copy(f.srcdir, f, path)
-                     else:
--                        install_manifest.add_symlink(f.full_path, dest)
-+                        install_manifest.add_copy(f.full_path, dest)
-                 else:
-                     install_manifest.add_optional_exists(dest)
-                     backend_file.write('%s_FILES += %s\n' % (
diff --git a/srcpkgs/mozjs52/patches/mozjs52-disable-mozglue.patch b/srcpkgs/mozjs52/patches/mozjs52-disable-mozglue.patch
deleted file mode 100644
index 8355cf4b0ea7..000000000000
--- a/srcpkgs/mozjs52/patches/mozjs52-disable-mozglue.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 7e6d628456af3e99ebcb9a01a27e1461585082a4 Mon Sep 17 00:00:00 2001
-From: Till Schneidereit <till@tillschneidereit.net>
-Date: Thu, 1 Oct 2015 12:59:09 +0200
-Subject: [PATCH] Disable MOZ_GLUE_IN_PROGRAM in stand-alone builds on all
- platforms
-
-Otherwise, build fails not being able to find HashBytes.
-
-Patch ported forward to mozjs52 by Philip Chimento
-<philip.chimento@gmail.com>.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1176787
----
- js/src/old-configure.in | 23 ++++++++++++++---------
- mozglue/build/moz.build |  2 +-
- 2 files changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
-index 1c5c9e21..ff0617e3 100644
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -1623,16 +1623,21 @@ dnl ========================================================
- dnl = Enable jemalloc
- dnl ========================================================
- 
--case "${OS_TARGET}" in
--Android|WINNT|Darwin)
-+dnl In stand-alone builds we always only want to link executables against mozglue.
-+if test "$JS_STANDALONE"; then
-   MOZ_GLUE_IN_PROGRAM=
--  ;;
--*)
--  dnl On !Android !Windows !OSX, we only want to link executables against mozglue
--  MOZ_GLUE_IN_PROGRAM=1
--  AC_DEFINE(MOZ_GLUE_IN_PROGRAM)
--  ;;
--esac
-+else
-+  case "${OS_TARGET}" in
-+  Android|WINNT|Darwin)
-+    MOZ_GLUE_IN_PROGRAM=
-+    ;;
-+  *)
-+    dnl On !Android !Windows !OSX, we only want to link executables against mozglue
-+    MOZ_GLUE_IN_PROGRAM=1
-+    AC_DEFINE(MOZ_GLUE_IN_PROGRAM)
-+    ;;
-+  esac
-+fi
- 
- if test "$MOZ_MEMORY"; then
-   if test "x$MOZ_DEBUG" = "x1"; then
-diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
-index d2897477..e3be5a2b 100644
---- a/mozglue/build/moz.build
-+++ b/mozglue/build/moz.build
-@@ -6,7 +6,7 @@
- 
- # Build mozglue as a shared lib on Windows, OSX and Android.
- # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in
--if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'):
-+if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') and not CONFIG['JS_STANDALONE']:
-     SharedLibrary('mozglue')
- else:
-     Library('mozglue')
-
diff --git a/srcpkgs/mozjs52/patches/mozjs52-fix-soname.patch b/srcpkgs/mozjs52/patches/mozjs52-fix-soname.patch
deleted file mode 100644
index a91107c1568b..000000000000
--- a/srcpkgs/mozjs52/patches/mozjs52-fix-soname.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Laszlo Boszormenyi (GCS) <gcs@debian.org>
-Date: Fri, 02 May 2014 22:20:45 +0200
-Subject: fix soname
-
-Add soname switch to linker, regardless of Operating System
-
-Bug-Debian: http://bugs.debian.org/746705
----
- config/rules.mk | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Index: mozjs52-52.2.1~artful1/config/rules.mk
-===================================================================
---- mozjs52-52.2.1~artful1.orig/config/rules.mk
-+++ mozjs52-52.2.1~artful1/config/rules.mk
-@@ -418,7 +418,7 @@ endif # AIX
- #
- # Linux: add -Bsymbolic flag for components
- #
--ifeq ($(OS_ARCH),Linux)
-+#ifeq ($(OS_ARCH),Linux)
- ifdef IS_COMPONENT
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
- endif
-@@ -426,7 +426,8 @@ ifdef LD_VERSION_SCRIPT
- EXTRA_DSO_LDOPTS += -Wl,--version-script,$(LD_VERSION_SCRIPT)
- EXTRA_DEPS += $(LD_VERSION_SCRIPT)
- endif
--endif
-+#endif
-+EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0
- 
- ifdef SYMBOLS_FILE
- ifeq ($(OS_TARGET),WINNT)
diff --git a/srcpkgs/mozjs52/patches/mozjs52-include-configure-script.patch b/srcpkgs/mozjs52/patches/mozjs52-include-configure-script.patch
deleted file mode 100644
index c24d7b157f3b..000000000000
--- a/srcpkgs/mozjs52/patches/mozjs52-include-configure-script.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 4a06a1a6a71293decb83aee7adb74bc709493106 Mon Sep 17 00:00:00 2001
-From: Philip Chimento <philip.chimento@gmail.com>
-Date: Wed, 5 Jul 2017 22:57:09 -0700
-Subject: [PATCH] build: Include configure script, be nicer about options
-
-A configure script is not included in the SpiderMonkey tarball by
-default. Also, we have to account for JHbuild passing extra unknown
-options like --disable-Werror.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1379540
----
- js/src/configure                               | 9 +++++++++
- python/mozbuild/mozbuild/configure/__init__.py | 2 +-
- python/mozbuild/mozbuild/configure/options.py  | 6 +++++-
- 3 files changed, 15 insertions(+), 2 deletions(-)
- create mode 100755 js/src/configure
-
-diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py
-index 0fe640ca..09b460d3 100644
---- a/python/mozbuild/mozbuild/configure/__init__.py
-+++ b/python/mozbuild/mozbuild/configure/__init__.py
-@@ -356,7 +356,7 @@ def run(self, path=None):
-         # All options should have been removed (handled) by now.
-         for arg in self._helper:
-             without_value = arg.split('=', 1)[0]
--            raise InvalidOptionError('Unknown option: %s' % without_value)
-+            print('Ignoring', without_value, ': Unknown option')
- 
-         # Run the execution queue
-         for func, args in self._execution_queue:
-diff --git a/python/mozbuild/mozbuild/configure/options.py b/python/mozbuild/mozbuild/configure/options.py
-index 4310c862..15bfe425 100644
---- a/python/mozbuild/mozbuild/configure/options.py
-+++ b/python/mozbuild/mozbuild/configure/options.py
-@@ -402,7 +402,11 @@ def __init__(self, environ=os.environ, argv=sys.argv):
- 
-     def add(self, arg, origin='command-line', args=None):
-         assert origin != 'default'
--        prefix, name, values = Option.split_option(arg)
-+        try:
-+            prefix, name, values = Option.split_option(arg)
-+        except InvalidOptionError as e:
-+            print('Ignoring', arg, ':', e)
-+            return
-         if args is None:
-             args = self._extra_args
-         if args is self._extra_args and name in self._extra_args:
-
diff --git a/srcpkgs/mozjs52/patches/mozjs52.pc.patch b/srcpkgs/mozjs52/patches/mozjs52.pc.patch
deleted file mode 100644
index 6d85bb05f4ef..000000000000
--- a/srcpkgs/mozjs52/patches/mozjs52.pc.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/js/src/js.pc.in
-+++ b/js/src/js.pc.in
-@@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript
- Version: @MOZILLA_VERSION@
- @PKGCONF_REQUIRES_PRIVATE@
- Libs: -L${libdir} -l@JS_LIBRARY_NAME@
--Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@
-+Cflags: -include ${pc_sysrootdir}${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@
diff --git a/srcpkgs/mozjs52/template b/srcpkgs/mozjs52/template
deleted file mode 100644
index 383767ea7778..000000000000
--- a/srcpkgs/mozjs52/template
+++ /dev/null
@@ -1,67 +0,0 @@
-# Template file for 'mozjs52'
-pkgname=mozjs52
-version=52.9.0
-revision=7
-wrksrc="firefox-${version}esr"
-build_wrksrc="js/src"
-build_style=gnu-configure
-hostmakedepends="perl python pkg-config automake autoconf213 autoconf-archive which"
-makedepends="icu-devel libffi-devel nspr-devel zlib-devel readline-devel"
-depends="nspr>=4.13.1"
-short_desc="Mozilla JavaScript interpreter and library (52.x series)"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MPL-2.0"
-homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=c01d09658c53c1b3a496e353a24dad03b26b81d3b1d099abc26a06f81c199dd6
-patch_args="-Np1"
-
-# Flags for gcc6.3 conceived by Arch Linux developers
-CFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing"
-CXXFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing"
-# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl
-LDFLAGS="-fuse-ld=bfd"
-# Flags for gcc9.1
-CFLAGS+=" -Wno-format-overflow"
-CXXFLAGS+=" -Wno-format-overflow"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	LDFLAGS+=" -latomic"
-fi
-
-do_configure() {
-	local _args
-
-	if [ "$CROSS_BUILD" ]; then
-		export HOST_CFLAGS="-Os"
-		export HOST_CXXFLAGS="-Os"
-		_args+=" --target=$XBPS_CROSS_TRIPLET"
-	fi
-
-	touch ${wrksrc}/js/src/configure
-	SHELL=/bin/bash PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-		--disable-jemalloc --disable-optimize --enable-ctypes \
-		--enable-gcgenerational --enable-pie --enable-readline \
-		--enable-shared-js --enable-system-ffi --enable-tests \
-		--enable-threadsafe --enable-xterm-updates --with-intl-api \
-		--with-system-icu --with-system-nspr --with-system-zlib \
-		${_args}
-}
-
-post_install() {
-	mv $DESTDIR/usr/lib/libmozjs-52.so $DESTDIR/usr/lib/libmozjs-52.so.0
-	ln -sr $DESTDIR/usr/lib/libmozjs-52.so.0 $DESTDIR/usr/lib/libmozjs-52.so
-}
-
-mozjs52-devel_package() {
-	depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/js52-config
-		vmove usr/include
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.ajs"
-		vmove usr/lib/pkgconfig
-	}
-}
diff --git a/srcpkgs/mozjs52/update b/srcpkgs/mozjs52/update
deleted file mode 100644
index a1c3f7e43b0d..000000000000
--- a/srcpkgs/mozjs52/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="mozjs"

From ad8cdd09d7eae0e8338c0ce926c9c91397463b1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 18:11:07 -0300
Subject: [PATCH 0434/3482] mozjs52: complete removal.

- remove from common/shlibs; also remove mozjs24 entry
- add to removed-packages
---
 common/shlibs                     | 3 ---
 srcpkgs/removed-packages/template | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4d393eac6042..979daeddbf1d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1594,7 +1594,6 @@ libwx_gtk2u_ribbon-3.0.so.0 wxWidgets-3.0.0_1
 libwx_gtk2u_media-3.0.so.0 wxWidgets-3.0.1_1
 libmspack.so.0 libmspack-0.4alpha_1
 libslim.so.1.3.6 slim-1.3.6_1
-libmozjs-24.so mozjs24-24.2.0_1
 libmediaart-2.0.so.0 libmediaart-1.9.1_1
 libinput.so.10 libinput-1.2.0_1
 libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1
@@ -3144,8 +3143,6 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libmozjs-52.so mozjs52-52.3.0_1
-libmozjs-52.so.0 mozjs52-52.3.0_1
 libvala-0.50.so.0 libvala-0.50.0_1
 libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index adc3b867bb6d..7fa5d31e3490 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -51,6 +51,7 @@ replaces="
  mdds0<=0.12.1_3
  mirrorbits<=0.5.1_1
  mongroup<=0.4.1_2
+ mozjs52<=52.9.0_7
  phonon-backend-gstreamer<=4.9.0_2
  phonon-backend-vlc<=0.9.1_3
  polkit-qt<=0.112.0_5

From ce0dfcb893951fc38ffb381aa2add86c093402de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 18:38:27 -0300
Subject: [PATCH 0435/3482] polari: use mozjs78 for tests.

---
 srcpkgs/polari/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index f2f80a2e541b..ec3693879976 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config itstool gobject-introspection gettext"
 makedepends="gjs-devel gspell-devel gtk+3-devel libsecret-devel
  libsoup-gnome-devel telepathy-glib-devel telepathy-logger-devel"
 depends="gspell telepathy-idle telepathy-logger telepathy-mission-control"
-checkdepends="appstream-glib desktop-file-utils mozjs60"
+checkdepends="appstream-glib desktop-file-utils mozjs78"
 short_desc="GNOME IRC client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From b4f67689a1455dcf3f8ac061214d77ddf8a634a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 24 Jan 2021 22:49:41 +0100
Subject: [PATCH 0436/3482] autoconf_cache/common-glibc: remove *sys_siglist
 entries, removed with glibc 2.32

---
 common/environment/configure/autoconf_cache/common-glibc | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/common/environment/configure/autoconf_cache/common-glibc b/common/environment/configure/autoconf_cache/common-glibc
index fb862cbd94a9..9823c537900c 100644
--- a/common/environment/configure/autoconf_cache/common-glibc
+++ b/common/environment/configure/autoconf_cache/common-glibc
@@ -1,10 +1,3 @@
-# general
-ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes}
-
-# bash
-bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes}
-bash_cv_sys_siglist=${bash_cv_sys_siglist=yes}
-
 # clamav
 clamav_av_func_working_snprintf_long=${clamav_av_func_working_snprintf_long=yes}
 clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes}

From e302ebd2a2c54afcb60739efde7c08e66e581814 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 24 Jan 2021 23:32:36 +0000
Subject: [PATCH 0437/3482] terraform: update to 0.14.5.

---
 srcpkgs/terraform/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 788b4b2c78d0..0bf22d7f0a04 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=0.14.4
+version=0.14.5
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=56da03b95c62c849adf5c5397ae4bc3b8cad2ca4ffb26244d3daf90567208e63
+checksum=bf4e60f5da3f2d461d730ddc4d34ee9cc7ab57f29c22bdd518c7267697f30e50

From 05fb5041805a9235ea948705986265a7fdc2a49a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 24 Jan 2021 23:39:15 +0000
Subject: [PATCH 0438/3482] go-jira: update to 1.0.27.

---
 srcpkgs/go-jira/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template
index 898dcf8672b2..b785d8a03a90 100644
--- a/srcpkgs/go-jira/template
+++ b/srcpkgs/go-jira/template
@@ -1,6 +1,6 @@
 # Template file for 'go-jira'
 pkgname=go-jira
-version=1.0.26
+version=1.0.27
 revision=1
 wrksrc="jira-${version}"
 build_style=go
@@ -12,4 +12,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://$go_import_path"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=306e58e5affa231e84b35ff965b3c359adb4bc853054b3bde9f80b8f07cee80b
+checksum=c5bcf7b61300b67a8f4e42ab60e462204130c352050e8551b1c23ab2ecafefc7

From d65422288d8f7882da8caadd2a9cc307a453e7c3 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 24 Jan 2021 23:40:41 +0000
Subject: [PATCH 0439/3482] docker: update to 19.03.14.

---
 srcpkgs/docker/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 823d471d2144..16af17ca4fb3 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,6 +1,6 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.13
+version=19.03.14
 revision=1
 create_wrksrc=yes
 build_style=go
@@ -20,9 +20,9 @@ distfiles="
  https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
  https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
  https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="b2ff08675738031b6d6d59a90226657c16726851957c11b5fb85a4598b933b92
+checksum="0b8838b0da1f1368fc1a0809a2ed11840bd7d58df1f090e668de209faddcef7c
  1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- a5e190a5acd6f20a2eb73a0b083d9ba1279ac1cc97a93c66cdecf3c40e0e384a"
+ 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
 
 
 # These are required at run-time.

From 4723ce4d1c50cf72090a24c39f10ddad91ccd057 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 24 Jan 2021 23:47:38 +0000
Subject: [PATCH 0440/3482] yoshimi: update to 1.7.4.

---
 srcpkgs/yoshimi/patches/fix-lv2-1.18.0.patch | 43 --------------------
 srcpkgs/yoshimi/template                     |  4 +-
 2 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/yoshimi/patches/fix-lv2-1.18.0.patch

diff --git a/srcpkgs/yoshimi/patches/fix-lv2-1.18.0.patch b/srcpkgs/yoshimi/patches/fix-lv2-1.18.0.patch
deleted file mode 100644
index 6e0b811ec6df..000000000000
--- a/srcpkgs/yoshimi/patches/fix-lv2-1.18.0.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/LV2_Plugin/YoshimiLV2Plugin.h	2020-04-20 11:31:08.000000000 +0200
-+++ src/LV2_Plugin/YoshimiLV2Plugin.h	2020-12-27 09:24:22.402582559 +0100
-@@ -106,7 +106,7 @@
-    virtual void registerAudioPort(int) {}
- 
-    //static methods
--   static LV2_Handle	instantiate (const struct _LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features);
-+   static LV2_Handle	instantiate (const struct LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features);
-    static void connect_port(LV2_Handle instance, uint32_t port, void *data_location);
-    static void activate(LV2_Handle instance);
-    static void deactivate(LV2_Handle instance);
-@@ -159,7 +159,7 @@
-     YoshimiLV2PluginUI(const char *, LV2UI_Write_Function, LV2UI_Controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
-     ~YoshimiLV2PluginUI();
-     bool init();
--    static LV2UI_Handle	instantiate(const struct _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
-+    static LV2UI_Handle	instantiate(const struct LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
-     static void cleanup(LV2UI_Handle ui);
-     static void static_guiClosed(void *arg);
-     void run();
---- src/LV2_Plugin/YoshimiLV2Plugin.cpp	2020-04-20 11:31:08.000000000 +0200
-+++ src/LV2_Plugin/YoshimiLV2Plugin.cpp	2020-12-27 09:27:36.598189783 +0100
-@@ -378,7 +378,7 @@
- }
- 
- 
--LV2_Handle	YoshimiLV2Plugin::instantiate (const struct _LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features)
-+LV2_Handle	YoshimiLV2Plugin::instantiate (const struct LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features)
- {
-     SynthEngine *synth = new SynthEngine(0, NULL, true);
-     if (synth == NULL || !synth->getRuntime().isRuntimeSetupCompleted()){
-@@ -711,9 +711,9 @@
- }
- 
- 
--LV2UI_Handle YoshimiLV2PluginUI::instantiate(const _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features)
-+LV2UI_Handle YoshimiLV2PluginUI::instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features)
- {
--    const _LV2UI_Descriptor *desc = descriptor;
-+    const LV2UI_Descriptor *desc = descriptor;
-     descriptor = desc;
-     const char *plug = plugin_uri;
-     plugin_uri = plug;
diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template
index 5d198fee6381..1c4bcb519495 100644
--- a/srcpkgs/yoshimi/template
+++ b/srcpkgs/yoshimi/template
@@ -1,6 +1,6 @@
 # Template file for 'yoshimi'
 pkgname=yoshimi
-version=1.7.1
+version=1.7.4
 revision=1
 build_wrksrc=src
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://yoshimi.github.io/"
 distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz"
-checksum=b75560761d7abebf7e901bd2b0dd1f55650cab2c3ff551f7e4820425ce325c28
+checksum=27a8e33bda72aafae604e14841bed6373fc9e00ff70c98f1e13215d6a8808318
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone";;

From da2d9c905537374fbad716eda17c9b6a45905b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 23 Jan 2021 12:17:04 +0700
Subject: [PATCH 0441/3482] fwupd: update to 1.5.5.

---
 srcpkgs/fwupd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index f5302a83261c..78e80957ef93 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.5.2
+version=1.5.5
 revision=1
 build_style=meson
 build_helper="gir"
@@ -27,7 +27,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/fwupd"
 distfiles="https://github.com/hughsie/fwupd/archive/${version}.tar.gz"
-checksum=bc7a1eb5e494810e2622442c2942b1a06d926c906db3b2612c3e8c892806ff56
+checksum=1a6d5026ae37708718b7c0bb277050c96934acb636605f1c0295eba8ff627ea3
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in

From ae14915b51079ec175a79e5a4db441fe46b74f73 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 00:22:17 +0000
Subject: [PATCH 0442/3482] rng-tools: update to 6.11.

---
 ...-configure-ac-fix-with-rtlsdr-option.patch | 27 ----------
 ..._jitter-disambiguate-call-to-encrypt.patch | 51 -------------------
 ...move-name-conflict-with-libc-encrypt.patch | 42 ---------------
 ...igure-ac-jitterentropy-needs-pthread.patch | 15 ------
 srcpkgs/rng-tools/template                    |  6 +--
 5 files changed, 3 insertions(+), 138 deletions(-)
 delete mode 100644 srcpkgs/rng-tools/patches/0001-configure-ac-fix-with-rtlsdr-option.patch
 delete mode 100644 srcpkgs/rng-tools/patches/0002-rngd_jitter-disambiguate-call-to-encrypt.patch
 delete mode 100644 srcpkgs/rng-tools/patches/0003-remove-name-conflict-with-libc-encrypt.patch
 delete mode 100644 srcpkgs/rng-tools/patches/0004-configure-ac-jitterentropy-needs-pthread.patch

diff --git a/srcpkgs/rng-tools/patches/0001-configure-ac-fix-with-rtlsdr-option.patch b/srcpkgs/rng-tools/patches/0001-configure-ac-fix-with-rtlsdr-option.patch
deleted file mode 100644
index 840906e9c15c..000000000000
--- a/srcpkgs/rng-tools/patches/0001-configure-ac-fix-with-rtlsdr-option.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-upstream: yes
-
-From 45a8c51a20a518ed78c5ea1829a307c045f737be Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Fri, 27 Mar 2020 22:19:42 +0100
-Subject: [PATCH] configure.ac: fix --with-rtlsdr option
-
-Add missing ',' to allow the user to explicitly disable or enable rtlsdr
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index ba796f8..1f55052 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -43,7 +43,7 @@ AC_ARG_WITH([pkcs11],
- 
- AC_ARG_WITH([rtlsdr],
- 	AS_HELP_STRING([--without-rtlsdr],
--		[Disable rtlsdr support. ])
-+		[Disable rtlsdr support. ]),
- 	[],
- 	[with_rtlsdr=no]
- )
diff --git a/srcpkgs/rng-tools/patches/0002-rngd_jitter-disambiguate-call-to-encrypt.patch b/srcpkgs/rng-tools/patches/0002-rngd_jitter-disambiguate-call-to-encrypt.patch
deleted file mode 100644
index e3b549405241..000000000000
--- a/srcpkgs/rng-tools/patches/0002-rngd_jitter-disambiguate-call-to-encrypt.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-upstream: yes
-
-From dab16a5fd4efde8ef569b358e19b1fcbc7d0d938 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 30 Mar 2020 00:10:46 +0200
-Subject: [PATCH] rngd_jitter: disambiguate call to encrypt
-
-Commit 0f184ea7e792427fb20afe81d471b565aee96f0b disambiguate the call to
-encrypt in rngd_rdrand.c but did not update rngd_jitter.c.
-
-This raise the following build failure:
-
-rngd_jitter.c:75:12: error: conflicting types for 'encrypt'
- static int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
-            ^~~~~~~
-In file included from rngd_jitter.c:27:
-/home/dawncrow/buildroot-test/scripts/instance-0/output-1/host/powerpc-buildroot-linux-uclibc/sysroot/usr/include/unistd.h:1132:13: note: previous declaration of 'encrypt' was here
- extern void encrypt (char *__block, int __edflag) __THROW __nonnull ((1));
-             ^~~~~~~
-Makefile:770: recipe for target 'rngd-rngd_jitter.o' failed
-
-Fixes:
- - http://autobuild.buildroot.org/results/0ca6bf16e3acbc94065b88c4442d6595424b77cb
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- rngd_jitter.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/rngd_jitter.c b/rngd_jitter.c
-index c1b1aca..49a3825 100644
---- a/rngd_jitter.c
-+++ b/rngd_jitter.c
-@@ -72,7 +72,7 @@ unsigned char *aes_buf;
- char key[AES_BLOCK];
- static unsigned char iv_buf[CHUNK_SIZE] __attribute__((aligned(128)));
- 
--static int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
-+static int osslencrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
-             unsigned char *iv, unsigned char *ciphertext)
- {
-         EVP_CIPHER_CTX *ctx;
-@@ -122,7 +122,7 @@ static inline int openssl_mangle(unsigned char *tmp, struct rng *ent_src)
-         unsigned char ciphertext[CHUNK_SIZE * RDRAND_ROUNDS];
- 
-         /* Encrypt the plaintext */
--        ciphertext_len = encrypt (tmp, strlen(tmp), key, iv_buf,
-+        ciphertext_len = osslencrypt (tmp, strlen(tmp), key, iv_buf,
-                               ciphertext);
-         if (!ciphertext_len)
-                 return -1;
diff --git a/srcpkgs/rng-tools/patches/0003-remove-name-conflict-with-libc-encrypt.patch b/srcpkgs/rng-tools/patches/0003-remove-name-conflict-with-libc-encrypt.patch
deleted file mode 100644
index 71c506ee38cc..000000000000
--- a/srcpkgs/rng-tools/patches/0003-remove-name-conflict-with-libc-encrypt.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-upstream: yes
-
-From a4b6d9ce64f132e463b9091d0536913ddaf11516 Mon Sep 17 00:00:00 2001
-From: Neil Horman <nhorman@tuxdriver.com>
-Date: Thu, 30 Apr 2020 16:57:35 -0400
-Subject: [PATCH] Remove name conflict with libc encrypt
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Forgot to fixup the funciton name conflict with libcs encrypt() function
-on power systems
-
-Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
-Reported-by: Natanael Copa <ncopa@alpinelinux.org>
-Reported-by: "Milan P. Stanić" <mps@arvanta.net>
----
- rngd_darn.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/rngd_darn.c b/rngd_darn.c
-index 35df7a1..9345895 100644
---- a/rngd_darn.c
-+++ b/rngd_darn.c
-@@ -109,7 +109,7 @@ static int init_openssl(struct rng *ent_src)
- 	return 0;
- }
- 
--int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
-+static int osslencrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
-             unsigned char *iv, unsigned char *ciphertext)
- {
-         int len;
-@@ -150,7 +150,7 @@ static inline int openssl_mangle(unsigned char *tmp, struct rng *ent_src)
-         unsigned char ciphertext[CHUNK_SIZE * RDRAND_ROUNDS];
- 
-         /* Encrypt the plaintext */
--        ciphertext_len = encrypt (tmp, strlen(tmp), key, iv_buf,
-+        ciphertext_len = osslencrypt (tmp, strlen(tmp), key, iv_buf,
-                               ciphertext);
-         printf("Calling mangle with len %d\n", ciphertext_len);
-         if (!ciphertext_len)
diff --git a/srcpkgs/rng-tools/patches/0004-configure-ac-jitterentropy-needs-pthread.patch b/srcpkgs/rng-tools/patches/0004-configure-ac-jitterentropy-needs-pthread.patch
deleted file mode 100644
index 4e9147b3b5e0..000000000000
--- a/srcpkgs/rng-tools/patches/0004-configure-ac-jitterentropy-needs-pthread.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-New jitterentropy library broke configure. This patch fixes it.
-
-Upstream patch: https://github.com/nhorman/rng-tools/commit/daff4e2dd9d3abb74829f41e72607681163bd309
-
---- a/configure.ac	2020-12-03 20:59:11.086238518 +0100
-+++ b/configure.ac	2020-12-03 21:00:40.978593727 +0100
-@@ -91,7 +91,7 @@
- 		AC_SEARCH_LIBS(jent_version,jitterentropy,
- 				[AM_CONDITIONAL([JITTER], [true])
- 				AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])],
--				AC_MSG_NOTICE([No Jitterentropy library found]))
-+				AC_MSG_NOTICE([No Jitterentropy library found]),-lpthread)
- 	], [AC_MSG_NOTICE([Disabling JITTER entropy source])]
- )
- 
diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 57f9cb42cf38..8f8c9dc47480 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
-version=6.10
-revision=4
+version=6.11
+revision=1
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/nhorman/rng-tools"
 distfiles="https://github.com/nhorman/rng-tools/archive/v${version}.tar.gz"
-checksum=2e462821aaa7d6dc24646aa0d2239d97cb8b07b3e60715159a9edcaa9189f8ef
+checksum=644d8bd4e84cee29debddc7e6db72aff27e628e5a879ce310562edf50f12be41
 patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in

From c1fa95a097f44ae517541fc26f6310bb1f6320de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 08:56:55 +0700
Subject: [PATCH 0443/3482] common: fix exit status of uname wrapper

---
 common/wrappers/uname.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/wrappers/uname.sh b/common/wrappers/uname.sh
index 723e3c884a48..4edca2548a64 100644
--- a/common/wrappers/uname.sh
+++ b/common/wrappers/uname.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
 uname=$(/usr/bin/uname $@)
+rv=$?
 uname_m=$(/usr/bin/uname -m)
 arch=${XBPS_ARCH%-musl}
 # if XBPS_ARCH was reseted by `env -i` use original `/usr/bin/uname -m`
 : ${arch:=$uname_m}
-rv=$?
 echo "$uname" |
 	sed "s/\(^\| \)$(/usr/bin/uname -n)\($\| \)/\1void\2/" |
 	sed "s/$uname_m/$arch/"

From 14db3cb0d0f1338c6ed1d75161bb262d2508f0a2 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 00:24:29 +0000
Subject: [PATCH 0444/3482] racket: update to 7.9.

---
 srcpkgs/racket/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 85374e7c62f4..6415cf6d1ef6 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,7 +1,7 @@
 # Template file for 'racket'
 pkgname=racket
-version=7.7
-revision=3
+version=7.9
+revision=1
 build_wrksrc=src
 build_style=gnu-configure
 configure_args="--enable-useprefix --disable-docs"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-3.0-only, MIT"
 homepage="http://racket-lang.org/"
 distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
-checksum=62659f42b059d028b37874a5ddd56a69057b1895e37e2c08590c150be680a533
+checksum=5578942066a9405fdbcad9522d08685356693f4ddd5dbe92b5273557a112b73e
 nostrip=yes
 
 if [ "$CROSS_BUILD" ]; then

From 8dc570d5be3928131261317da7204f41fbc3f593 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 01:28:22 +0100
Subject: [PATCH 0445/3482] kubernetes: update to 1.20.2.

---
 srcpkgs/kubernetes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 694416cdd5a3..93d1c1bc3993 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.19.3
+version=1.20.2
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=36aef9c98262596ae4145603150eb8ebb0d514288d138fd45287fa5e8e272033
+checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"

From 260a2d21dff3bad3191bd2ebf01fd46200aa1354 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 03:02:34 +0100
Subject: [PATCH 0446/3482] libguestfs: update to 1.44.0.

---
 srcpkgs/libguestfs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 84a63da5de56..198a4519b053 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
-version=1.42.0
-revision=5
+version=1.44.0
+revision=1
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"
@@ -22,7 +22,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license=" GPL-2.0-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${_version_short}-stable/${pkgname}-${version}.tar.gz"
-checksum=4fee192cf3aaa597f142afb21fa2d7f380fdabcf34d054e37090163e4a74f024
+checksum=0ec7b44a4c50e928583c56099da31ceb9680766043bd7d468f3ca7b741c55d21
 
 conf_files="etc/libguestfs-tools.conf
  etc/xdg/virt-builder/repos.d/libguestfs.conf

From 090a5ae99f066bd151ea095cbe3517dd713ccbb1 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 08:48:10 +0000
Subject: [PATCH 0447/3482] mkinitcpio: update to 29.

---
 srcpkgs/mkinitcpio/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index f3a1053ef6bc..67b3cff04f10 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,15 +1,16 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
-version=28
-revision=2
+version=29
+revision=1
 build_style=gnu-makefile
+hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"
 short_desc="Next generation of initramfs creation"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-only"
 homepage="https://wiki.archlinux.org/index.php/Mkinitcpio"
 distfiles="https://sources.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bf83a158786d272d8046a4dd48bfcc343ec37de2cae0ae65c59132a45744808c
+checksum=0239ba7ae91d652472819457a5dd812c574ba37c3c3d9161e7742a63b85076c2
 
 conf_files="/etc/mkinitcpio.conf"
 

From 7b044d4716fb2633995bf47b8f5bca12f45db287 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 09:31:03 +0100
Subject: [PATCH 0448/3482] ispc: update to 1.15.0.

---
 srcpkgs/ispc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ispc/template b/srcpkgs/ispc/template
index 054e3a1523d2..df840333a006 100644
--- a/srcpkgs/ispc/template
+++ b/srcpkgs/ispc/template
@@ -1,18 +1,18 @@
 # Template file for 'ispc'
 pkgname=ispc
-version=1.14.1
-revision=2
+version=1.15.0
+revision=1
 archs="x86_64*"
 build_style=cmake
 configure_args="-DISPC_NO_DUMPS=ON -DARM_ENABLED=OFF"
 hostmakedepends="clang clang-tools-extra python3 m4 bison flex llvm"
-makedepends="ncurses-devel zlib-devel"
+makedepends="ncurses-devel ncurses-libtinfo-devel zlib-devel"
 short_desc="Compiler for high-performance SIMD programming on the CPU"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-3-Clause"
 homepage="https://ispc.github.io"
 distfiles="https://github.com/ispc/ispc/archive/v${version}.tar.gz"
-checksum=3a7ee9ab90b9e9932b7b4effc9bb3ef45ca271d60d9ec6bc8c335242b5ec097b
+checksum=2658ff00dc045ac9fcefbf6bd26dffaf723b059a942a27df91bbb61bc503a285
 patch_args="-p1"
 nocross=yes
 nopie=yes

From 16e2016ccc67089119fb0307bd19cfe33dd67149 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 09:53:57 +0100
Subject: [PATCH 0449/3482] hopper: update to 4.7.1.

---
 srcpkgs/hopper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 1db801b8f4fa..1d86b0dda2e3 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.5.29
+version=4.7.1
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=f01b1439f4561bb18dc49804ebe3df56b6b6859eed529b379c81ece88a7337ec
+checksum=24b46252cf29f8096cdf802731e2935fcdf1bfc1a0eec21dc1fba6f0c823f0d7
 
 archs="x86_64"
 restricted=yes

From 70ed9c137142af4dbb8a7d248adc05eba769abd8 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 10:12:07 +0100
Subject: [PATCH 0450/3482] thermald: update to 2.4.1.

---
 srcpkgs/thermald/patches/musl.patch | 14 --------------
 srcpkgs/thermald/template           |  8 ++++----
 2 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/thermald/patches/musl.patch

diff --git a/srcpkgs/thermald/patches/musl.patch b/srcpkgs/thermald/patches/musl.patch
deleted file mode 100644
index 4f33f846eb0e..000000000000
--- a/srcpkgs/thermald/patches/musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git Makefile.am Makefile.am
-index 68c89d0..403407d 100644
---- Makefile.am
-+++ Makefile.am
-@@ -23,7 +23,8 @@ AM_CXXFLAGS = ${DBUS_CFLAGS}\
- 		-Wmissing-field-initializers\
- 		-Wtype-limits\
- 		-Wuninitialized\
--		-Werror
-+		-Werror\
-+		-Wno-error=cpp
- 
- EXTRA_DIST=Makefile.glib \
- 	thermald.pc.in
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 83300cdf75d3..af5821b77e76 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,19 +1,19 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=1.9.1
+version=2.4.1
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-configure
-hostmakedepends="automake pkg-config glib-devel"
-makedepends="dbus-glib-devel libxml2-devel libglib-devel libgomp-devel"
+hostmakedepends="automake pkg-config glib-devel gtk-doc autoconf-archive"
+makedepends="dbus-glib-devel libxml2-devel libglib-devel libgomp-devel upower-devel libevdev-devel"
 short_desc="Linux Thermal Daemon program from 01.org"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=aaf5ffdc12344eef2417b41b433094bb30e4ebf321f0140b090f97bfcf24ea1f
+checksum=7dc5c4e850a044f1ce11b746b048384372ad23bb1092bd9de1215f0dbb64eef7
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then

From 8fd6425365825d0abcbedf9761396928fbb07439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 17:10:40 -0300
Subject: [PATCH 0451/3482] kadu: remove package.

No longer working or necessary.

Closes #12548
---
 srcpkgs/kadu-devel                         |  1 -
 srcpkgs/kadu/patches/cmake-find-x11.patch  | 40 -------------
 srcpkgs/kadu/patches/gcc7.patch            | 12 ----
 srcpkgs/kadu/patches/qt5-5.15.0.patch      | 10 ----
 srcpkgs/kadu/patches/qt5-qcompare.patch    | 11 ----
 srcpkgs/kadu/patches/qt5-qdatastream.patch | 12 ----
 srcpkgs/kadu/template                      | 65 ----------------------
 srcpkgs/removed-packages/template          |  1 +
 8 files changed, 1 insertion(+), 151 deletions(-)
 delete mode 120000 srcpkgs/kadu-devel
 delete mode 100644 srcpkgs/kadu/patches/cmake-find-x11.patch
 delete mode 100644 srcpkgs/kadu/patches/gcc7.patch
 delete mode 100644 srcpkgs/kadu/patches/qt5-5.15.0.patch
 delete mode 100644 srcpkgs/kadu/patches/qt5-qcompare.patch
 delete mode 100644 srcpkgs/kadu/patches/qt5-qdatastream.patch
 delete mode 100644 srcpkgs/kadu/template

diff --git a/srcpkgs/kadu-devel b/srcpkgs/kadu-devel
deleted file mode 120000
index c6b22664110f..000000000000
--- a/srcpkgs/kadu-devel
+++ /dev/null
@@ -1 +0,0 @@
-kadu
\ No newline at end of file
diff --git a/srcpkgs/kadu/patches/cmake-find-x11.patch b/srcpkgs/kadu/patches/cmake-find-x11.patch
deleted file mode 100644
index acd56b657209..000000000000
--- a/srcpkgs/kadu/patches/cmake-find-x11.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- kadu-core/CMakeLists.txt	2017-01-24 22:36:21.000000000 +0100
-+++ kadu-core/CMakeLists.txt	2019-10-27 08:50:28.152486629 +0100
-@@ -111,7 +111,6 @@
- list (APPEND ADDITIONAL_LIBKADU_LIBRARIES ${LibArchive_LIBRARIES})
- 
- if (UNIX AND NOT APPLE)
--	find_package (X11 REQUIRED COMPONENTS X11 Xutil Xfixes)
- 	if (X11_FOUND AND X11_Xutil_FOUND AND X11_Xfixes_FOUND)
- 		message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xfixes_LIB}")
- 	else ()
---- plugins/idle/CMakeLists.txt	2017-01-24 22:36:22.000000000 +0100
-+++ plugins/idle/CMakeLists.txt	2019-10-27 08:52:28.448492835 +0100
-@@ -15,7 +15,6 @@
- )
- 
- if (UNIX AND NOT APPLE)
--	find_package (X11 REQUIRED COMPONENTS X11 Xutil Xscreensaver)
- 	if (X11_Xscreensaver_FOUND)
- 		message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xscreensaver_LIB}")
- 	else ()
---- plugins/pcspeaker/CMakeLists.txt	2017-01-24 22:36:22.000000000 +0100
-+++ plugins/pcspeaker/CMakeLists.txt	2019-10-27 08:55:53.297503403 +0100
-@@ -15,7 +15,6 @@
- set (LIBRARIES "")
- 
- if (UNIX AND NOT APPLE)
--	find_package (X11 REQUIRED COMPONENTS X11)
- 	if (NOT X11_FOUND)
- 		message (SEND_ERROR "Could NOT find X11")
- 	endif ()
---- plugins/screenshot/CMakeLists.txt	2017-01-24 22:36:22.000000000 +0100
-+++ plugins/screenshot/CMakeLists.txt	2019-10-27 09:02:31.066523924 +0100
-@@ -30,7 +30,6 @@
- 
- if (UNIX AND NOT APPLE)
- 	set (PLUGIN_ADDITIONAL_QT_MODULES X11Extras)
--	find_package (X11 REQUIRED COMPONENTS X11 Xext Xshape)
- 	if (X11_Xshape_FOUND)
- 		message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xext_LIB}")
- 	else ()
diff --git a/srcpkgs/kadu/patches/gcc7.patch b/srcpkgs/kadu/patches/gcc7.patch
deleted file mode 100644
index 7c76910edadb..000000000000
--- a/srcpkgs/kadu/patches/gcc7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
-index 1e6a500..a231cba 100644
---- kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
-+++ kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
-@@ -22,6 +22,7 @@
- #include <QtCore/QObject>
- #include <map>
- #include <set>
-+#include <functional>
- 
- #include "exports.h"
- #include "plugin/dependency-graph/plugin-dependency-graph.h"
diff --git a/srcpkgs/kadu/patches/qt5-5.15.0.patch b/srcpkgs/kadu/patches/qt5-5.15.0.patch
deleted file mode 100644
index ebc6e5fa93c4..000000000000
--- a/srcpkgs/kadu/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kadu-core/gui/widgets/avatar-painter.cpp	2017-01-24 22:36:21.000000000 +0100
-+++ kadu-core/gui/widgets/avatar-painter.cpp	2020-08-07 20:18:18.050176596 +0200
-@@ -22,6 +22,7 @@
- 
- #include <QtCore/QModelIndex>
- #include <QtGui/QPainter>
-+#include <QtGui/QPainterPath>
- #include <QtGui/QPixmap>
- #include <QtGui/QPixmapCache>
- #include <QtWidgets/QStyleOptionViewItem>
diff --git a/srcpkgs/kadu/patches/qt5-qcompare.patch b/srcpkgs/kadu/patches/qt5-qcompare.patch
deleted file mode 100644
index 03da5cadee3f..000000000000
--- a/srcpkgs/kadu/patches/qt5-qcompare.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kadu-core/plugin/state/plugin-state.test.cpp	2017-01-24 22:36:21.000000000 +0100
-+++ kadu-core/plugin/state/plugin-state.test.cpp	2020-06-04 19:24:50.219823920 +0200
-@@ -34,7 +34,7 @@
- 
- void PluginStateTest::newTest()
- {
--	QCOMPARE(pluginStateToString(PluginState::New), {});
-+	QCOMPARE(pluginStateToString(PluginState::New), nullptr);
- 	QCOMPARE(stringToPluginState(""), PluginState::New);
- 	QCOMPARE(stringToPluginState("New"), PluginState::New);
- 	QCOMPARE(stringToPluginState("Invalid"), PluginState::New);
diff --git a/srcpkgs/kadu/patches/qt5-qdatastream.patch b/srcpkgs/kadu/patches/qt5-qdatastream.patch
deleted file mode 100644
index 2f8a9aeee25e..000000000000
--- a/srcpkgs/kadu/patches/qt5-qdatastream.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Qt5 since 5.5.0 needs explicit include of QDataStream
-
---- kadu-core/os/single-application/single-application.cpp	2015-03-24 22:13:18.000000000 +0100
-+++ kadu-core/os/single-application/single-application.cpp	2015-07-10 22:10:02.633790611 +0200
-@@ -30,6 +30,7 @@
- #include <QtCore/QRegExp>
- #include <QtNetwork/QLocalServer>
- #include <QtNetwork/QLocalSocket>
-+#include <QDataStream>
- #include <memory>
- 
- #if defined(Q_OS_WIN)
diff --git a/srcpkgs/kadu/template b/srcpkgs/kadu/template
deleted file mode 100644
index 8587198ae715..000000000000
--- a/srcpkgs/kadu/template
+++ /dev/null
@@ -1,65 +0,0 @@
-# Template file for 'kadu'
-pkgname=kadu
-version=4.3
-revision=6
-build_style=cmake
-configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
- -DX11_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
- -DX11_FOUND=1 -DX11_Xutil_FOUND=1 -DX11_Xshape_FOUND=1
- -DX11_Xfixes_FOUND=1 -DX11_Xscreensaver_FOUND=1
- -DX11_X11_LIB=X11 -DX11_Xext_LIB=Xext
- -DX11_Xfixes_LIB=Xfixes -DX11_Xscreensaver_LIB=Xss
- -DQCA2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/QtCrypto
- -DQCA2_LIBRARIES=qca -DENABLE_TESTS=OFF -Wno-dev"
-hostmakedepends="pkg-config qt5-host-tools"
-makedepends="libao-devel libsndfile-devel libarchive-devel
- enchant-devel injeqt-devel libgadu-devel libidn-devel libotr-devel
- qt5-devel qt5-xmlpatterns-devel qt5-declarative-devel qt5-multimedia-devel
- qt5-script-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel qt5-x11extras-devel
- qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- libmpdclient-devel qca-qt5-devel qxmpp-devel phonon-qt5-devel
- libX11-devel libXfixes-devel libXScrnSaver-devel"
-depends="hicolor-icon-theme qca-qt5-ossl
- $(vopt_if mysql qt5-plugin-mysql) $(vopt_if odbc qt5-plugin-odbc)
- $(vopt_if pgsql qt5-plugin-pgsql) $(vopt_if sqlite qt5-plugin-sqlite)
- $(vopt_if tds qt5-plugin-tds)"
-short_desc="Instant Messenger client"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
-homepage="https://sourceforge.net/projects/kadu/"
-distfiles="${SOURCEFORGE_SITE}/kadu/${version}/kadu-${version}.tar.bz2"
-checksum=ad5d1cbb908c3cd07f2955d343d44b993cd5639427a48a2912441955cfd2bd6e
-replaces="kadu-data>=0"
-
-build_options="mysql odbc pgsql sqlite tds"
-build_options_default="sqlite"
-desc_option_mysql="Use MySQL database plugin"
-desc_option_odbc="Use ODBC database plugin"
-desc_option_pgsql="Use PostgreSQL database plugin"
-desc_option_sqlite="Use SQlite database plugin"
-desc_option_tds="Use Tabular Data Stream database plugin"
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" ${makedepends}"
-fi
-
-pre_configure() {
-	# Disable plugins which require pkgs Void does not ship (yet)
-	# unity_integration: Ubuntu
-	# indicator_docking: requires messaging-menu
-	# word_fix: not packaged
-	sed -i ${wrksrc}/Plugins.cmake \
-		-e "s;unity_integration$;;" \
-		-e "s;indicator_docking$;;" \
-		-e "s;word_fix$;;"
-}
-
-kadu-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/share/cmake
-		vmove usr/share/kadu/sdk
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7fa5d31e3490..9286101886af 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -38,6 +38,7 @@ replaces="
  libgtkhtml<=4.10.0_1
  httperf<=0.9.0_9
  isl16<=0.16_2
+ kadu<=4.3_6
  keepassx<=0.4.4_2
  libapp<=20140527_2
  libdbusmenu-qt<=0.9.2_4

From 69aa143a313272081806c284b5359869713bd194 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 25 Jan 2021 11:07:01 +0100
Subject: [PATCH 0452/3482] wireguard-dkms: update to 1.0.20210124.

---
 srcpkgs/wireguard-dkms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wireguard-dkms/template b/srcpkgs/wireguard-dkms/template
index ad46fa036505..59f04c3fe2c7 100644
--- a/srcpkgs/wireguard-dkms/template
+++ b/srcpkgs/wireguard-dkms/template
@@ -1,6 +1,6 @@
 # Template file for 'wireguard-dkms'
 pkgname=wireguard-dkms
-version=1.0.20201221
+version=1.0.20210124
 revision=1
 wrksrc="wireguard-linux-compat-${version}"
 build_wrksrc="src"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.wireguard.com/"
 distfiles="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"
-checksum=6e5289a8b602eaaf1383aebefcbc41b8ad2721269055858b150363076c1c2132
+checksum=dac6e68cd4c3db441499850dfa8a70706384a3295f37fda1b839a50b79faef54
 
 dkms_modules="wireguard ${version}"
 

From 86f0ee43b2c96a0978e26d965d83dd35459bcd10 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 25 Jan 2021 12:36:02 +0100
Subject: [PATCH 0453/3482] libguestfs: mark broken, unlock builder.

---
 srcpkgs/libguestfs/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 198a4519b053..339bdafce663 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,3 +1,5 @@
+broken="https://build.voidlinux.org/builders/x86_64_builder/builds/29937/steps/shell_3/logs/stdio"
+
 # Template file for 'libguestfs'
 pkgname=libguestfs
 version=1.44.0

From 8606b0df25021323da7003abfa405ad1f0517934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 19:02:44 +0700
Subject: [PATCH 0454/3482] racket: mark nocross, unlock builder

---
 srcpkgs/racket/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 6415cf6d1ef6..1fee0a65e39d 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -15,6 +15,7 @@ homepage="http://racket-lang.org/"
 distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
 checksum=5578942066a9405fdbcad9522d08685356693f4ddd5dbe92b5273557a112b73e
 nostrip=yes
+nocross=yes
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --enable-racket=/usr/bin/racket"

From 5b55263caf6b880ab95893ec69964b68771eec1e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 23 Jan 2021 17:17:52 +0100
Subject: [PATCH 0455/3482] PrusaSlicer: update to 2.3.0.

---
 srcpkgs/PrusaSlicer/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index aa195fe6ac82..dd0e76cb8017 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,21 +1,22 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.2.0
-revision=4
+version=2.3.0
+revision=1
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu"
-configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1"
+configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel libcurl-devel nlopt-devel gtest-devel
- wxWidgets-devel glu-devel libpng-devel glew-devel cereal openvdb-devel
- cgal-devel gmpxx-devel eigen"
+makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
+ glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
+ libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
+ wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=e6e0c83bf92e448ec058fd3063b84caca69f58b8b419e48eace6e8ce534937c0
+checksum=cd3bac5e29b5441fc4690f28cd7b1064e97dc00207bbdc88f7bd7832308d6ca5
 nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/25230/steps/shell_3/logs/stdio"
 
 Slic3rPE_package() {

From 0e52e496b45542a612da24500fd92db1c66b0650 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 25 Jan 2021 09:55:30 +0100
Subject: [PATCH 0456/3482] PrusaSlicer: fix musl build

---
 ...ace-get_current_thread_name-for-musl.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch

diff --git a/srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch
new file mode 100644
index 000000000000..8080380427b6
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch
@@ -0,0 +1,30 @@
+--- src/libslic3r/Thread.cpp.orig	2021-01-24 13:50:00.469444149 +0100
++++ src/libslic3r/Thread.cpp	2021-01-24 13:51:17.109443201 +0100
+@@ -171,16 +171,27 @@ bool set_thread_name(boost::thread &thre
+ 	return true;
+ }
+ 
++#ifndef __GLIBC__
++thread_local char current_thread_name[16] = { 0 };
++#endif
++
+ bool set_current_thread_name(const char *thread_name)
+ {
++#ifndef __GLIBC__
++	strncpy(current_thread_name, thread_name, 15);
++#endif
+ 	pthread_setname_np(pthread_self(), thread_name);
+ 	return true;
+ }
+ 
+ std::optional<std::string> get_current_thread_name()
+ {
++#ifdef __GLIBC__
+ 	char buf[16];
+ 	return std::string(pthread_getname_np(pthread_self(), buf, 16) == 0 ? buf : "");
++#else
++	return std::string(current_thread_name);
++#endif
+ }
+ 
+ #endif

From 12850214ff8075a6e4bb66b52b64e430cbe96585 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 24 Jan 2021 22:55:56 +0100
Subject: [PATCH 0457/3482] revive: update to 1.0.3

---
 srcpkgs/revive/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index 313a1ff9fc24..4090942ba42e 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,16 +1,15 @@
 # Template file for 'revive'
 pkgname=revive
-version=1.0.2
+version=1.0.3
 revision=1
 build_style=go
 go_import_path="github.com/mgechev/revive"
-hostmakedepends="git"
 short_desc="Drop-in replacement for golint"
 maintainer="Paper <paper@tilde.institute>"
 license="MIT"
 homepage="https://revive.run/"
 distfiles="https://github.com/mgechev/revive/archive/v$version.tar.gz"
-checksum=1d3b7a171afba55ee5a6cd7c87ebbcb452ec78a6cf0543584fada7d725ffca31
+checksum=3f829c35dcc8b94bb78c706c2a35bb1f5c77e83128614aa3867fe2952d0ce936
 
 post_install() {
 	vdoc RULES_DESCRIPTIONS.md

From bda9a2afa65da1c763876dd1c85df78e1d0ff7b4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 24 Jan 2021 22:21:50 +0200
Subject: [PATCH 0458/3482] xfce4-whiskermenu-plugin: update to 2.5.3.

---
 srcpkgs/xfce4-whiskermenu-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 93a53ee68ad8..62435ad6a56f 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-whiskermenu-plugin'
 pkgname=xfce4-whiskermenu-plugin
-version=2.5.2
+version=2.5.3
 revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-whiskermenu-plugin"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=a6f7070afd1c9020257d8ed7483872643a6cddd76d5d73de107c7fbd981fc515
+checksum=39cc34c8a83381997c6faaacb6bf792339234303438a1fccd15c9a1770b87daf

From e8f1a79e097b9012afa7d35371250ad89ea4f3d7 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 24 Jan 2021 22:03:35 +0100
Subject: [PATCH 0459/3482] youtube-dl: update to 2021.01.24.1

---
 srcpkgs/youtube-dl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index e45004501bb3..b78dd725ff65 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-dl'
 pkgname=youtube-dl
-version=2021.01.16
+version=2021.01.24.1
 revision=1
 wrksrc="${pkgname}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
 homepage="https://yt-dl.org"
 changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"
 distfiles="${homepage}/downloads/${version}/${pkgname}-${version}.tar.gz"
-checksum=113a5272c1917d83f1c1e7e54971ab41aa6e22b43ba736f2b66816220bdf17e1
+checksum=de2516d3e6de73f2089dd0ccb0880364c7da34e5c902631feb96d4ebc6d13000
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 23c0335daa88e67b80c28ec42aa7f43789bb99f6 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Mon, 25 Jan 2021 07:32:48 +1100
Subject: [PATCH 0460/3482] android-studio: update to 4.1.2.

---
 srcpkgs/android-studio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index 37ab37daf6b8..f2117e44196c 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,10 +1,10 @@
 # Template file for 'android-studio'
 pkgname=android-studio
-version=4.1.1
+version=4.1.2
 revision=1
 # _studio_build and _studio_rev are for downloading the zip from dl.google.com
 # https://developer.android.com/studio/#resources as of 2018-07-12
-_studio_build=201.6953283
+_studio_build=201.7042882
 _studio_rev=0
 archs="x86_64 i686"
 create_wrksrc=yes
@@ -16,7 +16,7 @@ license="Apache-2.0"
 homepage="http://tools.android.com/"
 # changelog="https://developer.android.com/studio/releases/index.html"
 distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}.${_studio_rev}/android-studio-ide-${_studio_build}-linux.tar.gz"
-checksum=68032184959c54576f119b7c7c8ded175d848374f3954fa450530d78260dd68b
+checksum=89f7c3a03ed928edeb7bbb1971284bcb72891a77b4f363557a7ad4ed37652bb9
 repository=nonfree
 restricted=yes
 python_version=2

From a949e40d4a44d844191d39c6b924b8624057dab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 25 Jan 2021 13:38:35 +0100
Subject: [PATCH 0461/3482] linux4.4: update to 4.4.253

---
 srcpkgs/linux4.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index 49401ce2a9f4..4561b3da0978 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.4'
 pkgname=linux4.4
-version=4.4.247
+version=4.4.253
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz"
-checksum=4a6433aaa393545d7446f70d6ddfe4bc6817234564a72cbc997996d27ddd07ca
+checksum=661e98b9448cbac948c705fd44cd7d30200422ee1cb02950d142aa99a1b3985a
 python_version=2 #unverified
 
 nocross=yes

From 3f91e4e4cf5f2fe0346a4de70fe9cbfc43e29a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 25 Jan 2021 13:38:43 +0100
Subject: [PATCH 0462/3482] linux4.9: update to 4.9.253

---
 srcpkgs/linux4.9/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 818e7092a928..9b875c7daa0e 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.9'
 pkgname=linux4.9
-version=4.9.247
+version=4.9.253
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=f73aeb0046a94c6cedcc3edc07d5609f1fc64a38c445983a68bf5d84f56acfd6
+checksum=9a5b51a8350201bd38e3ff13909323a6571b4572a7b3caed76e462b07619bc18
 python_version=2 #unverified
 patch_args="-Np1"
 

From 5cd095db13e8cd07cbb020ec31e23cf44ae7cc1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 25 Jan 2021 13:38:57 +0100
Subject: [PATCH 0463/3482] linux4.14: update to 4.14.217

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 725cb6f79e84..97a9826f9a48 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
-version=4.14.210
+version=4.14.217
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=f91851d0b43c39732f9ee3afa1850145aee21e3bc71b3bf4b9a0b8a74dc4fd18
+checksum=62a36a25431016d98d0f1cff98be432086c51f86fd79042bd10a867b3a924d11
 python_version=2 #unverified
 patch_args="-Np1"
 

From 91d5b4c847ae6158ddf91c7743a99d9f9035fb29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 25 Jan 2021 09:37:13 +0100
Subject: [PATCH 0464/3482] webkit2gtk: fix bwrap-libdir32.patch

The LIB_DIR_WS string should be just the wordsize w/o "lib".

[ci skip]
---
 srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch | 4 ++--
 srcpkgs/webkit2gtk/template                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
index 1c83d3f4eb3a..32d540a84e14 100644
--- a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
+++ b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
@@ -19,9 +19,9 @@ index 889388a..a7a75a8 100644
          return adoptGRef(g_subprocess_launcher_spawnv(launcher, argv, error));
  
 +#if __UINTPTR_MAX__ > 0xFFFFFFFF
-+#  define LIB_DIR_WS "lib64"
++#  define LIB_DIR_WS "64"
 +#else
-+#  define LIB_DIR_WS "lib32"
++#  define LIB_DIR_WS "32"
 +#endif
 +
      Vector<CString> sandboxArgs = {
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 54762392d6a6..9a6dae73f5a1 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.30.4
-revision=4
+revision=5
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"

From 5969ed3728cdfbb64ae3a917d067a54bdce4c075 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 25 Jan 2021 03:07:13 +0100
Subject: [PATCH 0465/3482] linux5.10: unbreak page poisoning

also fix ppc dotconfigs
---
 srcpkgs/linux5.10/files/ppc-dotconfig         | 14 ++---
 srcpkgs/linux5.10/files/ppc64-dotconfig       | 18 ++----
 .../linux5.10/patches/page-poison-fix.patch   | 58 +++++++++++++++++++
 3 files changed, 70 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/linux5.10/patches/page-poison-fix.patch

diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig
index ca2207fddd45..b41439ce1676 100644
--- a/srcpkgs/linux5.10/files/ppc-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc-dotconfig
@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.1 Kernel Configuration
+# Linux/powerpc 5.10.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-musl-gcc (GCC) 9.3.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=232000000
+CONFIG_GCC_VERSION=100201
+CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
@@ -518,6 +518,8 @@ CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND=y
 CONFIG_OLD_SIGACTION=y
 CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
 CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
@@ -3217,7 +3219,6 @@ CONFIG_MOUSE_ELAN_I2C_I2C=y
 CONFIG_MOUSE_ELAN_I2C_SMBUS=y
 CONFIG_MOUSE_VSXXXAA=m
 CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_GPIO=m
 CONFIG_MOUSE_SYNAPTICS_I2C=m
 CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_INPUT_JOYSTICK=y
@@ -4166,7 +4167,6 @@ CONFIG_MFD_VIPERBOARD=m
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SL28CPLD is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_ABX500_CORE is not set
@@ -5915,7 +5915,6 @@ CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_APPLE_MFI_FASTCHARGE=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -8003,6 +8002,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y
diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig
index 0a5ee22c5398..4299f42e17c3 100644
--- a/srcpkgs/linux5.10/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64-dotconfig
@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.1 Kernel Configuration
+# Linux/powerpc 5.10.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc64-linux-musl-gcc (GCC) 9.3.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=232000000
+CONFIG_GCC_VERSION=100201
+CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
@@ -4388,7 +4388,6 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_REGMAP=m
 CONFIG_GPIO_MAX730X=m
 
 #
@@ -4447,7 +4446,6 @@ CONFIG_GPIO_MAX77620=m
 CONFIG_GPIO_MAX77650=m
 CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_RC5T583=y
-CONFIG_GPIO_SL28CPLD=m
 CONFIG_GPIO_STMPE=y
 CONFIG_GPIO_TC3589X=y
 CONFIG_GPIO_TPS65086=m
@@ -4741,7 +4739,6 @@ CONFIG_SENSORS_UCD9200=m
 CONFIG_SENSORS_XDPE122=m
 CONFIG_SENSORS_ZL6100=m
 CONFIG_SENSORS_PWM_FAN=m
-CONFIG_SENSORS_SL28CPLD=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SHT3x=m
@@ -4835,7 +4832,6 @@ CONFIG_WM831X_WATCHDOG=m
 # CONFIG_WM8350_WATCHDOG is not set
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_ZIIRAVE_WATCHDOG=m
-CONFIG_SL28CPLD_WATCHDOG=m
 CONFIG_CADENCE_WATCHDOG=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_RN5T618_WATCHDOG=m
@@ -4962,8 +4958,6 @@ CONFIG_MFD_RK808=m
 CONFIG_MFD_RN5T618=m
 # CONFIG_MFD_SEC_CORE is not set
 CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SIMPLE_MFD_I2C=m
-CONFIG_MFD_SL28CPLD=m
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SKY81452=m
@@ -7148,7 +7142,6 @@ CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_APPLE_MFI_FASTCHARGE=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -8774,7 +8767,6 @@ CONFIG_PWM_FSL_FTM=m
 CONFIG_PWM_IQS620A=m
 CONFIG_PWM_LP3943=m
 CONFIG_PWM_PCA9685=m
-CONFIG_PWM_SL28CPLD=m
 CONFIG_PWM_STMPE=y
 # CONFIG_PWM_TWL is not set
 # CONFIG_PWM_TWL_LED is not set
@@ -9688,7 +9680,6 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
-CONFIG_DMA_VIRT_OPS=y
 CONFIG_SWIOTLB=y
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_SGL_ALLOC=y
@@ -9936,6 +9927,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y
diff --git a/srcpkgs/linux5.10/patches/page-poison-fix.patch b/srcpkgs/linux5.10/patches/page-poison-fix.patch
new file mode 100644
index 000000000000..d319dfec8243
--- /dev/null
+++ b/srcpkgs/linux5.10/patches/page-poison-fix.patch
@@ -0,0 +1,58 @@
+This breaks page poisoning on some architectures. The commit is not
+very useful by itself, so revert it until a real fix is upstream.
+
+From 0cbb20875a8607653f02d799fd4b75a34d1b6636 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Mon, 25 Jan 2021 02:59:47 +0100
+Subject: [PATCH] Revert "mm/page_poison.c: replace bool variable with static
+ key"
+
+This reverts commit 11c9c7edae06da789abfdeefe5123162a3f1c7dc.
+---
+ mm/page_poison.c | 20 +++++---------------
+ 1 file changed, 5 insertions(+), 15 deletions(-)
+
+diff --git a/mm/page_poison.c b/mm/page_poison.c
+index ae0482c..34b9181 100644
+--- a/mm/page_poison.c
++++ b/mm/page_poison.c
+@@ -8,23 +8,13 @@
+ #include <linux/ratelimit.h>
+ #include <linux/kasan.h>
+ 
+-static DEFINE_STATIC_KEY_FALSE_RO(want_page_poisoning);
++static bool want_page_poisoning __read_mostly;
+ 
+ static int __init early_page_poison_param(char *buf)
+ {
+-	int ret;
+-	bool tmp;
+-
+-	ret = strtobool(buf, &tmp);
+-	if (ret)
+-		return ret;
+-
+-	if (tmp)
+-		static_branch_enable(&want_page_poisoning);
+-	else
+-		static_branch_disable(&want_page_poisoning);
+-
+-	return 0;
++	if (!buf)
++		return -EINVAL;
++	return strtobool(buf, &want_page_poisoning);
+ }
+ early_param("page_poison", early_page_poison_param);
+ 
+@@ -41,7 +31,7 @@ bool page_poisoning_enabled(void)
+ 	 * Page poisoning is debug page alloc for some arches. If
+ 	 * either of those options are enabled, enable poisoning.
+ 	 */
+-	return (static_branch_unlikely(&want_page_poisoning) ||
++	return (want_page_poisoning ||
+ 		(!IS_ENABLED(CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC) &&
+ 		debug_pagealloc_enabled()));
+ }
+-- 
+2.30.0
+

From 04336d551985d60f696a7fdd118ead4b0c40ddf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 25 Jan 2021 11:08:16 -0300
Subject: [PATCH 0466/3482] ZMusic: update to 1.1.4.

---
 srcpkgs/ZMusic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
index 4151153cc838..e2f72d46da24 100644
--- a/srcpkgs/ZMusic/template
+++ b/srcpkgs/ZMusic/template
@@ -1,6 +1,6 @@
 # Template file for 'ZMusic'
 pkgname=ZMusic
-version=1.1.3
+version=1.1.4
 revision=1
 build_style=cmake
 configure_args="-DGME_INCLUDE_DIR=/usr/include -DGME_LIBRARIES=gme"
@@ -13,7 +13,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/coelckers/ZMusic"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=5f432b022e023175eae7701625f79287e9ffe889a444179681381026b4fb93bf
+checksum=29a18a6a8d0db4978a9d5badbbd612be2337d64ef0d768e944ea70f526eae285
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-fts-devel"

From ab1fb2a90ffddc97e5ea49718e7c03bf76d3bfed Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 25 Jan 2021 15:11:53 +0100
Subject: [PATCH 0467/3482] linux4*: refresh ppc dotconfigs

---
 srcpkgs/linux4.14/files/ppc-dotconfig   | 5 ++---
 srcpkgs/linux4.14/files/ppc64-dotconfig | 7 ++-----
 srcpkgs/linux4.4/files/ppc-dotconfig    | 4 ++--
 srcpkgs/linux4.4/files/ppc64-dotconfig  | 4 ++--
 srcpkgs/linux4.9/files/ppc-dotconfig    | 4 ++--
 srcpkgs/linux4.9/files/ppc64-dotconfig  | 4 ++--
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/linux4.14/files/ppc-dotconfig b/srcpkgs/linux4.14/files/ppc-dotconfig
index 19046164278d..9e68df353c07 100644
--- a/srcpkgs/linux4.14/files/ppc-dotconfig
+++ b/srcpkgs/linux4.14/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.14.204 Kernel Configuration
+# Linux/powerpc 4.14.217 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
@@ -280,6 +280,7 @@ CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_ARCH_WANT_IRQS_OFF_ACTIVATE_MM=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
@@ -4610,7 +4611,6 @@ CONFIG_HDMI=y
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
@@ -5124,7 +5124,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
diff --git a/srcpkgs/linux4.14/files/ppc64-dotconfig b/srcpkgs/linux4.14/files/ppc64-dotconfig
index 5be25f0f378a..574f6935acef 100644
--- a/srcpkgs/linux4.14/files/ppc64-dotconfig
+++ b/srcpkgs/linux4.14/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.14.204 Kernel Configuration
+# Linux/powerpc 4.14.217 Kernel Configuration
 #
 CONFIG_PPC64=y
 
@@ -309,6 +309,7 @@ CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_ARCH_WANT_IRQS_OFF_ACTIVATE_MM=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
@@ -5410,9 +5411,6 @@ CONFIG_HDMI=y
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
-CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
-CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
@@ -6120,7 +6118,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
diff --git a/srcpkgs/linux4.4/files/ppc-dotconfig b/srcpkgs/linux4.4/files/ppc-dotconfig
index ceadd703ad6f..396b70bc042b 100644
--- a/srcpkgs/linux4.4/files/ppc-dotconfig
+++ b/srcpkgs/linux4.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.4.237 Kernel Configuration
+# Linux/powerpc 4.4.253 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
@@ -3134,6 +3134,7 @@ CONFIG_SPI_MPC52xx_PSC=m
 #
 CONFIG_SPI_SPIDEV=y
 # CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_DYNAMIC is not set
 # CONFIG_SPMI is not set
 # CONFIG_HSI is not set
 
@@ -4781,7 +4782,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
diff --git a/srcpkgs/linux4.4/files/ppc64-dotconfig b/srcpkgs/linux4.4/files/ppc64-dotconfig
index f44d400e56c6..dfbda625ae97 100644
--- a/srcpkgs/linux4.4/files/ppc64-dotconfig
+++ b/srcpkgs/linux4.4/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.4.237 Kernel Configuration
+# Linux/powerpc 4.4.253 Kernel Configuration
 #
 CONFIG_PPC64=y
 
@@ -3481,6 +3481,7 @@ CONFIG_SPI_DW_MMIO=m
 #
 CONFIG_SPI_SPIDEV=m
 CONFIG_SPI_TLE62X0=m
+CONFIG_SPI_DYNAMIC=y
 CONFIG_SPMI=m
 CONFIG_HSI=m
 CONFIG_HSI_BOARDINFO=y
@@ -5579,7 +5580,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
diff --git a/srcpkgs/linux4.9/files/ppc-dotconfig b/srcpkgs/linux4.9/files/ppc-dotconfig
index 9dbe117dc171..9039011c89a2 100644
--- a/srcpkgs/linux4.9/files/ppc-dotconfig
+++ b/srcpkgs/linux4.9/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.9.237 Kernel Configuration
+# Linux/powerpc 4.9.253 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
@@ -3244,6 +3244,7 @@ CONFIG_SPI_MPC52xx_PSC=m
 CONFIG_SPI_SPIDEV=y
 # CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_DYNAMIC is not set
 # CONFIG_SPMI is not set
 # CONFIG_HSI is not set
 
@@ -4941,7 +4942,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
diff --git a/srcpkgs/linux4.9/files/ppc64-dotconfig b/srcpkgs/linux4.9/files/ppc64-dotconfig
index 475652dcd1e9..4bc17d04843d 100644
--- a/srcpkgs/linux4.9/files/ppc64-dotconfig
+++ b/srcpkgs/linux4.9/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.9.237 Kernel Configuration
+# Linux/powerpc 4.9.253 Kernel Configuration
 #
 CONFIG_PPC64=y
 
@@ -3644,6 +3644,7 @@ CONFIG_SPI_ZYNQMP_GQSPI=m
 CONFIG_SPI_SPIDEV=m
 CONFIG_SPI_LOOPBACK_TEST=m
 CONFIG_SPI_TLE62X0=m
+CONFIG_SPI_DYNAMIC=y
 CONFIG_SPMI=m
 CONFIG_HSI=m
 CONFIG_HSI_BOARDINFO=y
@@ -5851,7 +5852,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m

From 96a6ef4d45c66f48dcf77cadcb24adc3cb2ff86e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 21:23:48 +0700
Subject: [PATCH 0468/3482] seahorse-sharing: fix localedir

---
 .../seahorse-sharing/patches/fix-gnupg-version.patch  | 11 -----------
 srcpkgs/seahorse-sharing/template                     | 11 ++++++-----
 2 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch

diff --git a/srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch b/srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch
deleted file mode 100644
index 7130ee6a0446..000000000000
--- a/srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac	2013-03-25 12:02:04.000000000 +0100
-+++ configure.ac	2016-08-31 01:03:33.238915208 +0200
-@@ -43,7 +43,7 @@
- 	DO_CHECK=$enableval, DO_CHECK=yes)
- 
- if test	"$DO_CHECK" = "yes"; then
--	accepted_versions="1.2 1.4 2.0"
-+	accepted_versions="1.2 1.4 2.0 2.1"
- 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- 	ok="no"
- 	if test "$GNUPG" != "no"; then
diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423c..4fa4413e10b0 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,10 +1,9 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
- gpgme-devel gnupg"
+hostmakedepends="pkg-config intltool gnupg"
 makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel
  avahi-glib-libs-devel libSM-devel"
 depends="gnupg"
@@ -15,6 +14,8 @@ homepage="http://www.gnome.org/projects/seahorse/"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=e216e7d5709e688e142b4e96710759f5be54c39ac6c2d58f2eec330e4dfef92b
 
-pre_configure() {
-	autoreconf -fi
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=.*/DATADIRNAME=share/' \
+		-e '/accepted_versions=/s/2\.0/2.2/' \
+		configure
 }

From f5000fb2835f4195375868ba874051c41b1284f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 25 Jan 2021 11:23:19 -0300
Subject: [PATCH 0469/3482] kstars: update to 3.5.1.

---
 srcpkgs/kstars/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index a198306083ee..53bc3fa360b4 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,6 +1,6 @@
 # Template file for 'kstars'
 pkgname=kstars
-version=3.5.0
+version=3.5.1
 revision=1
 build_style=cmake
 hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
@@ -18,4 +18,4 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://edu.kde.org/kstars/"
 distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=a1aa6e859b90bedcf88664c13e0cdfef6407aca1ee6eef608310d8a5caa9f33a
+checksum=81ffb2697898405b8ed7f9ef74fe8e3ae0f842b46d3c0413c106406d834ac545

From b3b5d647ed65a70e48d09f644ad6818626e373f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 25 Jan 2021 12:03:24 -0300
Subject: [PATCH 0470/3482] kernel-libc-headers: ignore all updates.

We stick with LTS for this package and updating it for every point
release is unfeasible, due to the amount of cross toolchains. Ignore all
releases for now and let it be manually updated when necessary.
---
 srcpkgs/kernel-libc-headers/update | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/kernel-libc-headers/update b/srcpkgs/kernel-libc-headers/update
index 07d190a88ef6..62a54c45e5f9 100644
--- a/srcpkgs/kernel-libc-headers/update
+++ b/srcpkgs/kernel-libc-headers/update
@@ -1 +1,2 @@
 pkgname="linux"
+ignore="*"

From 39ffba327a9e959f118a100ae05a94e3328eb10c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 25 Jan 2021 08:36:52 -0600
Subject: [PATCH 0471/3482] ffuf: update to 1.2.1.

---
 srcpkgs/ffuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 7c18e6137d47..eecf6bd8a603 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,6 +1,6 @@
 # Template file for 'ffuf'
 pkgname=ffuf
-version=1.1.0
+version=1.2.1
 revision=1
 build_style=go
 go_import_path="github.com/ffuf/ffuf"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/ffuf/ffuf"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=468963c6bec5390222802ec0b04c11187bb159f369edc2ebba1d228b8faf4f35
+checksum=ff474b21e192005a2df0f09f942b0370bdcb45d64ee35bd8782eb44a5c636e96
 
 post_install() {
 	vlicense LICENSE

From 24df345dde92ce38e5118996482a7bef3b11c492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 25 Jan 2021 12:19:35 -0300
Subject: [PATCH 0472/3482] yelp: update to 3.38.2, adopt.

Also add changelog for 3.38 branch.
---
 srcpkgs/yelp/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index a1cfae98ad25..8d5856499f28 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=3.38.1
+version=3.38.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -9,11 +9,13 @@ makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel
  libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl"
 depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl"
 short_desc="Help browser for GNOME desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Yelp"
+# change this when it moves to a new major release
+changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=74359e170be2bdc386d1bfb03b6f4fa887ca3b8406f9c144b86d0b24e1445f80
+checksum=9ba88b59a7c087fea56970549265ca8eb0a83a72ee2800aed03c455101d28c8b
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"

From c02c0c35f26851fce1a65876283d9712549c09ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 25 Jan 2021 12:20:16 -0300
Subject: [PATCH 0473/3482] yelp-xsl: update to 3.38.2, adopt.

Also add changelog for 3.38 branch.
---
 srcpkgs/yelp-xsl/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index fb6aa8e28650..b6191a67efbf 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -1,14 +1,15 @@
 # Template file for 'yelp-xsl'
 # keep up to date with yelp
 pkgname=yelp-xsl
-version=3.38.1
+version=3.38.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool libxslt"
 makedepends="libxslt-devel"
 short_desc="Help browser for GNOME desktop - XSL and misc files"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Yelp/Xsl"
+changelog="https://gitlab.gnome.org/GNOME/yelp-xsl/-/raw/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b321563da6ab7fa8b989adaf1a91262059696316b4ddca2288fddcfed8dcdf67
+checksum=2c8472dc6c470145e8a01e5e7c8ceffe81eb2bd318f7282fdede9a3f975fb47b

From 30e6ac030de344133dfe08cfd5ed0dff16f8eac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 25 Jan 2021 12:32:22 -0300
Subject: [PATCH 0474/3482] mdBook: update to 0.4.6.

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6ebb2c6526dc..38cd87b53dd9 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.5
+version=0.4.6
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=79fd98bddab8611cae9071aeb327edfcc67b4e449d5653d41d2ee5b04bee3afc
+checksum=a0a8f8e65030370cec8f5114ccb57334c9f2b7153dc51677e12dc74632d3ed23
 
 post_install() {
 	vlicense LICENSE

From 6ec9302a847f3d9f0e13f3b861c04b2810b41225 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Jan 2021 12:51:27 +0100
Subject: [PATCH 0475/3482] findutils: update to 4.8.0.

Closes: #27824 [via git-merge-pr]
---
 srcpkgs/findutils/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/findutils/template b/srcpkgs/findutils/template
index dac19bad8dea..c6e225cf4c79 100644
--- a/srcpkgs/findutils/template
+++ b/srcpkgs/findutils/template
@@ -1,6 +1,6 @@
 # Template file for 'findutils'
 pkgname=findutils
-version=4.7.0
+version=4.8.0
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -9,8 +9,9 @@ short_desc="GNU Find Utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/findutils"
+changelog="https://git.savannah.gnu.org/cgit/findutils.git/plain/NEWS"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a
+checksum=57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164
 
 alternatives="
  xargs:xargs:/usr/bin/gxargs

From 7c9f5f648f5b01e98181a45d14080ea0739b23f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 25 Jan 2021 17:36:55 +0100
Subject: [PATCH 0476/3482] gifski: update to 1.2.7.

---
 srcpkgs/gifski/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gifski/template b/srcpkgs/gifski/template
index 2a8ecdcf0853..756b00a62471 100644
--- a/srcpkgs/gifski/template
+++ b/srcpkgs/gifski/template
@@ -1,6 +1,6 @@
 # Template file for 'gifski'
 pkgname=gifski
-version=1.2.4
+version=1.2.7
 revision=1
 build_style=cargo
 configure_args="--features=openmp"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="AGPL-3.0-only"
 homepage="https://gif.ski"
 distfiles="https://github.com/ImageOptim/gifski/archive/${version}.tar.gz"
-checksum=8a968a8b9f605746dfeaf1083a0c6a2a3c68e7d8d62f43bb6a6cd58e9a3d260e
+checksum=4894f70c351ce8440c9cdaca30f3bd59630dc10ce4bb60bc7686fe3f4bcf641c
 
 post_install() {
 	vlicense LICENSE

From 1b61133b477a0eb5e6807e1ce1262c3e05ddd535 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 25 Jan 2021 18:05:23 +0100
Subject: [PATCH 0477/3482] fwupd: fix non-uefi build

---
 srcpkgs/fwupd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 78e80957ef93..a2b66a212af4 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -54,7 +54,7 @@ if [ -n "$_have_uefi" ]; then
 	hostmakedepends+=" efivar"
 	makedepends+=" libefivar-devel gnu-efi-libs"
 else
-	configure_args+=" -Dplugin_uefi=false -Dplugin_redfish=false"
+	configure_args+=" -Dplugin_redfish=false -Dplugin_uefi_capsule=false -Dplugin_uefi_pk=false"
 fi
 
 if [ "$CROSS_BUILD" ]; then

From cc72ee743878a274872986fdc87fb5bca0b13511 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Jan 2021 09:53:19 -0500
Subject: [PATCH 0478/3482] python3-llfuse: update to 1.4.0.

---
 srcpkgs/python3-llfuse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-llfuse/template b/srcpkgs/python3-llfuse/template
index 596f6cc8fc4b..0902174ecda3 100644
--- a/srcpkgs/python3-llfuse/template
+++ b/srcpkgs/python3-llfuse/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-llfuse'
 pkgname=python3-llfuse
-version=1.3.8
+version=1.4.0
 revision=1
 wrksrc="llfuse-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/python-llfuse/python-llfuse"
 distfiles="${PYPI_SITE}/l/llfuse/llfuse-${version}.tar.gz"
-checksum=b9b573108a840fbaa5c8f037160cc541f21b8cbdc15c5c8a39d5ac8c1b6c4cbc
+checksum=cb5dc6052bdd9c19dd15d44cd2876520007029a7733e7b9f0c2022c768e3ca52

From 735562c2721a80c133b8e9af373ed75a14e83448 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Jan 2021 09:54:03 -0500
Subject: [PATCH 0479/3482] python3-prompt_toolkit: update to 3.0.14.

---
 srcpkgs/python3-prompt_toolkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index fcb29f44326f..fbafe67b6615 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-prompt_toolkit'
 pkgname=python3-prompt_toolkit
-version=3.0.10
+version=3.0.14
 revision=1
 wrksrc="prompt_toolkit-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
 changelog="https://raw.githubusercontent.com/prompt-toolkit/python-prompt-toolkit/master/CHANGELOG"
 distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=b8b3d0bde65da350290c46a8f54f336b3cbf5464a4ac11239668d986852e79d5
+checksum=7e966747c18ececaec785699626b771c1ba8344c8d31759a1915d6b12fad6525
 conflicts="python3-prompt_toolkit2<=2.0.9_4"
 
 post_install() {

From 1345c1957d638a198bc24e4d7a8d0862ac6c17af Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Jan 2021 09:54:17 -0500
Subject: [PATCH 0480/3482] python3-ultrajson: update to 4.0.2.

---
 srcpkgs/python3-ultrajson/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 6be2b6d92d58..59415d1249b4 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,17 +1,23 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.0.1
+version=4.0.2
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 makedepends="python3-devel"
+depends="python3"
+checkdepends="python3-pytest"
 short_desc="Ultra fast JSON encoder and decoder for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=26cf6241b36ff5ce4539ae687b6b02673109c5e3efc96148806a7873eaa229d3
+checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+
+do_check() {
+	PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest
+}
 
 post_install() {
 	vlicense LICENSE.txt

From 43fbea3f9684764e1400c56326d543e6d26b639a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Jan 2021 09:54:42 -0500
Subject: [PATCH 0481/3482] python3-yaml: update to 5.4.1.

---
 srcpkgs/python3-yaml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-yaml/template b/srcpkgs/python3-yaml/template
index 87fcde69d6c4..be593a82a91f 100644
--- a/srcpkgs/python3-yaml/template
+++ b/srcpkgs/python3-yaml/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-yaml'
 pkgname=python3-yaml
-version=5.4
+version=5.4.1
 revision=1
 wrksrc="PyYAML-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="MIT"
 homepage="http://pyyaml.org/wiki/PyYAML"
 distfiles="${PYPI_SITE}/P/PyYAML/PyYAML-${version}.tar.gz"
-checksum=3c49e39ac034fd64fd576d63bb4db53cda89b362768a67f07749d55f128ac18a
+checksum=607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e
 
 post_install() {
 	vlicense LICENSE

From 23fe78ece2f88e01ea780b91e88907707c1d6e60 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Jan 2021 10:40:40 -0500
Subject: [PATCH 0482/3482] python3-breathe: update to 4.26.1.

---
 srcpkgs/python3-breathe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-breathe/template b/srcpkgs/python3-breathe/template
index d81bb40c7df7..f5d3bba8c59f 100644
--- a/srcpkgs/python3-breathe/template
+++ b/srcpkgs/python3-breathe/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-breathe'
 pkgname=python3-breathe
-version=4.26.0
+version=4.26.1
 revision=1
 wrksrc="breathe-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/michaeljones/breathe"
 changelog="https://raw.githubusercontent.com/michaeljones/breathe/master/README.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5b03a3576eaf49ef2816996c77cfae3dcad0d5c48c9a8aa2bc62e72989a2a1f5
+checksum=68e6a1507e9843049e39de12aea010e714a7072df7d71b6d7dd437952a7f7ee5
 
 post_install() {
 	vlicense LICENSE

From e8646da69979f09ba9ac405df62e00cce12d7e64 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Jan 2021 12:33:58 -0500
Subject: [PATCH 0483/3482] grpc: update to 1.35.0.

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index de0182c3cd60..db501ccc3c3b 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.34.1
+version=1.35.0
 revision=1
 _abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="c260a1dcdd26a78a9596494a3f41f9594ab5ec3a4d65cba4658bdee2b55ac844
+checksum="27dd2fc5c9809ddcde8eb6fa1fa278a3486566dfc28335fca13eb8df8bd3b958
  3d74cdc98b42fd4257d91f652575206de195e2c824fcd8d6e6d227f85cb143ef"
 
 if [ "$CROSS_BUILD" ]; then

From c6a47e060088a78dcd74b2e2ba13a597e85fc3b0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Jan 2021 12:34:01 -0500
Subject: [PATCH 0484/3482] python3-grpcio: update to 1.35.0.

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index 73e0bc72cb44..76b88b3c8c46 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
-version=1.34.1
+version=1.35.0
 revision=1
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz"
-checksum=1c746a3cd8a830d8d916a9d0476a786aaa98c5cc2a096344af2be955e439f8ac
+checksum=7bd0ebbb14dde78bf66a1162efd29d3393e4e943952e2f339757aa48a184645c
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From a4f0068fc4e56977aabc3fd74609d3385551fcdd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Jan 2021 12:34:03 -0500
Subject: [PATCH 0485/3482] python3-grpcio-tools: update to 1.35.0.

---
 srcpkgs/python3-grpcio-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio-tools/template b/srcpkgs/python3-grpcio-tools/template
index cd96fdc8305f..8d04abb9ac3b 100644
--- a/srcpkgs/python3-grpcio-tools/template
+++ b/srcpkgs/python3-grpcio-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-grpcio-tools'
 pkgname=python3-grpcio-tools
-version=1.34.1
+version=1.35.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio-tools/grpcio-tools-${version}.tar.gz"
-checksum=b411f36748f4ead33411544d785e37825598bbb8abbe79eca422e395be5a3d08
+checksum=9e2a41cba9c5a20ae299d0fdd377fe231434fa04cbfbfb3807293c6ec10b03cf
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From a9f501339bca02c59de5b497c0909e2cb2bf4234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 25 Jan 2021 13:04:27 -0300
Subject: [PATCH 0486/3482] ca-certificates: update to 20210119.

---
 srcpkgs/ca-certificates/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 224c88c2232d..5d3d01d7fa0f 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,7 +1,7 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
-version=20200601
-revision=2
+version=20210119
+revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
@@ -12,14 +12,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
 homepage="https://tracker.debian.org/pkg/ca-certificates"
 distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version}.tar.xz"
-checksum=43766d5a436519503dfd65ab83488ae33ab4d4ca3d0993797b58c92eb9ed4e63
+checksum=daa3afae563711c30a0586ddae4336e8e3974c2b627faaca404c4e0141b64665
 
 post_extract() {
 	$BUILD_CC $BUILD_CFLAGS ${FILESDIR}/certdata2pem.c -o ${wrksrc}/mozilla/certdata2pem
 	cp ${FILESDIR}/remove-expired-certs.sh ${wrksrc}/mozilla
-	sed -i ${wrksrc}/mozilla/Makefile \
-		-e 's,python certdata2pem.py,./certdata2pem,g'
-	sed -i ${wrksrc}/mozilla/Makefile \
+	vsed -i ${wrksrc}/mozilla/Makefile \
+		-e 's,python3 certdata2pem.py,./certdata2pem,g'
+	vsed -i ${wrksrc}/mozilla/Makefile \
 		-e "s;\(.*\)\(certdata2pem.*\);\1\2\n\1./remove-expired-certs.sh;"
 }
 
@@ -37,7 +37,7 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	sed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
+	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 54aec287ecb34e409db75aef172966713a3f33b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 16:50:37 -0300
Subject: [PATCH 0487/3482] dante: fix runtime on musl.

musl implements the sched_{set,get}scheduler functions as stubs.
Unfortunately, dante fails if the functions are available but return an
error, which is always the case for musl. Force it to think setscheduler
isn't available (var appropriated from Alpine).

Fixes #28180
---
 srcpkgs/dante/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/dante/template b/srcpkgs/dante/template
index 44e08fd6ab1c..17fe0f69ae60 100644
--- a/srcpkgs/dante/template
+++ b/srcpkgs/dante/template
@@ -1,7 +1,7 @@
 # Template file for 'dante'
 pkgname=dante
 version=1.4.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="tar automake libtool"
 short_desc="SOCKS server and client"
@@ -13,6 +13,8 @@ checksum=4c97cff23e5c9b00ca1ec8a95ab22972813921d7fbf60fc453e3e06382fc38a7
 
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 	configure_args="--with-libc=libc.so.6"
+else
+	configure_args="ac_cv_func_sched_setscheduler=no"
 fi
 
 pre_configure() {

From fc1491ddb46b738191b0d3de0eab01445227c1dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 25 Jan 2021 20:23:03 +0100
Subject: [PATCH 0488/3482] pcsc-ccid: update to 1.4.34

---
 srcpkgs/pcsc-ccid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcsc-ccid/template b/srcpkgs/pcsc-ccid/template
index 73ee16d21efe..a4009021ec24 100644
--- a/srcpkgs/pcsc-ccid/template
+++ b/srcpkgs/pcsc-ccid/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsc-ccid'
 pkgname=pcsc-ccid
-version=1.4.33
+version=1.4.34
 revision=1
 wrksrc="ccid-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="LGPL-2.1-or-later"
 homepage="https://ccid.apdu.fr/"
 changelog="https://salsa.debian.org/rousseau/CCID/-/raw/master/README.md"
 distfiles="https://ccid.apdu.fr/files/ccid-${version}.tar.bz2"
-checksum=5256da939711deb42b74d05d2bd6bd0c73c4d564feb0c1a50212609eb680e424
+checksum=e6f7645b59a9a2844eb4b1a7eff512960d7f04a4654af02f7fd2f8aded5db40a
 
 
 post_install() {

From 89f29eda040ce08a59f764467b9fcfd6113d5fe0 Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@ae-design.ws>
Date: Mon, 25 Jan 2021 20:39:02 +0100
Subject: [PATCH 0489/3482] nwg-launchers: update to 0.4.3

---
 srcpkgs/nwg-launchers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nwg-launchers/template b/srcpkgs/nwg-launchers/template
index 5d2414832603..700dfed46763 100644
--- a/srcpkgs/nwg-launchers/template
+++ b/srcpkgs/nwg-launchers/template
@@ -1,6 +1,6 @@
 # Template file for 'nwg-launchers'
 pkgname=nwg-launchers
-version=0.4.2
+version=0.4.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/nwg-piotr/nwg-launchers"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7a9377e01a517db3af5aec4f4b7a420474930d307aab67bd1beaac56c02b2f56
+checksum=59ca116a23210278f481bd5754d242455737e929aa2e5cc91a5a8fb1fcd2b2e6

From 5085468974f68c1f90917ec3d2815474f89ea25a Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Wed, 20 Jan 2021 00:00:08 -0800
Subject: [PATCH 0490/3482] jetbrains-jdk-bin: update to 11.0.9.1b1257.1.

---
 srcpkgs/jetbrains-jdk-bin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template
index 0d4f25e8b2be..6d502fc463f9 100644
--- a/srcpkgs/jetbrains-jdk-bin/template
+++ b/srcpkgs/jetbrains-jdk-bin/template
@@ -1,6 +1,7 @@
 # Template file for 'jetbrains-jdk-bin'
 pkgname=jetbrains-jdk-bin
-version=11.0.9.1b1244.2
+reverts=11.0.9b1183.9_1
+version=11.0.9.1b1257.1
 revision=1
 archs="x86_64"
 wrksrc="jbrsdk"
@@ -12,7 +13,7 @@ homepage="https://github.com/JetBrains/JetBrainsRuntime"
 _jdk_ver=${version%b*}
 _jdk_build=${version#*b}
 distfiles="https://dl.bintray.com/jetbrains/intellij-jbr/jbrsdk-${_jdk_ver//\./_}-linux-x64-b${_jdk_build}.tar.gz"
-checksum=d0b47b6a8981da8c457642b7b35462e1711f6ec339bd1ba29f62f1173f172c04
+checksum=c9f40f9591a3d740963e12a668740525f6d84fe7f6756589ec99e695a34fe94a
 fetch_cmd="wget --quiet"
 # This JDK appears to link to libs that do not exist, but functions well even in their absence.
 # Best guess is that they are optional. ¯\_(ツ)_/¯

From 8865278b098c269b9751186181121202402f59fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 22:54:18 +0100
Subject: [PATCH 0491/3482] openjpeg2: patch cmake stuff to fix cross in other
 packages

---
 ...c27e7c91f745a1dda9991b5deea3cbef2072.patch | 31 +++++++++++++++++++
 ...49edad7fb31ebbf03c60a45b72aaa7b7412b.patch | 26 ++++++++++++++++
 srcpkgs/openjpeg2/template                    |  3 +-
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch
 create mode 100644 srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch

diff --git a/srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch b/srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch
new file mode 100644
index 000000000000..3f658e849db1
--- /dev/null
+++ b/srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch
@@ -0,0 +1,31 @@
+From 14f4c27e7c91f745a1dda9991b5deea3cbef2072 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Thu, 7 Jan 2021 14:09:50 +0100
+Subject: [PATCH] Revert "Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes
+ uclouvain#1174)"
+
+This reverts commit 65586374d639cfc0104419992f9022174b412594 which
+breaks cross-compilation of poppler under buildroot (because of
+DESTDIR usage).
+---
+ cmake/OpenJPEGConfig.cmake.in | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in
+index 8a726697a..2925108ad 100644
+--- cmake/OpenJPEGConfig.cmake.in
++++ cmake/OpenJPEGConfig.cmake.in
+@@ -27,8 +27,12 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+   # This is an install tree
+   include(${SELF_DIR}/OpenJPEGTargets.cmake)
+ 
++  # We find a relative path from the PKG directory to header files.
++  set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
+   set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
+-  get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
++  file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
++
++  get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
+ 
+ else()
+   if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
diff --git a/srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch b/srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch
new file mode 100644
index 000000000000..9c6b47ce47eb
--- /dev/null
+++ b/srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch
@@ -0,0 +1,26 @@
+From 4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Thu, 7 Jan 2021 14:11:26 +0100
+Subject: [PATCH] cmake/OpenJPEGConfig.cmake: replace ABSOLUTE by REALPATH
+
+Fix #1174 by replacing ABSOLUTE by REALPATH which will resolve symlinks:
+https://cmake.org/cmake/help/latest/command/get_filename_component.html
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ cmake/OpenJPEGConfig.cmake.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in
+index 2925108ad..6e88036c6 100644
+--- cmake/OpenJPEGConfig.cmake.in
++++ cmake/OpenJPEGConfig.cmake.in
+@@ -32,7 +32,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+   set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
+   file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
+ 
+-  get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
++  get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" REALPATH)
+ 
+ else()
+   if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
diff --git a/srcpkgs/openjpeg2/template b/srcpkgs/openjpeg2/template
index 372fb65370bd..4e6f16ac7ced 100644
--- a/srcpkgs/openjpeg2/template
+++ b/srcpkgs/openjpeg2/template
@@ -1,7 +1,7 @@
 # Template file for 'openjpeg2'
 pkgname=openjpeg2
 version=2.4.0
-revision=1
+revision=2
 wrksrc="openjpeg-${version}"
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=None"
@@ -12,7 +12,6 @@ license="BSD-2-Clause"
 homepage="http://www.openjpeg.org/"
 distfiles="https://github.com/uclouvain/openjpeg/archive/v${version}.tar.gz"
 checksum=8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d
-patch_args="-Np1"
 
 post_install() {
 	vlicense LICENSE

From 0823072e802a66eddfa30db27c4a8790cd55b5d9 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 21:32:23 +0000
Subject: [PATCH 0492/3482] libnfc: update to 1.8.0.

---
 common/shlibs           |  2 +-
 srcpkgs/libnfc/template | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 979daeddbf1d..276d8e6912cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2193,7 +2193,7 @@ libudns.so.0 udns-0.4_1
 libcriu.so.2 criu-3.13_2
 libcompel.so.1 criu-3.13_2
 libwebsockets.so.15 libwebsockets-3.2.0_1
-libnfc.so.0 libnfc-1.7.1_1
+libnfc.so.6 libnfc-1.8.0_1
 libfuzzy.so.2 libfuzzy-2.12_1
 libSDL_gfx.so.15 SDL_gfx-2.0.25_2
 libsfml-network.so.2.5 SFML-2.5.0_1
diff --git a/srcpkgs/libnfc/template b/srcpkgs/libnfc/template
index 0cbcee8e1067..7737dad56902 100644
--- a/srcpkgs/libnfc/template
+++ b/srcpkgs/libnfc/template
@@ -1,7 +1,7 @@
 # Template file for 'libnfc'
 pkgname=libnfc
-version=1.7.1
-revision=3
+version=1.8.0
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cmake
 short_desc="Low level NFC SDK and Programmers API"
@@ -11,14 +11,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3"
 homepage="http://nfc-tools.org/"
 distfiles="https://github.com/nfc-tools/libnfc/archive/libnfc-${version}.tar.gz"
-checksum=30de35b4f1af3f57dab40d91ffb2275664a35859ff2b014ba7b226aa3f5465f5
+checksum=0ab7d9b41442e7edc2af7c54630396edc73ce51128aa28a5c6e4135dc5595495
 CFLAGS="-D_GNU_SOURCE"
 
 pre_configure() {
-	sed -i "s|MODE=\"0664\", GROUP=\"plugdev\"|TAG+=\"uaccess\"|g" contrib/udev/42-pn53x.rules
+	sed -i "s|MODE=\"0664\", GROUP=\"plugdev\"|TAG+=\"uaccess\"|g" contrib/udev/93-pn53x.rules
 }
 post_install() {
-	vinstall contrib/udev/42-pn53x.rules         644 usr/lib/udev/rules.d/
+	vinstall contrib/udev/93-pn53x.rules         644 usr/lib/udev/rules.d/
 	vinstall contrib/linux/blacklist-libnfc.conf 644 usr/lib/modprobe.d/
 }
 libnfc-devel_package() {

From 75d2255d888438725b4bdead83cdae5a1299894d Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 22:32:22 +0000
Subject: [PATCH 0493/3482] mfoc: bump for libnfc

---
 srcpkgs/mfoc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mfoc/template b/srcpkgs/mfoc/template
index 7ddd3e9adf89..a6ce644c22c2 100644
--- a/srcpkgs/mfoc/template
+++ b/srcpkgs/mfoc/template
@@ -1,7 +1,7 @@
 # Template file for 'mfoc'
 pkgname=mfoc
 version=0.10.7
-revision=3
+revision=4
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"

From 75bc237e09cf8a64b9de2c7f36a864c288f34c33 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 22:33:50 +0000
Subject: [PATCH 0494/3482] podofo: update to 0.9.7.

---
 srcpkgs/podofo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index 03642c2a5093..b0ed2e0e19cc 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,7 +1,7 @@
 # Template file for 'podofo'
 pkgname=podofo
-version=0.9.6
-revision=5
+version=0.9.7
+revision=1
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
 makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://podofo.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/podofo/podofo/${version}/podofo-${version}.tar.gz"
-checksum=e9163650955ab8e4b9532e7aa43b841bac45701f7b0f9b793a98c8ca3ef14072
+checksum=7cf2e716daaef89647c54ffcd08940492fd40c385ef040ce7529396bfadc1eb8
 disable_parallel_build=yes
 
 libpodofo_package() {

From a485bfd939d257d8aa27432df4ee36e94ccd5d38 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 22:35:45 +0000
Subject: [PATCH 0495/3482] krename: rebuild for podofo

---
 srcpkgs/krename/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 30d759f9e0d1..8e3d7d0db8d2 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
 # Template file for 'krename'
 pkgname=krename
 version=5.0.0
-revision=5
+revision=6
 # 5.0.0 FTBFS thus use a git revision which fixes the issue for now
 _gitrev=93726f3d4e177816337beaf5c8872859ef33e9d8
 wrksrc="${pkgname}-${_gitrev}"

From 8a3662052a08e29aa9be8852efee6291e2f8db6f Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 22:35:54 +0000
Subject: [PATCH 0496/3482] horizon: rebuild for podofo

---
 srcpkgs/horizon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 7ee504665946..7daf6b6154d7 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
 # Template file for 'horizon'
 pkgname=horizon
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="GOLD="
 make_use_env=yes

From 0a114eca4856c1bcbd9d5facac39ba0946967892 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 23:06:29 +0000
Subject: [PATCH 0497/3482] podofo: fix shlibs

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 276d8e6912cd..78416f43ed0c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2551,7 +2551,7 @@ libdl.so android-studio-3.0.1_1
 libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
 libsearpc.so.1 libsearpc-3.0.7_1
 libseafile.so.0 seafile-libclient-5.0.4_1
-libpodofo.so.0.9.6 libpodofo-0.9.6_1
+libpodofo.so.0.9.7 libpodofo-0.9.7_1
 libIrcUtil.so.3 libcommuni-3.4.0_1
 libIrcCore.so.3 libcommuni-3.4.0_1
 libIrcModel.so.3 libcommuni-3.4.0_1

From f3d875680c2001610750070233d2e3f8360f99e6 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 23:17:16 +0000
Subject: [PATCH 0498/3482] pd: update to 0.51.4.

---
 srcpkgs/pd/patches/fix-musl.patch | 15 ---------------
 srcpkgs/pd/template               |  4 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/pd/patches/fix-musl.patch

diff --git a/srcpkgs/pd/patches/fix-musl.patch b/srcpkgs/pd/patches/fix-musl.patch
deleted file mode 100644
index 6e1d1f0eaa2c..000000000000
--- a/srcpkgs/pd/patches/fix-musl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/x_text.c.orig	2019-08-29 10:11:27.734179939 +0200
-+++ src/x_text.c	2019-08-29 10:12:06.392225034 +0200
-@@ -475,9 +475,10 @@ found in msvcrt (which indeed it isn't i
- on this, just call qsort if we're Microsoft and single-instance.  I hope nobody
- will try to compile multi-instance Pd for 32-bit windows, but if they
- do, they might run into my qsort_s problem again. */
--#if defined(_WIN32) && !defined(PDINSTANCE)
-+#if (!defined(__GLIBC__) || defined(_WIN32)) && !defined(PDINSTANCE)
- #define MICROSOFT_STUPID_SORT
--static void *stupid_zkeyinfo;
-+#include <threads.h>
-+thread_local static void *stupid_zkeyinfo;
- static int stupid_sortcompare(const void *z1, const void *z2) {
-     return (text_sortcompare(z1, z2, stupid_zkeyinfo)); }
- #endif
diff --git a/srcpkgs/pd/template b/srcpkgs/pd/template
index 7c298742f980..f40acaf97339 100644
--- a/srcpkgs/pd/template
+++ b/srcpkgs/pd/template
@@ -1,6 +1,6 @@
 # Template file for 'pd'
 pkgname=pd
-version=0.51.2
+version=0.51.4
 revision=1
 _ver=${version%.*}-${version##*.}
 wrksrc="$pkgname-$_ver"
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-3-Clause"
 homepage="https://puredata.info"
 distfiles="http://msp.ucsd.edu/Software/pd-$_ver.src.tar.gz"
-checksum=b09ad89ad6f419b410644ef7d8dcf34459d21a7ab61a593244ecfaae2ca3f3c9
+checksum=52591f18316e9f2471ca21c3d6b41c56336e0615ec40a093232e95cc230bfcc1
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) # Causes pd to fail if qsort is used without thread local storage.
 		CFLAGS="-DMICROSOFT_STUPID_SORT" ;;

From 9e8eb877683a27e8e3d0aff95277e172668f2a12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:39:21 +0700
Subject: [PATCH 0499/3482] Revert "Thunar: update to 4.17.0."

This reverts commit 41ddb96f66b73ba818c997f21325fe2fc76ed4a0.

Close: #28223
---
 srcpkgs/Thunar/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 2d3b6d277ad7..004b48ee50c2 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,7 +1,8 @@
 # Template file for 'Thunar'
 pkgname=Thunar
-version=4.17.0
-revision=1
+reverts="4.17.0_1"
+version=4.16.1
+revision=2
 wrksrc=thunar-${version}
 build_style=gnu-configure
 build_helper="gir"
@@ -11,13 +12,13 @@ configure_args="--enable-gio-unix --enable-gudev
 hostmakedepends="pkg-config intltool"
 makedepends="exo-devel libexif-devel libgudev-devel libnotify-devel xfce4-panel-devel"
 depends="desktop-file-utils hicolor-icon-theme"
-short_desc="Thunar File Manager for XFCE"
+short_desc="Thunar File Manager"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://docs.xfce.org/xfce/thunar/Start"
 changelog="https://raw.githubusercontent.com/xfce-mirror/thunar/master/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=ad004f02d8bda692d76ec2a264e3e1121ae065f3d2ecc9cfe7dd82cd5c69f8a5
+checksum=da2d17d2cb69eb33768690b714cc232ed367cbd71eb9543aaa2a805d05dc3ce1
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd

From 568d6745f884100ae8f92ccdb6374b5a94552324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 07:36:18 +0700
Subject: [PATCH 0500/3482] podofo: remove applied patches

---
 srcpkgs/podofo/patches/remove-copy_directory.patch | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 srcpkgs/podofo/patches/remove-copy_directory.patch

diff --git a/srcpkgs/podofo/patches/remove-copy_directory.patch b/srcpkgs/podofo/patches/remove-copy_directory.patch
deleted file mode 100644
index 7b4476beb2f9..000000000000
--- a/srcpkgs/podofo/patches/remove-copy_directory.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- test/TokenizerTest/CMakeLists.txt	2007-09-16 11:33:38.000000000 +0200
-+++ test/TokenizerTest/CMakeLists.txt	2018-08-13 21:31:29.943414615 +0200
-@@ -2,10 +2,3 @@
- TARGET_LINK_LIBRARIES(TokenizerTest ${PODOFO_LIB} ${PODOFO_LIB_DEPENDS})
- SET_TARGET_PROPERTIES(TokenizerTest PROPERTIES COMPILE_FLAGS "${PODOFO_CFLAGS}")
- ADD_DEPENDENCIES(TokenizerTest ${PODOFO_DEPEND_TARGET})
--
--# Copy the test samples over to the build tree
--ADD_CUSTOM_COMMAND(
--    TARGET TokenizerTest
--    POST_BUILD
--    COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/objects" "${CMAKE_CURRENT_BINARY_DIR}/objects"
--    )

From 7f57dadfe2e5561317060475aa51a228db8b08ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 07:48:22 +0700
Subject: [PATCH 0501/3482] pd: fix musl build

---
 srcpkgs/pd/patches/musl-no-qsort_r.patch | 14 ++++++++++++++
 srcpkgs/pd/template                      |  4 ----
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/pd/patches/musl-no-qsort_r.patch

diff --git a/srcpkgs/pd/patches/musl-no-qsort_r.patch b/srcpkgs/pd/patches/musl-no-qsort_r.patch
new file mode 100644
index 000000000000..dbc65956d0e4
--- /dev/null
+++ b/srcpkgs/pd/patches/musl-no-qsort_r.patch
@@ -0,0 +1,14 @@
+Index: src/x_text.c
+===================================================================
+--- src/x_text.c.orig
++++ src/x_text.c
+@@ -475,7 +475,8 @@ equal:
+  * Both are not available in Emscripten, Android or older MSVC versions.
+  * 'stupid_sortcompare' is thread-safe but not reentrant.
+  */
+-#if defined(_WIN32) || defined(__EMSCRIPTEN__) || defined(__ANDROID__)
++#if defined(_WIN32) || defined(__EMSCRIPTEN__) || defined(__ANDROID__) \
++	|| (defined(__linux__) && !defined(__GLIBC__))
+ #define STUPID_SORT
+ static PERTHREAD void *stupid_zkeyinfo;
+ static int stupid_sortcompare(const void *z1, const void *z2)
diff --git a/srcpkgs/pd/template b/srcpkgs/pd/template
index f40acaf97339..544afccd5410 100644
--- a/srcpkgs/pd/template
+++ b/srcpkgs/pd/template
@@ -15,10 +15,6 @@ license="BSD-3-Clause"
 homepage="https://puredata.info"
 distfiles="http://msp.ucsd.edu/Software/pd-$_ver.src.tar.gz"
 checksum=52591f18316e9f2471ca21c3d6b41c56336e0615ec40a093232e95cc230bfcc1
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) # Causes pd to fail if qsort is used without thread local storage.
-		CFLAGS="-DMICROSOFT_STUPID_SORT" ;;
-esac
 
 pre_configure() {
 	./autogen.sh

From b52925a29cef32d93d8d0bb978c22b8fa815de46 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Mon, 25 Jan 2021 21:58:50 +0100
Subject: [PATCH 0502/3482] shorewall: update to 5.2.8

---
 srcpkgs/shorewall/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template
index 932c9281c2b1..b006e403d5ee 100644
--- a/srcpkgs/shorewall/template
+++ b/srcpkgs/shorewall/template
@@ -1,7 +1,7 @@
 # Template file for 'shorewall'
 pkgname=shorewall
-version=5.2.7
-revision=2
+version=5.2.8
+revision=1
 create_wrksrc=yes
 depends="shorewall-core perl"
 short_desc="Iptables-based firewall for Linux systems"
@@ -13,9 +13,9 @@ changelog="${_disturl}/releasenotes.txt"
 distfiles="${_disturl}/${pkgname}-${version}.tar.bz2
  ${_disturl}/${pkgname}6-${version}.tar.bz2
  ${_disturl}/${pkgname}-core-${version}.tar.bz2"
-checksum="fea6cdab5d844c29c4c6dcd6d77aa6fd1700af29814c5259252f83fd0b34fa15
- 4fc5a1a9e18f1134925ce7edf094e5f4dd076ccf094521e55cc2000ee0e8fa9a
- ebfd03a4114fbf1a204b72b9d9b7a9fd12b406c4a6b819135d9864103c22542a"
+checksum="fbb5ab492ed372eaaf02817cc730f82c49a81c5a5f5cee4bc8f1bce846f2306d
+ e82c3a9538b6548195398dc39c83b01bcf66eb5a22814c915a924b9adc088cd1
+ 39996b9697a2017947049ad3f03cb278e8f939ff924b2bb4bf2a0bc17c59988e"
 
 make_dirs="/var/lib/${pkgname} 0755 0 0"
 conf_files="/etc/${pkgname}/*"

From 1102afd3b6056e3ca667a25f8103aa22924bcafa Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:43:30 +0100
Subject: [PATCH 0503/3482] gnome-settings-daemon: update to 3.38.1.

---
 srcpkgs/gnome-settings-daemon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index b6da28e25544..ecc62cf27782 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
-configure_args+="-Dsystemd=false"
+configure_args="-Dsystemd=false"
 hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
  perl pkg-config"
 makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr-devel
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b7ed5b5fab9aad192ceed6a95be2805124e3c63c46891bbae076f7ec3fd6792e
+checksum=e28121d91af82a2efa88f166d0c1e306c591f62f01ef7f553d48b6c13f070164
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit"

From 895a1c17564dd78b44a3e7c680392b14137d351a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 24 Jan 2021 23:03:29 +0200
Subject: [PATCH 0504/3482] wps-office: update to 11.1.0.10161.

---
 srcpkgs/wps-office/template | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index f90dcfe9263d..68180a6e4f52 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,29 +1,29 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.9719
+version=11.1.0.10161
 revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-#The old Kingsoft WPS Community License has disappeared from the
-#site. There is an EULA in the archive which is instaled as license
-#and a non-downloadable EULA which is accesible from inside the program:
-#https://www.wps.com/eula?distsrc=2020help&lang=en_US&version=11.1.0.9719
+# The old Kingsoft WPS Community License has disappeared from the
+# site. There is an EULA in the archive which is instaled as license
+# and a non-downloadable EULA which is accesible from inside the program:
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=6f3f1d2aa1f98aff397eac9b2d819d094dfc297b7340e20a70c5740eb6ea79f2
+checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
 
 
-#The programs themselves are PIE, but the error reporter isn't :/
+# The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9719/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
@@ -34,13 +34,13 @@ do_install() {
 
 post_install() {
 
-	#Clean up:
-	#Delete everything under /etc. It contains cron, logrotate and autostart
+	# Clean up:
+	# Delete everything under /etc. It contains cron, logrotate and autostart
 	# configuration for the update check and a seperate menu category for the
 	# wps programs that does not work.
 	rm -rf ${DESTDIR}/etc
 
-	#Delete postinst and prerm scripts
+	# Delete postinst and prerm scripts
 	rm -rf ${DESTDIR}/opt/kingsoft/wps-office/INSTALL
 
 	# Install license

From b41f221bd33a0680ce430bbd279794f9b76f0096 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sun, 24 Jan 2021 20:26:38 +0000
Subject: [PATCH 0505/3482] bettercap: update to 2.29.

---
 srcpkgs/bettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template
index a32b9145c35f..c42a23ca0761 100644
--- a/srcpkgs/bettercap/template
+++ b/srcpkgs/bettercap/template
@@ -1,6 +1,6 @@
 # Template file for 'bettercap'
 pkgname=bettercap
-version=2.28
+version=2.29
 revision=1
 build_style=go
 go_import_path=github.com/bettercap/bettercap
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/bettercap/bettercap"
 distfiles="https://github.com/bettercap/bettercap/archive/v${version}.tar.gz"
-checksum=5bde85117679c6ed8b5469a5271cdd5f7e541bd9187b8d0f26dee790c37e36e9
+checksum=c414be98a48d9f279460b325dddaef8479132a1470c6f305790d79e04dac1297
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	CPPFLAGS="-Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t"

From a959fe8268944e580b3257f2f92e70e454007c15 Mon Sep 17 00:00:00 2001
From: John Rowley <hey@johnrowley.me>
Date: Sun, 24 Jan 2021 18:24:47 +0100
Subject: [PATCH 0506/3482] ncmpcpp: update to 0.9.2.

---
 srcpkgs/ncmpcpp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index a0c09efdc6f4..0e036b303a35 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,6 +1,6 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
-version=0.9.1
+version=0.9.2
 revision=1
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://rybczak.net/ncmpcpp"
 distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
-checksum=cb814a39c975f5b19c466188433644d1cbdb6db0abe1481d525587b149b36574
+checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
 
 # Required by waddwstr() with ncurses on musl
 CXXFLAGS="-D_XOPEN_SOURCE=600"

From 4813bf9467aabf8ec0415429d3dae12c4f32828d Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 24 Jan 2021 18:08:32 +0300
Subject: [PATCH 0507/3482] gallery-dl: update to 1.16.4

---
 srcpkgs/gallery-dl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 83bc94c2ecd2..1a761809852f 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'gallery-dl'
 pkgname=gallery-dl
-version=1.16.3
+version=1.16.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,8 +11,8 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/mikf/gallery-dl"
 changelog="https://raw.githubusercontent.com/mikf/gallery-dl/master/CHANGELOG.md"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ca1b8069a614fdc1f71ba9b33c157c1a0557efa8a77793236e2de4b20d27c053
+distfiles="https://github.com/mikf/gallery-dl/archive/v${version}.tar.gz"
+checksum=92b774e1406b35940861d9bc53f47ace7a096e60410b98560652688c61d8653c
 
 do_check() {
 	make test

From 451e24a64776ed5034c24870f7bc256e05b76f6f Mon Sep 17 00:00:00 2001
From: Jaume Devesa <jaume@mailbox.org>
Date: Sun, 24 Jan 2021 06:52:18 +0100
Subject: [PATCH 0508/3482] sfeed_curses: update to 0.9.8

---
 srcpkgs/sfeed_curses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index 1676c0d06cb7..f3922d028ecc 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.7
+version=0.9.8
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=b45617e410894290bb1d5ca24d1ffb114b3eeaff4aa3d2830d15a465943d03ec
+checksum=d7ece9cb2ef94d0e97418dfea80d43a102a271f752c19e3afc4d645c9679c555
 post_install() {
 	vlicense LICENSE
 	vdoc README

From ab78fbd4525152db1b775e20e5151a933e3c048e Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 24 Jan 2021 11:31:24 +0100
Subject: [PATCH 0509/3482] onefetch: update to 2.9.1.

---
 srcpkgs/onefetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/onefetch/template b/srcpkgs/onefetch/template
index f2995f3aea04..f71be1e0bfd9 100644
--- a/srcpkgs/onefetch/template
+++ b/srcpkgs/onefetch/template
@@ -1,6 +1,6 @@
 # Template file for 'onefetch'
 pkgname=onefetch
-version=2.8.0
+version=2.9.1
 revision=1
 build_style=cargo
 short_desc="Git repository summary on your terminal"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/o2sh/onefetch"
 distfiles="https://github.com/o2sh/onefetch/archive/v${version}.tar.gz"
-checksum=0be1a4a779ee01a72d104ef854163d67a5cbb5b988816046f5cfbee8bd08834d
+checksum=33ac8e019e5b7412fec3c7593843e0c3780ca473498c31e36cbe95371fff943b
 
 post_install() {
 	vlicense LICENSE.md

From 312f4de0f4b8f885e66bcaf98d2ab8589a95acbf Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 03:29:34 +0100
Subject: [PATCH 0510/3482] PopCorn: rebuild everywhere with gccgo again

---
 srcpkgs/PopCorn/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index fe84490de6b5..da4bfa9deac7 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -1,14 +1,14 @@
 # Template file for 'PopCorn'
 pkgname=PopCorn
 version=0.4
-revision=4
+revision=5
 build_style=go
 go_import_path=github.com/the-maldridge/popcorn
 go_package="${go_import_path}/cmd/popcorn
  ${go_import_path}/cmd/popcornctl
  ${go_import_path}/cmd/statrepo
  ${go_import_path}/cmd/pqueryd"
-hostmakedepends="git"
+hostmakedepends="git gcc-go-tools"
 depends="snooze"
 short_desc="Package statistics system"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
@@ -17,10 +17,6 @@ homepage="https://github.com/the-maldridge/PopCorn"
 distfiles="https://github.com/the-maldridge/PopCorn/archive/v${version}.tar.gz"
 checksum=b25589802c5e1c277d2e9536add44704a012359b02d7fb4be1b4b0f11eb10d93
 
-if [ -z "$CROSS_BUILD" -o "$XBPS_TARGET_LIBC" != "musl" ]; then
-	hostmakedepends+=" gcc-go-tools"
-fi
-
 system_accounts="_popcorn"
 _popcorn_homedir="/var/lib/popcorn"
 make_dirs="

From dc421d3c7361947d22583f2ba307061b4c3104df Mon Sep 17 00:00:00 2001
From: Konstantin Kulikov <k.kulikov2@gmail.com>
Date: Sun, 24 Jan 2021 05:25:10 +0300
Subject: [PATCH 0511/3482] FAudio: fix linking against libSDL

---
 srcpkgs/FAudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FAudio/template b/srcpkgs/FAudio/template
index b60a953b4ca3..846463ca51c6 100644
--- a/srcpkgs/FAudio/template
+++ b/srcpkgs/FAudio/template
@@ -1,10 +1,10 @@
 # Template file for 'FAudio'
 pkgname=FAudio
 version=20.11
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DGSTREAMER=ON -DSDL2_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include/SDL2
- -DSDL2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib"
+ -DSDL2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libSDL2.so"
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel gstreamer1-devel gst-plugins-base1-devel"
 short_desc="Accuracy-focused XAudio reimplementation for open platforms"

From b392e43f86697008a8552d6586998c469df56509 Mon Sep 17 00:00:00 2001
From: Konstantin Kulikov <k.kulikov2@gmail.com>
Date: Sun, 24 Jan 2021 05:25:46 +0300
Subject: [PATCH 0512/3482] wine: rebuild against fixed FAudio

---
 srcpkgs/wine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index e8b1fda250c0..3694984c42d6 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=6.0
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}

From 4b637d7dfd2b9e91988c2171856531f79c09ac39 Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <proximyst@proximyst.com>
Date: Fri, 22 Jan 2021 19:29:20 +0100
Subject: [PATCH 0513/3482] gradle: update to 6.8.1.

---
 srcpkgs/gradle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index b1809a634e43..8e9f08a9910b 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -1,6 +1,6 @@
 # Template file for 'gradle'
 pkgname=gradle
-version=6.7.1
+version=6.8.1
 revision=1
 depends="virtual?java-environment"
 short_desc="Build system for Java/C/C++ software"
@@ -9,7 +9,7 @@ license="Apache-2.0"
 homepage="https://gradle.org/"
 changelog="https://docs.gradle.org/${version}/release-notes.html"
 distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d
+checksum=fd591a34af7385730970399f473afabdb8b28d57fd97d6625c388d090039d6fd
 
 do_install() {
 	vmkdir "usr/lib/gradle"

From 418d691d6e4b3b8420349f5f05e5e6dbf7ea53ea Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sun, 17 Jan 2021 06:11:42 -0700
Subject: [PATCH 0514/3482] libva: update to 2.10.0.

---
 srcpkgs/libva/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index 1514b24c6c21..a66eebcb82c6 100644
--- a/srcpkgs/libva/template
+++ b/srcpkgs/libva/template
@@ -1,7 +1,8 @@
 # Template file for 'libva'
+# NOTE: keep this pkg synchronized with libva-glx
 pkgname=libva
-version=2.9.1
-revision=2
+version=2.10.0
+revision=1
 build_style=meson
 configure_args="-Dwith_glx=no $(vopt_if wayland -Dwith_wayland=yes)"
 hostmakedepends="pkg-config wayland-devel"
@@ -13,7 +14,7 @@ license="MIT"
 homepage="https://01.org/linuxmedia/vaapi"
 changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS"
 distfiles="https://github.com/intel/libva/archive/${version}.tar.gz"
-checksum=4e8640f65ad659332c5d24b7715703c95e820083ee11126c9cd051d418e3d9e0
+checksum=f04d5c829da602690f9f098a6d92065507ec9d0c957c1a6df3dea4e2de1204c5
 
 build_options="wayland"
 build_options_default="wayland"

From 4e865083b67fca7c28cf6bd7915912e714b53b8c Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sun, 17 Jan 2021 06:11:37 -0700
Subject: [PATCH 0515/3482] intel-gmmlib: update to 20.4.1.

---
 srcpkgs/intel-gmmlib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intel-gmmlib/template b/srcpkgs/intel-gmmlib/template
index 131a7ba673eb..de10b7059d95 100644
--- a/srcpkgs/intel-gmmlib/template
+++ b/srcpkgs/intel-gmmlib/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-gmmlib'
 pkgname=intel-gmmlib
-version=20.3.3
+version=20.4.1
 revision=1
 archs="i686* x86_64*"
 wrksrc=gmmlib-intel-gmmlib-${version}
@@ -11,7 +11,7 @@ maintainer="Stefano Ragni <st3r4g@protonmail.com>"
 license="MIT"
 homepage="https://github.com/intel/gmmlib"
 distfiles="https://github.com/intel/gmmlib/archive/intel-gmmlib-${version}.tar.gz"
-checksum=a9ac5be82822652414fe1d7260c9fa80aa14c07c137de5c4d73f23989a13ff77
+checksum=d54d547f9f9e74196dead6a338923039ea10c859f1f693f33f10be1562b81d6d
 
 lib32disabled=yes
 

From 244d63428098cc2b40f15dcb24f5a30fd4ed39a7 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sun, 17 Jan 2021 06:11:32 -0700
Subject: [PATCH 0516/3482] intel-media-driver: update to 20.4.5.

---
 srcpkgs/intel-media-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index 9877436f2232..6120080c93a5 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-media-driver'
 pkgname=intel-media-driver
-version=20.4.1
+version=20.4.5
 revision=1
 archs="x86_64*"
 wrksrc=media-driver-intel-media-${version}
@@ -13,7 +13,7 @@ maintainer="Stefano Ragni <st3r4g@protonmail.com>"
 license="MIT, BSD-3-Clause"
 homepage="https://github.com/intel/media-driver"
 distfiles="https://github.com/intel/media-driver/archive/intel-media-${version}.tar.gz"
-checksum=d72e8a71e4543e072172a8bb57432bcf9166931f341fe90349383cbff1e429d8
+checksum=3d856a963127ddd6690fc6dac521d7674947675d5f20452f1e6f45c0fc83f9e6
 
 build_options="nonfree"
 desc_option_nonfree="Enable nonfree kernels"

From 5cbd574c1ba0f82642ea482e2767cd59aebe19a3 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Tue, 19 Jan 2021 23:41:04 -0700
Subject: [PATCH 0517/3482] libva-glx: update to 2.10.0.

---
 srcpkgs/libva-glx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libva-glx/template b/srcpkgs/libva-glx/template
index e408ac0622e2..472694b56e13 100644
--- a/srcpkgs/libva-glx/template
+++ b/srcpkgs/libva-glx/template
@@ -7,7 +7,7 @@
 # KEEP THIS PACKAGE SYNCHRONIZED WITH "libva".
 #
 pkgname=libva-glx
-version=2.9.1
+version=2.10.0
 revision=1
 wrksrc="libva-${version}"
 build_style=meson
@@ -20,7 +20,7 @@ license="MIT"
 homepage="https://01.org/linuxmedia/vaapi"
 changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS"
 distfiles="https://github.com/intel/libva/archive/${version}.tar.gz"
-checksum=4e8640f65ad659332c5d24b7715703c95e820083ee11126c9cd051d418e3d9e0
+checksum=f04d5c829da602690f9f098a6d92065507ec9d0c957c1a6df3dea4e2de1204c5
 
 post_install() {
 	# We are only interested in the glx component, remove everything else.

From f0faeda0a1d0b0c3bc29e86da4ed96ef4d1c55bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Thu, 14 Jan 2021 10:13:40 +0100
Subject: [PATCH 0518/3482] sof-firmware: use provided install script

Previous versions of this package manually linked firmware files.
This caused some firmwares to slip by unlinked.

As a consequence, the following errors were encountered on boot
with a Tiger Lake processor.

```
[   11.829580] sof-audio-pci 0000:00:1f.3: error: request firmware intel/sof/sof-tgl.ri failed err: -2
[   11.829709] sof-audio-pci 0000:00:1f.3: error: failed to load DSP firmware -2
[   11.830177] sof-audio-pci 0000:00:1f.3: error: sof_probe_work failed err: -2
```
---
 srcpkgs/sof-firmware/template | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/sof-firmware/template b/srcpkgs/sof-firmware/template
index cf237de16a6f..544ce9c5893e 100644
--- a/srcpkgs/sof-firmware/template
+++ b/srcpkgs/sof-firmware/template
@@ -1,7 +1,7 @@
 # Template file for 'sof-firmware'
 pkgname=sof-firmware
 version=1.6.1
-revision=1
+revision=2
 archs="i686* x86_64*"
 wrksrc="sof-bin-${version}"
 depends="alsa-ucm-conf"
@@ -13,27 +13,11 @@ distfiles="https://github.com/thesofproject/sof-bin/archive/v${version}.tar.gz"
 checksum=587b320030bc84de1aacba5d86d89ba1a4f67201baf8b9b61bb885af60643bfb
 
 do_install() {
-	local intel_path="lib/firmware/intel"
-	for f in ${intel_path}/sof/v${version}/*.{ldc,ri}; do
-		vinstall ${f} 0644 /usr/${intel_path}/sof
-	done
-	for f in ${intel_path}/sof/v${version}/intel-signed/*; do
-		vinstall ${f} 0644 /usr/${intel_path}/sof/intel-signed
-	done
-	for f in ${intel_path}/sof/v${version}/public-signed/*; do
-		vinstall ${f} 0644 /usr/${intel_path}/sof/public-signed
-	done
-	for arc in {bdw,byt,cht}; do
-		ln -s sof-${arc}-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-${arc}.ri
-	done
-	for arc in {apl,cnl,icl}; do
-		ln -s intel-signed/sof-${arc}-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-${arc}.ri
-	done
-	ln -s intel-signed/sof-apl-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-glk.ri
-	ln -s intel-signed/sof-cnl-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-cfl.ri
-	ln -s intel-signed/sof-cnl-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-cml.ri
-	for f in ${intel_path}/sof-tplg-v${version}/*; do
-		vinstall ${f} 0644 /usr/${intel_path}/sof-tplg
-	done
 	vlicense LICENCE.NXP
+
+	export ROOT="${DESTDIR}/usr"
+	export SOF_VERSION="v${version}"
+
+	vmkdir usr/lib/firmware/intel
+	./go.sh
 }

From 021e20a68de49c571f35e0d14cf8e1b079f0ec4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 00:17:19 -0300
Subject: [PATCH 0519/3482] calibre: revbump for libpodofo.

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 738dfda3d512..7a3d542de69b 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 482d61ea627eace8f3bb68c0aabe648f1ca9e876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 00:17:19 -0300
Subject: [PATCH 0520/3482] libgdal: revbump for libpodofo.

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 2bb083d3f5e1..7175f0caf63e 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=7
+revision=8
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From a2561571c7774c9e35279949a2ae5a72bc779eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 00:57:28 -0300
Subject: [PATCH 0521/3482] libva-utils: update to 2.10.0.

---
 srcpkgs/libva-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libva-utils/template b/srcpkgs/libva-utils/template
index 1b3d2578b260..2e988e97674e 100644
--- a/srcpkgs/libva-utils/template
+++ b/srcpkgs/libva-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'libva-utils'
 pkgname=libva-utils
-version=2.9.1
+version=2.10.0
 revision=1
 build_style=meson
 configure_args="-Ddrm=true -Dx11=true -Dwayland=true"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://01.org/linuxmedia/vaapi"
 changelog="https://raw.githubusercontent.com/intel/libva-utils/master/NEWS"
 distfiles="https://github.com/intel/libva-utils/archive/${version}.tar.gz"
-checksum=7cd7111349cdc227c64d5ab68de4a03eacbea26441c7781ccd548491994f0320
+checksum=cbb7f9f6eae21d772e31b67bc8c311be6e35fe9c65e63acc57f9b16d72bf8dc0
 
 post_install() {
 	vlicense COPYING

From 9de84d0a5bccd5dde5e127e26f2727de4e33f5de Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@ae-design.ws>
Date: Wed, 6 Jan 2021 14:47:35 +0100
Subject: [PATCH 0522/3482] python3-enchant: update to 3.2.0.

Closes: #28107 [via git-merge-pr]
---
 srcpkgs/python3-enchant/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-enchant/template b/srcpkgs/python3-enchant/template
index f7593aef017f..43ca65c38702 100644
--- a/srcpkgs/python3-enchant/template
+++ b/srcpkgs/python3-enchant/template
@@ -1,16 +1,16 @@
 # Template file for 'python3-enchant'
 pkgname=python3-enchant
-version=3.1.1
-revision=3
+version=3.2.0
+revision=1
 wrksrc="pyenchant-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools enchant2-devel"
 depends="enchant2"
 # needs an en_US dict to run
-checkdepends="$depends python3-pytest python3-pytest-cov hunspell-en_US"
+checkdepends="$depends python3-pytest hunspell-en_US"
 short_desc="Spellchecking library for Python 3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
-homepage="https://github.com/rfk/pyenchant"
+homepage="https://github.com/pyenchant/pyenchant"
 distfiles="https://github.com/pyenchant/pyenchant/archive/v${version}.tar.gz"
-checksum=ced3a776116e63ed7e496401ed23ac4ba52ac7942cd808492e8e654b27dccacd
+checksum=3195bfc5cfbdeb8a60f9484390c2c982e59dd220d6f9a5f8418ba67551ead01a

From 9749405eabcf46f32fc661c27574b734aa1093a4 Mon Sep 17 00:00:00 2001
From: Will Springer <skirmisher@protonmail.com>
Date: Thu, 17 Dec 2020 23:57:55 -0800
Subject: [PATCH 0523/3482] pinebookpro-kernel: update to 5.10.9, enable
 instructions deprecated by ARMv8

The config change allows 32-bit userlands to run some older ARMv6/7
binaries, e.g. distributed for Android or Raspberry Pi, plus some game
dependencies like FMOD. It mirrors our main arm64 config and is toggleable
via sysctl anyway.

Miscellaneous config changes occurred for gcc/binutils/etc. bump.
---
 srcpkgs/pinebookpro-kernel/files/dotconfig | 17 +++++++++--------
 srcpkgs/pinebookpro-kernel/template        |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/pinebookpro-kernel/files/dotconfig b/srcpkgs/pinebookpro-kernel/files/dotconfig
index 5ea656568c18..c45b7930c76c 100644
--- a/srcpkgs/pinebookpro-kernel/files/dotconfig
+++ b/srcpkgs/pinebookpro-kernel/files/dotconfig
@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.1 Kernel Configuration
+# Linux/arm64 5.10.9 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 9.3.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=234000000
+CONFIG_GCC_VERSION=100201
+CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
@@ -408,7 +408,10 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
 CONFIG_COMPAT=y
 CONFIG_KUSER_HELPERS=y
-# CONFIG_ARMV8_DEPRECATED is not set
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_SWP_EMULATION=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
 
 #
 # ARMv8.1 architectural features
@@ -451,6 +454,7 @@ CONFIG_ARM64_TLB_RANGE=y
 # ARMv8.5 architectural features
 #
 CONFIG_ARM64_BTI=y
+CONFIG_ARM64_BTI_KERNEL=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
 CONFIG_ARM64_E0PD=y
 CONFIG_ARCH_RANDOM=y
@@ -4484,7 +4488,6 @@ CONFIG_MFD_VIPERBOARD=m
 CONFIG_MFD_RK808=m
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SL28CPLD is not set
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 # CONFIG_MFD_SKY81452 is not set
@@ -5906,7 +5909,6 @@ CONFIG_SND_SOC_AMD_ACP=m
 
 CONFIG_SND_I2S_HI6210_I2S=m
 # CONFIG_SND_SOC_IMG is not set
-# CONFIG_SND_SOC_INTEL_KEEMBAY is not set
 # CONFIG_SND_SOC_MTK_BTCVSD is not set
 CONFIG_SND_SOC_ROCKCHIP=m
 CONFIG_SND_SOC_ROCKCHIP_I2S=m
@@ -6458,7 +6460,6 @@ CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 # CONFIG_APPLE_MFI_FASTCHARGE is not set
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index db12c82602f0..79931617762a 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -1,6 +1,6 @@
 # Template file for 'pinebookpro-kernel'
 pkgname=pinebookpro-kernel
-version=5.10.2
+version=5.10.9
 revision=1
 archs="aarch64*"
 wrksrc="linux-${version}"
@@ -9,7 +9,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=3b84e13abae26af17ebccc4d7212f5843a991127a73a320848d5c6942ef781a2
+checksum=7f733e0dd8bbb6929aae2191cf6b9dc0b0ec1dad77ab3f5d3aad1b7fe96c4751
 patch_args="-Np1"
 python_version=3
 

From 4f1a0f76447e43cffcf39507cd490d4dfd4eb98b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 06:21:15 +0100
Subject: [PATCH 0524/3482] stoken: bump to fix some nonsense

The commit 80c99fd1e35afe34c40b05612e44d8a9cfe8b559 changed revision
back, which seems horribly wrong
---
 srcpkgs/stoken/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stoken/template b/srcpkgs/stoken/template
index 98293c153c12..1536d77d1005 100644
--- a/srcpkgs/stoken/template
+++ b/srcpkgs/stoken/template
@@ -1,7 +1,7 @@
 # Template file for 'stoken'
 pkgname=stoken
 version=0.92
-revision=2
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkgconf"
 makedepends="libxml2-devel nettle-devel gtk+3-devel"

From 7526cb399caf3f4325161231b9737cf03d766752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 25 Jan 2021 12:56:25 -0300
Subject: [PATCH 0525/3482] epiphany: update to 3.38.2.

---
 srcpkgs/epiphany/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index f23b23c6fbea..d4365e58bbbf 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=3.38.0
+version=3.38.2
 revision=1
 build_helper="gir"
 build_style=meson
@@ -15,5 +15,6 @@ short_desc="Intuitive GNOME web browser"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Web"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=228e820d7c7f8541e4db5ecc6c81b5a88bde9b1ea17cae4a5f38446f7989c552
+checksum=8b05f2bcc1e80ecf4a10f6f01b3285087eb4cbdf5741dffb8c0355715ef5116d

From 1c6da7acca0f4493b7bd2bcd1ff1c4402ef17864 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Jan 2021 10:10:33 +0100
Subject: [PATCH 0526/3482] kubecfg: update to 0.17.0.

---
 srcpkgs/kubecfg/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index 96510c9b3358..b315f7246df7 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,6 +1,6 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
@@ -10,8 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/bitnami/kubecfg"
 distfiles="https://github.com/bitnami/kubecfg/archive/v${version}.tar.gz"
-checksum=08846d19db0250a21d553cdaf1f0461dc398031b9ac76ccd360b169703f63567
-
-if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
-	broken="go-jsonnet/builtins.go fails for 32 bit architectures"
-fi
+checksum=3e98d4d328b2265b4105c77fb83d2af78cec7e10adc8964b7fd45bade8dcdb7d

From 9e9a2c561d0b66db631671a34e8f96decc9657d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 26 Jan 2021 10:53:36 +0100
Subject: [PATCH 0527/3482] librsvg: fix cross build

$XBPS_TARGET_MACHINE is empty when configure_args are expanded.
The --host is set by the build style for cross builds anyway.

Also remove the vala and gir build options and always build
the introspection and vala interface files.

Closes: #28234
---
 srcpkgs/librsvg/template | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template
index f8398b9d5efa..3e4954a13326 100644
--- a/srcpkgs/librsvg/template
+++ b/srcpkgs/librsvg/template
@@ -5,12 +5,10 @@ version=2.48.8
 revision=1
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --host=${XBPS_TARGET_TRIPLET}
- $(vopt_enable gir introspection) $(vopt_enable vala)"
-hostmakedepends="cargo pkg-config python glib-devel
- gdk-pixbuf-devel $(vopt_if vala vala)"
+configure_args="--disable-static --enable-introspection --enable-vala"
+hostmakedepends="cargo pkg-config python glib-devel gdk-pixbuf-devel vala"
 makedepends="cairo-devel freetype-devel gdk-pixbuf-devel libcroco-devel
- libglib-devel libxml2-devel pango-devel rust $(vopt_if vala vala)"
+ libglib-devel libxml2-devel pango-devel rust vala"
 short_desc="SVG library for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
@@ -18,10 +16,6 @@ homepage="https://wiki.gnome.org/Projects/LibRsvg"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f480a325bbdf26d1874eb6fb330ebc5920ba64e3e08de61931bb4506dfef2692
 
-# Package build options
-build_options="gir vala"
-build_options_default="gir vala"
-
 do_check() {
 	# reference files are for pango 1.44.x, we're on 1.42.x
 	:

From c303c88f2c31d3ccf8ae6c11d33af4683e170cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 26 Jan 2021 12:12:12 +0100
Subject: [PATCH 0528/3482] djvulibre: fix cross build

---
 srcpkgs/djvulibre/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/djvulibre/template b/srcpkgs/djvulibre/template
index ff103ff33cb4..1425c4835016 100644
--- a/srcpkgs/djvulibre/template
+++ b/srcpkgs/djvulibre/template
@@ -3,7 +3,6 @@ pkgname=djvulibre
 version=3.5.28
 revision=1
 build_style=gnu-configure
-configure_args="--host=${XBPS_TRIPLET}"
 hostmakedepends="pkg-config automake libtool"
 makedepends="tiff-devel"
 short_desc="Utilities for the DjVu image format"

From 7c031fe7f660246673bae0b6a36ce470e4573696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 14:53:18 +0700
Subject: [PATCH 0529/3482] bootchart2: update to 0.14.9.

---
 srcpkgs/bootchart2/patches/Makefile.patch     | 20 -----------
 srcpkgs/bootchart2/patches/python-3.9.patch   | 35 +++++++++++++++++++
 .../bootchart2/patches/rdinit-fix-panic.patch | 10 ++++++
 srcpkgs/bootchart2/template                   | 25 +++++++------
 4 files changed, 60 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/bootchart2/patches/Makefile.patch
 create mode 100644 srcpkgs/bootchart2/patches/python-3.9.patch
 create mode 100644 srcpkgs/bootchart2/patches/rdinit-fix-panic.patch

diff --git a/srcpkgs/bootchart2/patches/Makefile.patch b/srcpkgs/bootchart2/patches/Makefile.patch
deleted file mode 100644
index 52de44fad5ab..000000000000
--- a/srcpkgs/bootchart2/patches/Makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	2017-12-10 19:54:55.223497878 -0500
-+++ Makefile	2017-12-10 19:37:39.909790719 -0500
-@@ -19,7 +19,7 @@
- EARLY_PREFIX ?=
- 
- BINDIR ?= /usr/bin
--PYTHON ?= python
-+PYTHON ?= python2
- DOCDIR ?= /usr/share/docs/$(PROGRAM_PREFIX)bootchart$(PROGRAM_SUFFIX)
- MANDIR ?= /usr/share/man/man1
- # never contains /usr; typically /lib, /lib64 or e.g. /lib/x86_64-linux-gnu
-@@ -99,7 +99,7 @@
- 	install -d $(DESTDIR)$(PKGLIBDIR)/tmpfs
- 
- install-collector: all install-chroot
--	install -m 755 -D bootchartd $(DESTDIR)$(EARLY_PREFIX)/sbin/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX)
-+	install -m 755 -D bootchartd $(DESTDIR)$(EARLY_PREFIX)/bin/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX)
- 	install -m 644 -D bootchartd.conf $(DESTDIR)/etc/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).conf
- 	install -m 755 -D bootchart-collector $(DESTDIR)$(PKGLIBDIR)/$(PROGRAM_PREFIX)bootchart$(PROGRAM_SUFFIX)-collector
- 
diff --git a/srcpkgs/bootchart2/patches/python-3.9.patch b/srcpkgs/bootchart2/patches/python-3.9.patch
new file mode 100644
index 000000000000..617e2e1586b4
--- /dev/null
+++ b/srcpkgs/bootchart2/patches/python-3.9.patch
@@ -0,0 +1,35 @@
+Index: pybootchartgui/draw.py
+===================================================================
+--- pybootchartgui/draw.py.orig
++++ pybootchartgui/draw.py
+@@ -508,7 +508,7 @@ def draw_processes_recursively(ctx, proc
+ 		cmdString = proc.cmd
+ 	else:
+ 		cmdString = ''
+-	if (OPTIONS.show_pid or OPTIONS.show_all) and ipid is not 0:
++	if (OPTIONS.show_pid or OPTIONS.show_all) and ipid != 0:
+ 		cmdString = cmdString + " [" + str(ipid // 1000) + "]"
+ 	if OPTIONS.show_all:
+ 		if proc.args:
+@@ -606,7 +606,7 @@ class CumlSample:
+ 		if self.color is None:
+ 			i = self.next() % HSV_MAX_MOD
+ 			h = 0.0
+-			if i is not 0:
++			if i != 0:
+ 				h = (1.0 * i) / HSV_MAX_MOD
+ 			s = 0.5
+ 			v = 1.0
+Index: pybootchartgui/parsing.py
+===================================================================
+--- pybootchartgui/parsing.py.orig
++++ pybootchartgui/parsing.py
+@@ -98,7 +98,7 @@ class Trace:
+     def compile(self, writer):
+ 
+         def find_parent_id_for(pid):
+-            if pid is 0:
++            if pid == 0:
+                 return 0
+             ppid = self.parent_map.get(pid)
+             if ppid:
diff --git a/srcpkgs/bootchart2/patches/rdinit-fix-panic.patch b/srcpkgs/bootchart2/patches/rdinit-fix-panic.patch
new file mode 100644
index 000000000000..2027d5d5b035
--- /dev/null
+++ b/srcpkgs/bootchart2/patches/rdinit-fix-panic.patch
@@ -0,0 +1,10 @@
+--- bootchartd.in.orig	2021-01-24 15:52:43.339735933 +0700
++++ bootchartd.in	2021-01-24 15:53:30.256889311 +0700
+@@ -32,6 +32,7 @@
+ # some initrds don't have usleep etc.
+ USLEEP="$COLLECTOR_BIN --usleep"
+ 
++: "${OLDPATH:=/sbin:/bin:/usr/sbin:/usr/bin}"
+ # we need to find our tools
+ PATH="/sbin:/bin:/usr/sbin:/usr/bin:$PATH"
+ 
diff --git a/srcpkgs/bootchart2/template b/srcpkgs/bootchart2/template
index 2131dd7d32a2..62cd9d2116a3 100644
--- a/srcpkgs/bootchart2/template
+++ b/srcpkgs/bootchart2/template
@@ -1,17 +1,22 @@
 # Template file for 'bootchart2'
 pkgname=bootchart2
-version=0.14.8.20170531
-revision=3
-_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
-wrksrc="bootchart-${_gitrev}"
+version=0.14.9
+revision=1
+wrksrc="bootchart-${version}"
 build_style=gnu-makefile
-make_install_args="EARLY_PREFIX=/usr"
-makedepends="python"
-depends="pygtk git"
+make_install_args="EARLY_PREFIX=/usr DOCDIR=/usr/share/doc/bootchart2"
+hostmakedepends="python3"
+makedepends="python3"
+depends="python3-cairo"
 short_desc="Startup graphing tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-3.0-or-later"
 homepage="https://github.com/xrmx/bootchart"
-distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
+distfiles="https://github.com/xrmx/bootchart/archive/${version}.tar.gz"
+checksum=cec7871c3dba47a1165873b0acde30a82221fde1d3a942da5e7dd09b513d2017
+make_dirs="/usr/lib/bootchart/tmpfs 0755 root root"
 conflicts="bootchart>=0"
+
+post_patch() {
+	vsed -i -e 's,\$(EARLY_PREFIX)/sbin/,/usr/bin/,' Makefile
+}

From 06af1cefe52b1722482e9d2001b943446793f6f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 16:09:02 +0700
Subject: [PATCH 0530/3482] dracut: fix 00bootchart's requirements

---
 .../dracut/patches/00bootchart-requirements.patch  | 14 ++++++++++++++
 srcpkgs/dracut/template                            |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dracut/patches/00bootchart-requirements.patch

diff --git a/srcpkgs/dracut/patches/00bootchart-requirements.patch b/srcpkgs/dracut/patches/00bootchart-requirements.patch
new file mode 100644
index 000000000000..a617565a0c17
--- /dev/null
+++ b/srcpkgs/dracut/patches/00bootchart-requirements.patch
@@ -0,0 +1,14 @@
+--- modules.d/00bootchart/module-setup.sh.orig	2021-01-24 16:00:46.529880095 +0700
++++ modules.d/00bootchart/module-setup.sh	2021-01-24 16:00:56.134911133 +0700
+@@ -19,10 +19,8 @@
+ 
+     inst_multiple bootchartd bash \
+         /lib/bootchart/bootchart-collector /etc/bootchartd.conf \
+-        accton \
+         echo \
+-        grep \
+-        usleep
++        grep
+ 
+     inst /usr/bin/pkill /bin/pkill
+     inst /usr/bin/[  /bin/[
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 27743569edac..53cee6c4ff2c 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
 version=050
-revision=9
+revision=10
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"

From 0c6110287f8904efa0406f56fb08a5f89a8e17ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 07:41:21 +0700
Subject: [PATCH 0531/3482] android-tools: update to 30.0.5.

---
 ...s-fix-dependencies-on-protobuf-heade.patch | 63 +++++++++++++++++++
 srcpkgs/android-tools/template                | 34 +++-------
 srcpkgs/android-tools/update                  |  2 +-
 3 files changed, 71 insertions(+), 28 deletions(-)
 create mode 100644 srcpkgs/android-tools/patches/0001-vendor-CMakeLists-fix-dependencies-on-protobuf-heade.patch

diff --git a/srcpkgs/android-tools/patches/0001-vendor-CMakeLists-fix-dependencies-on-protobuf-heade.patch b/srcpkgs/android-tools/patches/0001-vendor-CMakeLists-fix-dependencies-on-protobuf-heade.patch
new file mode 100644
index 000000000000..0d883b4f0fb4
--- /dev/null
+++ b/srcpkgs/android-tools/patches/0001-vendor-CMakeLists-fix-dependencies-on-protobuf-heade.patch
@@ -0,0 +1,63 @@
+From 41f92b797aa6bf4609b6b31e42bd37df710ae7aa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Mon, 25 Jan 2021 08:25:31 +0700
+Subject: [PATCH] vendor: CMakeLists: fix dependencies on protobuf header
+
+While we're at it, simplify OBJECT_DEPENDS as pointed out in
+https://cmake.org/cmake/help/v3.18/prop_sf/OBJECT_DEPENDS.html
+
+This fix a broken build because of a race as shown in:
+https://github.com/void-linux/void-packages/pull/28209/checks?check_run_id=1758983334
+---
+ vendor/CMakeLists.adb.txt | 23 ++++++++---------------
+ 1 file changed, 8 insertions(+), 15 deletions(-)
+
+diff --git vendor/CMakeLists.adb.txt vendor/CMakeLists.adb.txt
+index 1495a5d..5206a80 100644
+--- vendor/CMakeLists.adb.txt
++++ vendor/CMakeLists.adb.txt
+@@ -34,19 +34,10 @@ add_library(libadb STATIC
+ 	core/adb/sysdeps_unix.cpp
+ 	core/adb/sysdeps/errno.cpp
+ 	core/adb/sysdeps/posix/network.cpp
+-	${ADB_APP_PROCESSES_PROTO_SRCS}
+-	${ADB_KNOWN_HOSTS_PROTO_SRCS}
+-	${ADB_KEY_TYPE_PROTO_SRCS}
+-	${ADB_PAIRING_PROTO_SRCS})
+-
+-set_property(SOURCE core/adb/client/commandline.cpp
+-	PROPERTY OBJECT_DEPENDS ${ADB_APP_PROCESSES_PROTO_HDRS})
+-set_property(SOURCE core/adb/client/adb_wifi.cpp
+-	PROPERTY OBJECT_DEPENDS ${ADB_KNOWN_HOSTS_PROTO_HDRS})
+-set_property(SOURCE core/adb/client/auth.cpp
+-	PROPERTY OBJECT_DEPENDS ${ADB_KEY_TYPE_PROTO_HDRS})
+-set_property(SOURCE core/adb/pairing_connection/pairing_connection.cpp
+-	PROPERTY OBJECT_DEPENDS ${ADB_PAIRING_PROTO_HDRS})
++	${ADB_APP_PROCESSES_PROTO_SRCS} ${ADB_APP_PROCESSES_PROTO_HDRS}
++	${ADB_KNOWN_HOSTS_PROTO_SRCS} ${ADB_KNOWN_HOSTS_PROTO_HDRS}
++	${ADB_KEY_TYPE_PROTO_SRCS} ${ADB_KEY_TYPE_PROTO_HDRS}
++	${ADB_PAIRING_PROTO_SRCS} ${ADB_PAIRING_PROTO_HDRS})
+ 
+ target_compile_definitions(libadb PRIVATE -D_GNU_SOURCE)
+ target_compile_definitions(libadb PUBLIC -DADB_HOST=1)
+@@ -68,7 +59,8 @@ target_include_directories(libadb PUBLIC
+ add_library(libadb_crypto_defaults STATIC
+ 	core/adb/crypto/key.cpp
+ 	core/adb/crypto/rsa_2048_key.cpp
+-	core/adb/crypto/x509_generator.cpp)
++	core/adb/crypto/x509_generator.cpp
++	${ADB_KEY_TYPE_PROTO_HDRS})
+ 
+ target_include_directories(libadb_crypto_defaults PUBLIC
+ 	core/adb
+@@ -173,7 +165,8 @@ add_executable(adb
+ 	  core/adb/transport_fd.cpp
+ 	  core/adb/client/transport_local.cpp
+ 	  core/adb/client/transport_usb.cpp
+-	  core/adb/types.cpp)
++	  core/adb/types.cpp
++	  ${ADB_KEY_TYPE_PROTO_HDRS})
+ 
+ target_compile_definitions(adb PRIVATE
+ 	-DPLATFORM_TOOLS_VERSION="${ANDROID_VERSION}"
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 343a543a9a20..a75a37d7076b 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,46 +1,26 @@
 # Template file for 'android-tools'
 pkgname=android-tools
-version=29.0.6
-revision=3
+version=30.0.5
+revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
-hostmakedepends="perl go"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel"
+hostmakedepends="perl go protobuf"
+makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+ liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0, ISC, GPL-2.0-only, MIT"
 homepage="http://developer.android.com/tools/help/adb.html"
 distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=7fb1c127c36b0752657593838b6823743bf8e5730f9f8b0f7ba2c185424cf376
+checksum=1b870a3f28d75e4907c95dbe8e71b4014f56be636d089a75257ef3922ad39d62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
+	configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
 fi
 
-pre_configure() {
-	# Don't check for CROSS_COMPILING, since i686 container/chroot inside
-	# x86_64 host will failed to build this.
-	if [ "${XBPS_TARGET_MACHINE}" = i686 ] && [ "$(uname -m)" = "x86_64" ]; then
-		boring_ssl_cmake_args="-DCMAKE_TOOLCHAIN_FILE=cross_boring_ssl.cmake"
-		cat > cross_boring_ssl.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_SYSTEM_PROCESSOR x86)
-		_EOF
-		configure_args+=" ${boring_ssl_cmake_args}"
-	fi
-
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		sed -i vendor/CMakeLists.adb.txt \
-			-e "/target_link_libraries/s;$; atomic;"
-	fi
-}
-
 post_install() {
 	vlicense vendor/boringssl/LICENSE boringssl.LICENSE
 	vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
-	vlicense vendor/boringssl/third_party/googletest/LICENSE gtest.LICENSE
 	vsv adb
 }
diff --git a/srcpkgs/android-tools/update b/srcpkgs/android-tools/update
index 49895605477f..f69b1910ad95 100644
--- a/srcpkgs/android-tools/update
+++ b/srcpkgs/android-tools/update
@@ -1,2 +1,2 @@
-site="https://android.googlesource.com/platform/system/core"
+site="https://android.googlesource.com/platform/system/core/+refs"
 pattern='platform-tools-\K[\d._r]+'

From d1d4423093ee31137f57f520d41470d689c2ed42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 20:54:47 +0700
Subject: [PATCH 0532/3482] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f32..d92993ab771b 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,10 +1,10 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
-hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
+hostmakedepends="pkg-config intltool"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,10 +19,6 @@ post_patch() {
 		src/alsa_volume_mapping.c >LICENSE.ISC
 }
 
-pre_configure() {
-	autoreconf -fi
-}
-
 post_install() {
 	vlicense LICENSE.MIT
 	vlicense LICENSE.ISC

From db94965355c5b64d3a727983e945780d1b9de719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 13:44:49 +0700
Subject: [PATCH 0533/3482] SLADE: fix build with gcc-10, link with system
 libraries

---
 srcpkgs/SLADE/patches/pointer-decay.patch    | 29 ++++++++++++++++++++
 srcpkgs/SLADE/patches/system-libraries.patch | 17 ++++++++++++
 srcpkgs/SLADE/template                       |  5 ++--
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/SLADE/patches/pointer-decay.patch
 create mode 100644 srcpkgs/SLADE/patches/system-libraries.patch

diff --git a/srcpkgs/SLADE/patches/pointer-decay.patch b/srcpkgs/SLADE/patches/pointer-decay.patch
new file mode 100644
index 000000000000..87f3370a85fc
--- /dev/null
+++ b/srcpkgs/SLADE/patches/pointer-decay.patch
@@ -0,0 +1,29 @@
+--- src/External/sol/sol.hpp
++++ src/External/sol/sol.hpp
+@@ -6818,7 +6818,7 @@
+ 			}
+ 
+ 			static int push(lua_State* L, const wchar_t(&str)[N], std::size_t sz) {
+-				return stack::push<const wchar_t*>(L, str, str + sz);
++				return stack::push<const wchar_t*>(L, str + 0, str + sz);
+ 			}
+ 		};
+ 
+@@ -6829,7 +6829,7 @@
+ 			}
+ 
+ 			static int push(lua_State* L, const char16_t(&str)[N], std::size_t sz) {
+-				return stack::push<const char16_t*>(L, str, str + sz);
++				return stack::push<const char16_t*>(L, str + 0, str + sz);
+ 			}
+ 		};
+ 
+@@ -6840,7 +6840,7 @@
+ 			}
+ 
+ 			static int push(lua_State* L, const char32_t(&str)[N], std::size_t sz) {
+-				return stack::push<const char32_t*>(L, str, str + sz);
++				return stack::push<const char32_t*>(L, str + 0, str + sz);
+ 			}
+ 		};
+ 
diff --git a/srcpkgs/SLADE/patches/system-libraries.patch b/srcpkgs/SLADE/patches/system-libraries.patch
new file mode 100644
index 000000000000..9f114e042044
--- /dev/null
+++ b/srcpkgs/SLADE/patches/system-libraries.patch
@@ -0,0 +1,17 @@
+lzma is p7zip not liblzma
+--- src/External/CMakeLists.txt
++++ src/External/CMakeLists.txt
+@@ -24,12 +24,10 @@
+ file(GLOB_RECURSE EXTERNAL_SOURCES
+ 	*.cpp
+ 	*.cxx
+-	dumb/*.c
+-	lua/*.c
+ 	lzma/C/LzmaDec.c
+ 	${SLADE_HEADERS}
+ 	)
+ 
+ add_library(external STATIC ${EXTERNAL_SOURCES})
+ target_link_libraries(external ${ZLIB_LIBRARY})
+-set(EXTERNAL_LIBRARIES external PARENT_SCOPE)
++set(EXTERNAL_LIBRARIES external dumb lua5.3 PARENT_SCOPE)
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 64a183b5498b..b7ec0f0749c8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,12 +1,13 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.1.12a
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
 makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
- gtk+3-devel libcurl-devel wxWidgets-gtk3-devel"
+ gtk+3-devel libcurl-devel wxWidgets-gtk3-devel bzip2-devel zlib-devel
+ lua53-devel dumb-devel liblzma-devel"
 short_desc="Modern editor for Doom-engine based games"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"

From 19ae9feafb2f65cd3785c97fac6373d181be6123 Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Fri, 22 Jan 2021 22:43:40 +0600
Subject: [PATCH 0534/3482] txr: update to 248.

---
 srcpkgs/txr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/txr/template b/srcpkgs/txr/template
index c3b0931c69ac..a05cb92f7fc1 100644
--- a/srcpkgs/txr/template
+++ b/srcpkgs/txr/template
@@ -1,6 +1,6 @@
 # Template file for 'txr'
 pkgname=txr
-version=244
+version=248
 revision=1
 archs="x86_64* i686* aarch64* arm* ppc64* mips*"
 build_style=configure
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="http://www.nongnu.org/txr/"
 changelog="http://www.kylheku.com/cgit/txr/tree/RELNOTES?id=${pkgname}-${version}"
 distfiles="http://www.kylheku.com/cgit/txr/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=192cebb4edf89fcf0010cf3982a058ee5019abf28336bcf47cd3a5c1bb392b58
+checksum=58d04f9112b966f0b32e5ddf198622c97b4caaf990db23b5980eae7b44e3415e
 nopie=yes
 
 if [ "$CROSS_BUILD" ]; then

From 721c10c758bfbcb0a8f65a1b44fdb04d6ed41cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 21:09:09 +0700
Subject: [PATCH 0535/3482] volumeicon: add missing patches

---
 srcpkgs/volumeicon/patches/locale.patch | 14 +++++++++++
 srcpkgs/volumeicon/patches/notify.patch | 31 +++++++++----------------
 2 files changed, 25 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/volumeicon/patches/locale.patch

diff --git a/srcpkgs/volumeicon/patches/locale.patch b/srcpkgs/volumeicon/patches/locale.patch
new file mode 100644
index 000000000000..5ed00f1b9c77
--- /dev/null
+++ b/srcpkgs/volumeicon/patches/locale.patch
@@ -0,0 +1,14 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -5950,7 +5950,7 @@ fi
+ 	    ;;
+ 	    *)
+-	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++	    CATOBJEXT=.gmo
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac
+ fi
diff --git a/srcpkgs/volumeicon/patches/notify.patch b/srcpkgs/volumeicon/patches/notify.patch
index dbcf7f4d7009..7da678991941 100644
--- a/srcpkgs/volumeicon/patches/notify.patch
+++ b/srcpkgs/volumeicon/patches/notify.patch
@@ -1,22 +1,13 @@
-From 78a9c23775ebe12d3f3be93c0798144a6e732d90 Mon Sep 17 00:00:00 2001
-From: John Lindgren <john.lindgren@aol.com>
-Date: Wed, 30 Dec 2015 20:50:46 -0500
-Subject: [PATCH] Add missing space in NOTIFY_CFLAGS.
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git configure.ac configure.ac
-index 6ad78d5..c8b72bd 100644
---- configure.ac
-+++ configure.ac
-@@ -86,7 +86,7 @@ fi
- if test "x${notify}" = xyes; then
- # Check for libnotify
- PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.5.0])
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -6644,7 +6644,7 @@ else
+ $as_echo "yes" >&6; }
+ 
+ fi
 -NOTIFY_CFLAGS+="-DCOMPILEWITH_NOTIFY"
-+NOTIFY_CFLAGS+=" -DCOMPILEWITH_NOTIFY"
- AC_SUBST(NOTIFY_CFLAGS)
- AC_SUBST(NOTIFY_LIBS)
++NOTIFY_CFLAGS+=" -DCOMPILEWITH_NOTIFY "
+ 
+ 
  fi

From e4542592f9f011639a18ca63e433b841f726a9bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 21:13:10 +0700
Subject: [PATCH 0536/3482] seahorse-nautilus: fix l10n dir

---
 srcpkgs/seahorse-nautilus/patches/locale.patch | 15 +++++++++++++++
 srcpkgs/seahorse-nautilus/template             |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/seahorse-nautilus/patches/locale.patch

diff --git a/srcpkgs/seahorse-nautilus/patches/locale.patch b/srcpkgs/seahorse-nautilus/patches/locale.patch
new file mode 100644
index 000000000000..1b63a313012b
--- /dev/null
+++ b/srcpkgs/seahorse-nautilus/patches/locale.patch
@@ -0,0 +1,15 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -14606,8 +14606,8 @@ fi
+             DATADIRNAME=share
+ 	    ;;
+ 	    *)
+-	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++	    CATOBJEXT=.gmo
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac
+ fi
diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template
index a25846858662..04424cc4acdb 100644
--- a/srcpkgs/seahorse-nautilus/template
+++ b/srcpkgs/seahorse-nautilus/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-nautilus'
 pkgname=seahorse-nautilus
 version=3.10.1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
 hostmakedepends="pkg-config intltool gpgme-devel gnupg glib"

From fea6598b21ee6c1ff1601232582fc099ea666077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 21:33:55 +0700
Subject: [PATCH 0537/3482] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5a..c107d556988c 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,15 +1,14 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
  --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
  $(vopt_enable gir introspection)"
 conf_files="/etc/gconf/2/path"
-hostmakedepends="automake libtool pkg-config gettext-devel intltool gtk-doc
- glib-devel gobject-introspection"
+hostmakedepends="pkg-config intltool gtk-doc glib-devel gobject-introspection"
 makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
@@ -28,10 +27,6 @@ make_dirs="/usr/share/gconf/schemas 0755 root root
 build_options="gir"
 build_options_default="gir"
 
-pre_configure() {
-	autoreconf -if
-}
-
 GConf-devel_package() {
 	depends="glib-devel dbus-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From dd38e32f478a517713abc4dee96a8bb4b54310f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 21:37:02 +0700
Subject: [PATCH 0538/3482] GConf: add missing patch for musl

---
 srcpkgs/GConf/patches/locale.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/GConf/patches/locale.patch

diff --git a/srcpkgs/GConf/patches/locale.patch b/srcpkgs/GConf/patches/locale.patch
new file mode 100644
index 000000000000..1f7e22cd2e74
--- /dev/null
+++ b/srcpkgs/GConf/patches/locale.patch
@@ -0,0 +1,15 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -18589,8 +18589,8 @@ fi
+             DATADIRNAME=share
+ 	    ;;
+ 	    *)
+-	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++	    CATOBJEXT=.gmo
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac
+ fi

From e04f92f758dfdf362277212324296f001b4a8aac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 21:46:21 +0700
Subject: [PATCH 0539/3482] parcellite: fix l10n dir

---
 srcpkgs/parcellite/patches/locale.patch | 15 +++++++++++++++
 srcpkgs/parcellite/template             |  8 ++------
 2 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/parcellite/patches/locale.patch

diff --git a/srcpkgs/parcellite/patches/locale.patch b/srcpkgs/parcellite/patches/locale.patch
new file mode 100644
index 000000000000..dbe545e0994c
--- /dev/null
+++ b/srcpkgs/parcellite/patches/locale.patch
@@ -0,0 +1,15 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -4981,8 +4981,8 @@ fi
+             DATADIRNAME=share
+ 	    ;;
+ 	    *)
+-	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++	    CATOBJEXT=.gmo
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac
+ fi
diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index b0f370570529..98f7b661cd74 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,9 +1,9 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=3
+revision=4
 build_style=gnu-configure
-hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
+hostmakedepends="intltool glib-devel pkg-config"
 makedepends="gtk+-devel"
 depends="desktop-file-utils"
 short_desc="GTK+ clipboard manager"
@@ -14,7 +14,3 @@ distfiles="${SOURCEFORGE_SITE}/parcellite/${version}/parcellite-${version}.tar.g
 checksum=aba1c7c56c7607e219ce9855723eefa552c5376982891aefbfb5a2d3297ef046
 
 export LIBS=-lgio-2.0
-
-pre_configure() {
-	autoreconf -fi
-}

From 694b0dd6ddd0216084c33fd46126351ae349ca53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 21:56:50 +0700
Subject: [PATCH 0540/3482] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53da..276c85e6e74b 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,9 +1,10 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
+hostmakedepends="automake bison groff intltool libtool pkg-config texinfo
+ gettext-devel glib-devel"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
  gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
  libticalcs2-devel"
@@ -15,11 +16,10 @@ homepage="https://www.ticalc.org"
 distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${version}.tar.bz2"
 checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" gettext-devel glib-devel"
-fi
-
 pre_configure() {
 	mkdir -p m4
 	autoreconf -i -v -f
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/CATOBJEXT=/s/\.mo/.gmo/' \
+		configure
 }

From 7aa404d97a926ec680f94d2a4ca300e90f764823 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 26 Jan 2021 16:50:23 +0300
Subject: [PATCH 0541/3482] element-desktop: update to 1.7.18

---
 srcpkgs/element-desktop/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 194a88fbc3e4..3dd6032b568c 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.7.16
+version=1.7.18
 revision=1
 wrksrc="element-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
@@ -18,13 +18,13 @@ _ghpage="https://github.com/vector-im"
 _archive="archive/v${version}.tar.gz"
 distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
  ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="1aac1c80370d62c82d1c8befe167cf838f66ad477a47ea0c5a020913ed36e1ed
- 4a4821a046ea1f81852de95a4c83fe0f1aaa371fad65e63b48216889c065d155"
+checksum="364c6666cca3e8acee0f147fe8ac14825efa851bae4c89e2ce1cada5a817bff8
+ 08ed3b659ebbe79fb749b49f18257024469e7d5f28d15d007529a12a9196d297"
 
 export USE_SYSTEM_APP_BUILDER=true
 
 pre_build() {
-	# Build dependencies for riot-web
+	# Build dependencies for element-web
 	yarn install
 
 	# Build dependencies and alterations for element-desktop

From 5806e1a00855e798a9ff7867382c6aaade1f974d Mon Sep 17 00:00:00 2001
From: Luna <git@l4.pm>
Date: Sun, 24 Jan 2021 14:46:10 -0300
Subject: [PATCH 0542/3482] libsndfile: update to 1.0.31

---
 srcpkgs/libsndfile/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libsndfile/template b/srcpkgs/libsndfile/template
index 3e5726d2fc66..15d21ab8f4a4 100644
--- a/srcpkgs/libsndfile/template
+++ b/srcpkgs/libsndfile/template
@@ -1,6 +1,6 @@
 # Template file for 'libsndfile'
 pkgname=libsndfile
-version=1.0.30
+version=1.0.31
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
@@ -9,8 +9,8 @@ short_desc="C library for reading and writing files containing sampled sound"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://libsndfile.github.io/libsndfile/"
-distfiles="https://github.com/libsndfile/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=9df273302c4fa160567f412e10cc4f76666b66281e7ba48370fb544e87e4611a
+distfiles="https://github.com/libsndfile/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.bz2"
+checksum=a8cfb1c09ea6e90eff4ca87322d4168cdbe5035cb48717b40bf77e751cc02163
 
 libsndfile-progs_package() {
 	short_desc+=" - bundled cmdline apps"

From a620ec67ed6a97d9533ec04941c7c881083df133 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Jan 2021 14:30:43 +0100
Subject: [PATCH 0543/3482] perl: update to 5.32.1.

---
 srcpkgs/perl/patches/Time-HiRes.diff | 34 ----------------------------
 srcpkgs/perl/template                | 14 ++++++------
 2 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/perl/patches/Time-HiRes.diff

diff --git a/srcpkgs/perl/patches/Time-HiRes.diff b/srcpkgs/perl/patches/Time-HiRes.diff
deleted file mode 100644
index 55800a14b54a..000000000000
--- a/srcpkgs/perl/patches/Time-HiRes.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- dist/Time-HiRes/Makefile.PL.orig
-+++ dist/Time-HiRes/Makefile.PL
-@@ -603,6 +603,7 @@
-     my $has_clock_gettime_emulation;
-     if (exists $Config{d_clock_gettime}) {
-         $has_clock_gettime++ if $Config{d_clock_gettime}; # Unlikely...
-+	$DEFINE .= ' -DTIME_HIRES_CLOCK_GETTIME';
-     } elsif (has_clock_xxx('gettime')) {
-         $has_clock_gettime++;
- 	$DEFINE .= ' -DTIME_HIRES_CLOCK_GETTIME';
-@@ -632,6 +633,7 @@
-     my $has_clock_getres_emulation;
-     if (exists $Config{d_clock_getres}) {
-         $has_clock_getres++ if $Config{d_clock_getres}; # Unlikely...
-+	$DEFINE .= ' -DTIME_HIRES_CLOCK_GETRES';
-     } elsif (has_clock_xxx('getres')) {
-         $has_clock_getres++;
- 	$DEFINE .= ' -DTIME_HIRES_CLOCK_GETRES';
-@@ -661,6 +663,7 @@
-     my $has_clock_nanosleep_emulation;
-     if (exists $Config{d_clock_nanosleep}) {
-         $has_clock_nanosleep++ if $Config{d_clock_nanosleep}; # Unlikely...
-+	$DEFINE .= ' -DTIME_HIRES_CLOCK_NANOSLEEP';
-     } elsif (has_clock_nanosleep()) {
-         $has_clock_nanosleep++;
- 	$DEFINE .= ' -DTIME_HIRES_CLOCK_NANOSLEEP';
-@@ -684,6 +687,7 @@
-     my $has_clock;
-     if (exists $Config{d_clock}) {
-         $has_clock++ if $Config{d_clock}; # Unlikely...
-+	$DEFINE .= ' -DTIME_HIRES_CLOCK';
-     } elsif (has_clock()) {
-         $has_clock++;
- 	$DEFINE .= ' -DTIME_HIRES_CLOCK';
diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index e5530344d7c2..b1e985c3f257 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -1,8 +1,8 @@
 # Template file for 'perl'
 pkgname=perl
-version=5.32.0
+version=5.32.1
 revision=1
-_perl_cross_version=1.3.4
+_perl_cross_version=1.3.5
 build_style=gnu-configure
 hostmakedepends="less"
 makedepends="zlib-devel bzip2-devel gdbm-devel db-devel"
@@ -14,8 +14,8 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://www.perl.org"
 distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz
  https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz"
-checksum="efeb1ce1f10824190ad1cadbcccf6fdb8a5d37007d0100d2d9ae5f2b5900c0b4
- 755aa0ca8141a942188a269564f86c3c82349f82c346ed5c992495d7f35138ba"
+checksum="03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c
+ 91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25"
 
 # Before updating this package to a new major version, run ${FILESDIR}/provides.pl
 # against ${wrksrc} to find the list of built in packages.
@@ -32,7 +32,7 @@ provides="perl-Archive-Tar-2.36_1
  perl-Compress-Raw-Zlib-2.093_1
  perl-Config-Perl-V-0.32_1
  perl-DB_File-1.853_1
- perl-Data-Dumper-2.174_1
+ perl-Data-Dumper-2.174_01_1
  perl-Devel-PPPort-3.57_1
  perl-Devel-SelfStubber-1.06_1
  perl-Digest-1.17_01_1
@@ -73,7 +73,7 @@ provides="perl-Archive-Tar-2.36_1
  perl-Math-BigRat-0.2614_1
  perl-Math-Complex-1.5901_1
  perl-Memoize-1.03_01_1
- perl-Module-CoreList-5.20200620_1
+ perl-Module-CoreList-5.20210123_1
  perl-Module-Load-0.34_1
  perl-Module-Load-Conditional-0.70_1
  perl-Module-Loaded-0.08_1
@@ -89,7 +89,7 @@ provides="perl-Archive-Tar-2.36_1
  perl-Pod-Perldoc-3.2801_1
  perl-Pod-Simple-3.40_1
  perl-Pod-Usage-1.69_1
- perl-Safe-2.41_1
+ perl-Safe-2.41_01_1
  perl-Scalar-List-Utils-1.55_1
  perl-Search-Dict-1.07_1
  perl-SelfLoader-1.26_1

From d6fbf4b3488af8b2b14be61da6a779dd1e94d6a5 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 24 Jan 2021 11:35:15 +0100
Subject: [PATCH 0544/3482] jgmenu: update to 4.3.0.

---
 srcpkgs/jgmenu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jgmenu/template b/srcpkgs/jgmenu/template
index d4a2c7dd72e3..4f459c546894 100644
--- a/srcpkgs/jgmenu/template
+++ b/srcpkgs/jgmenu/template
@@ -1,6 +1,6 @@
 # Template file for 'jgmenu'
 pkgname=jgmenu
-version=4.2.1
+version=4.3.0
 revision=1
 build_style=gnu-configure
 make_use_env=yes
@@ -16,4 +16,4 @@ license="GPL-2.0-only"
 homepage="https://www.github.com/johanmalm/jgmenu"
 changelog="https://raw.githubusercontent.com/johanmalm/jgmenu/master/docs/relnotes/${version}.txt"
 distfiles="https://www.github.com/johanmalm/jgmenu/archive/v${version}.tar.gz"
-checksum=8ce3250b6a726f068126a0b75e02a6caafcf651b8c6ef59b328ff70a81473fc5
+checksum=84daae2c544a2755d76e9bcd8cd2503e9cfbf8c48b3e97c8ec32dbcf269c6275

From 22962b711858c1940b41ca834e8a531cf6ef91b7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 19:53:19 +0100
Subject: [PATCH 0545/3482] build-style/void-cross: symlink bin on install

this is needed so that binaries go in sysroot/usr/bin instead
of sysroot/bin
---
 common/build-style/void-cross.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 5ce5a0d43603..23b8d539dbff 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -547,6 +547,7 @@ do_install() {
 	# and we want to delete the libexec from glibc afterwards to save space
 	mkdir -p ${DESTDIR}/${sysroot}/usr/{bin,lib,libexec,include,share}
 	# Sysroot base symlinks
+	ln -sf usr/bin ${DESTDIR}/${sysroot}/bin
 	ln -sf usr/lib ${DESTDIR}/${sysroot}/lib
 	ln -sf usr/lib ${DESTDIR}/${sysroot}/lib${ws}
 	ln -sf lib ${DESTDIR}/${sysroot}/usr/lib${ws}

From d213503bb364475de0c2466b2e44d8c2015ad4e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Jan 2021 20:04:43 +0100
Subject: [PATCH 0546/3482] NetworkManager: fix cross build

---
 srcpkgs/NetworkManager/patches/fix-cross-gir.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index 2d0db910adb3..c283d4dc1059 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -24,7 +24,7 @@ index 51ca46d..f14d861 100644
 -  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
 +  if meson.is_cross_build()
 +    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/bin/python3'
++    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
 +    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
 +  else
 +    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]

From 5e62bc105271f3d5075af48823788903b23c720e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 15:50:26 -0300
Subject: [PATCH 0547/3482] sudo: update to 1.9.5p2.

Fixes CVE-2021-3156.
---
 srcpkgs/sudo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 54b3a5a2f65a..1ac86c242a06 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,6 +1,6 @@
 # Template file for 'sudo'
 pkgname=sudo
-version=1.9.5p1
+version=1.9.5p2
 revision=1
 build_style=gnu-configure
 configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://www.sudo.ws/"
 changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS"
 distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz"
-checksum=4dddf37c22653defada299e5681e0daef54bb6f5fc950f63997bb8eb966b7882
+checksum=539e2ef43c8a55026697fb0474ab6a925a11206b5aa58710cb42a0e1c81f0978
 conf_files="/etc/pam.d/sudo /etc/sudoers"
 lib32disabled=yes
 

From b2d670be60b883192d12f79077fa79dff5395554 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 20:17:55 +0100
Subject: [PATCH 0548/3482] build-style/void-cross: always enable libssp

this way we'll be able to provide libssp(-devel) unconditionally
inside cross-vpkg-dummy, which should be the right thing to do
---
 common/build-style/void-cross.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 23b8d539dbff..055b3dc3ce7e 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -372,14 +372,12 @@ _void_cross_build_gcc() {
 
 	local extra_args
 	if [ -f ${wrksrc}/.musl_version ]; then
-		extra_args+=" --enable-libssp"
 		# otherwise glibc hosts get confused and use the gnu impl
 		extra_args+=" --enable-clocale=generic"
 		extra_args+=" --disable-symvers"
 		extra_args+=" --disable-gnu-unique-object"
 		extra_args+=" libat_cv_have_ifunc=no"
 	else
-		extra_args+=" --disable-libssp"
 		extra_args+=" --enable-gnu-unique-object"
 	fi
 
@@ -419,6 +417,7 @@ _void_cross_build_gcc() {
 		--enable-lto \
 		--enable-default-pie \
 		--enable-default-ssp \
+		--enable-libssp \
 		--with-gnu-ld \
 		--with-gnu-as \
 		--with-linker-hash-style=gnu \

From 4a61e1ee225e0e02732bb95eb518f03bb4b1da6d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 20:46:36 +0100
Subject: [PATCH 0549/3482] common/shlibs: bump glibc version

looks like newer sudo, besides other things, will introduce
newer symvers; we need to make sure all new packages will also
update glibc with them
---
 common/shlibs | 60 +++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 78416f43ed0c..1226e31c1899 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -17,36 +17,36 @@
 # one (order top->bottom) is preferred over the next ones.
 #
 libc.so musl-1.1.21_1
-libc.so.6 glibc-2.29_1
-libm.so.6 glibc-2.29_1
-libpthread.so.0 glibc-2.29_1
-librt.so.1 glibc-2.29_1
-libdl.so.2 glibc-2.29_1
-ld-linux-x86-64.so.2 glibc-2.29_1 x86_64
-ld-linux.so.2 glibc-2.29_1 i686
-ld-linux.so.3 glibc-2.29_1 armv5tel
-ld-linux-aarch64.so.1 glibc-2.29_1 aarch64
-ld64.so.2 glibc-2.29_1 ppc64
-ld.so.1 glibc-2.29_1 mips
-ld.so.1 glibc-2.29_1 ppc
-ld-linux-armhf.so.3 glibc-2.29_1
-libresolv.so.2 glibc-2.29_1
-libanl.so.1 glibc-2.29_1
-libthread_db.so.1 glibc-2.29_1
-libutil.so.1 glibc-2.29_1
-libnsl.so.1 glibc-2.29_1
-libnss_db.so.2 glibc-2.29_1
-libnss_files.so.2 glibc-2.29_1
-libnss_compat.so.2 glibc-2.29_1
-libnss_dns.so.2 glibc-2.29_1
-libnss_hesiod.so.2 glibc-2.29_1
-libcrypt.so.1 glibc-2.29_1
-libBrokenLocale.so.1 glibc-2.29_1
-libmemusage.so glibc-2.29_1
-libSegFault.so glibc-2.29_1
-libpcprofile.so glibc-2.29_1
-libcidn.so.1 glibc-2.29_1
-libmvec.so.1 glibc-2.29_1
+libc.so.6 glibc-2.32_1
+libm.so.6 glibc-2.32_1
+libpthread.so.0 glibc-2.32_1
+librt.so.1 glibc-2.32_1
+libdl.so.2 glibc-2.32_1
+ld-linux-x86-64.so.2 glibc-2.32_1 x86_64
+ld-linux.so.2 glibc-2.32_1 i686
+ld-linux.so.3 glibc-2.32_1 armv5tel
+ld-linux-aarch64.so.1 glibc-2.32_1 aarch64
+ld64.so.2 glibc-2.32_1 ppc64
+ld.so.1 glibc-2.32_1 mips
+ld.so.1 glibc-2.32_1 ppc
+ld-linux-armhf.so.3 glibc-2.32_1
+libresolv.so.2 glibc-2.32_1
+libanl.so.1 glibc-2.32_1
+libthread_db.so.1 glibc-2.32_1
+libutil.so.1 glibc-2.32_1
+libnsl.so.1 glibc-2.32_1
+libnss_db.so.2 glibc-2.32_1
+libnss_files.so.2 glibc-2.32_1
+libnss_compat.so.2 glibc-2.32_1
+libnss_dns.so.2 glibc-2.32_1
+libnss_hesiod.so.2 glibc-2.32_1
+libcrypt.so.1 glibc-2.32_1
+libBrokenLocale.so.1 glibc-2.32_1
+libmemusage.so glibc-2.32_1
+libSegFault.so glibc-2.32_1
+libpcprofile.so glibc-2.32_1
+libcidn.so.1 glibc-2.32_1
+libmvec.so.1 glibc-2.32_1
 libz.so.1 zlib-1.2.3_1
 libbz2.so.1 bzip2-1.0.5_1
 libarchive.so.13 libarchive-3.3.3_5

From b500b6d05e2a4078c60c58c11aafba62df652f14 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 20:47:28 +0100
Subject: [PATCH 0550/3482] sudo: rebuild to get newer glibc ver

---
 srcpkgs/sudo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 1ac86c242a06..1a088aaa0331 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
 # Template file for 'sudo'
 pkgname=sudo
 version=1.9.5p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
  --enable-shell-sets-home --enable-noargs-shell --without-sendmail

From 416506c46944d6b828d442bceb75114e7bdd2521 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 26 Jan 2021 18:51:23 +0100
Subject: [PATCH 0551/3482] terragrunt: update to 0.27.3.

---
 srcpkgs/terragrunt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9f1da160a162..a7dc8ef46868 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.27.1
+version=0.27.3
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/$pkgname"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=5cc13d6556b9206335be97a5e8f163c85e2097a44b352c284efb369ea6c0e446
+checksum=a9d2c8457ba532ca2bbf06312a7b1eb34789119af8ee5b867a11a217d3877272
 
 post_install() {
 	vlicense LICENSE.txt

From 8b95f6b393351874494fb30d6fa602b80a14c2e2 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 26 Jan 2021 18:59:36 +0100
Subject: [PATCH 0552/3482] websocketd: update to 0.4.1.

---
 srcpkgs/websocketd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template
index 50b5bc2baeb0..e0eba0cdb598 100644
--- a/srcpkgs/websocketd/template
+++ b/srcpkgs/websocketd/template
@@ -1,6 +1,6 @@
 # Template file for 'websocketd'
 pkgname=websocketd
-version=0.3.1
+version=0.4.1
 revision=1
 build_style=go
 hostmakedepends="git"
@@ -10,4 +10,4 @@ license="BSD"
 go_import_path="github.com/joewalnes/websocketd"
 homepage="https://$go_import_path"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=323700908ca7fe7b69cb2cc492b4746c4cd3449e49fbab15a4b3a5eccf8757f4
+checksum=6b8fe0fad586d794e002340ee597059b2cfc734ba7579933263aef4743138fe5

From 0a03e2ae60d90aec0888c52f698dec56b9e9286c Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Tue, 26 Jan 2021 20:29:27 +0100
Subject: [PATCH 0553/3482] nvidia: update to 460.39.

Closes: #28251 [via git-merge-pr]
---
 srcpkgs/nvidia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 6e2f32310227..8929bf8f60aa 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=460.32.03
+version=460.39
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=4f2122fc23655439f214717c4c35ab9b4f5ab8537cddfdf059a5682f1b726061
+checksum=0bf0664078013aa62ed6840caed0637b226884b9398e1fb647e127ad3ad9a37f
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}

From aecd085a9152fcae794c62b483c09bb7b02d12a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 15:36:17 -0300
Subject: [PATCH 0554/3482] wxWidgets-gtk3: fix some cross builds.

Projects that include <wx/setup.h> use wx-config to get flags for where
it's located. For example, "-I
/usr/armv7l-linux-musleabihf/lib/wx/include/gtk3-unicode-3.0".
Unfortunately, wx-config uses libdir from the native package,
/usr/lib$host_wordsize, which breaks cross builds for targets with
different word sizes.

Fix this by changing "lib$wordsize" to "lib".

Fixes #27495
---
 srcpkgs/wxWidgets-gtk3/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wxWidgets-gtk3/template b/srcpkgs/wxWidgets-gtk3/template
index 1081bc8853dc..7847442b4054 100644
--- a/srcpkgs/wxWidgets-gtk3/template
+++ b/srcpkgs/wxWidgets-gtk3/template
@@ -1,7 +1,7 @@
 # Template file for 'wxWidgets-gtk3'
 pkgname=wxWidgets-gtk3
 version=3.0.5.1
-revision=3
+revision=4
 wrksrc="wxWidgets-${version}"
 build_style=gnu-configure
 configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl
@@ -34,11 +34,12 @@ post_install() {
 	ln -sf ../lib/wx/config/${_config} ${DESTDIR}/usr/bin/wx-config-gtk3
 	#   - ignore --host option; breaks configure scripts when
 	#     cross compiling (isn’t necessary in our case anyway)
-	sed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
+	vsed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
 		-e '/^bindir="\/usr/s,/usr,${exec_prefix},' \
 		-e 's/is_cross().*/is_cross() { false; }/g' \
 		-e '/--\*=\*)/i --host=\*) continue;;' \
-		$DESTDIR/usr/lib/wx/config/gtk3-unicode-3.0
+		-e "s/lib${XBPS_WORDSIZE}/lib/g" \
+		$DESTDIR/usr/lib/wx/config/${_config}
 }
 
 wxWidgets-common_package() {

From 7bb210b284bfe05e0cf6bef60b80e5cd88b0540f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:05:27 -0300
Subject: [PATCH 0555/3482] kicad-doc: update to 5.1.9.

---
 srcpkgs/kicad-doc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad-doc/template b/srcpkgs/kicad-doc/template
index 8c9d44e7a861..780a7db122e8 100644
--- a/srcpkgs/kicad-doc/template
+++ b/srcpkgs/kicad-doc/template
@@ -1,13 +1,13 @@
 # Template file for 'kicad-doc'
 pkgname=kicad-doc
-version=5.1.8
+version=5.1.9
 revision=1
 short_desc="KiCad documentation"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later, CC-BY-3.0"
 homepage="http://kicad-pcb.org"
 distfiles="https://kicad-downloads.s3.cern.ch/docs/${pkgname}-${version}.tar.gz"
-checksum=f2d96bae9bb44c089b155ee61bb589d51373647cdfdf28b5f931756e369bdf14
+checksum=61571f260bba67e26b9f7456ad6eb5da7c3b406412f506e7857d0ca70ca66393
 
 do_install() {
 	vmkdir usr/

From 3f8e4fc6c5fb2c37600a9cfa06bb23e878fa1c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:05:46 -0300
Subject: [PATCH 0556/3482] kicad-footprints: update to 5.1.9.

---
 srcpkgs/kicad-footprints/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad-footprints/template b/srcpkgs/kicad-footprints/template
index e082ad14a421..e5bc62c420cb 100644
--- a/srcpkgs/kicad-footprints/template
+++ b/srcpkgs/kicad-footprints/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-footprints'
 pkgname=kicad-footprints
-version=5.1.8
+version=5.1.9
 revision=1
 build_style=cmake
 depends="kicad"
@@ -9,7 +9,7 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad-pcb.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=31c3676d71139259f1cc67b3a0254ec8a8659d35f2c51a273f5de542c651a819
+checksum=415e014364d1c12584f115a4adfeec1b71e41e2cd7f4ae543237ee71b8ef41bd
 
 post_install() {
 	# otherwise KiCad will complain about a missing library when launched

From ff02cc7ea2a2336e973d69d76c2286ccb118512a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:01 -0300
Subject: [PATCH 0557/3482] kicad-packages3D: update to 5.1.9.

---
 srcpkgs/kicad-packages3D/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad-packages3D/template b/srcpkgs/kicad-packages3D/template
index 41e1d13f6ee8..93b9241577a5 100644
--- a/srcpkgs/kicad-packages3D/template
+++ b/srcpkgs/kicad-packages3D/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-packages3D'
 pkgname=kicad-packages3D
-version=5.1.8
+version=5.1.9
 revision=1
 build_style=cmake
 depends="kicad"
@@ -9,4 +9,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad-pcb.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=faf3ddf4036a6084618c1d90254b554f845693549afb2c483291133dca27ee3a
+checksum=efce7b0b65ece76b57002cd4b84152fb359f7c47fe0b3d71166e9255ffa5c5b0

From 4c9750e8c2e9c09e3a4b26c60368398481ab2e48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:18 -0300
Subject: [PATCH 0558/3482] kicad-templates: update to 5.1.9.

---
 srcpkgs/kicad-templates/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad-templates/template b/srcpkgs/kicad-templates/template
index 48d8ffda2eb9..9cc44f0c1394 100644
--- a/srcpkgs/kicad-templates/template
+++ b/srcpkgs/kicad-templates/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-templates'
 pkgname=kicad-templates
-version=5.1.8
+version=5.1.9
 revision=1
 build_style=cmake
 depends="kicad"
@@ -9,4 +9,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad-pcb.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=1afc8196f47d053937c2db9ee7f09b0d812e1ba93e57a0610ab1ced21c9134ca
+checksum=0c1bf3d2e6d8d1056a5da6c1f7a173551c154b4bdaddb86b6a34155b18e65da6

From 0d04e10d6d47c283397fcaba59a3a4d571f1a045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:28 -0300
Subject: [PATCH 0559/3482] kicad-symbols: update to 5.1.9.

---
 srcpkgs/kicad-symbols/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad-symbols/template b/srcpkgs/kicad-symbols/template
index 73c1c529bc2d..9c699f97ff64 100644
--- a/srcpkgs/kicad-symbols/template
+++ b/srcpkgs/kicad-symbols/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-symbols'
 pkgname=kicad-symbols
-version=5.1.8
+version=5.1.9
 revision=1
 build_style=cmake
 depends="kicad"
@@ -9,4 +9,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad-pcb.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=a5ca226afbabdd1822c4a18e63a2943cd2913df11e8e50530768fbdd7997ba54
+checksum=cdb033cc755cc66a087b44fff1d2b77bf2dd44311a02c81a516b8ca1fbd242a7

From e4149fd429dc80ed18ac91d5c11e02c0f994f0b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:37 -0300
Subject: [PATCH 0560/3482] kicad-library: update to 5.1.9.

---
 srcpkgs/kicad-library/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad-library/template b/srcpkgs/kicad-library/template
index c61f146fc2f4..1ebed610fa05 100644
--- a/srcpkgs/kicad-library/template
+++ b/srcpkgs/kicad-library/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-library'
 pkgname=kicad-library
-version=5.1.8
+version=5.1.9
 revision=1
 build_style=meta
 depends="kicad-footprints>=${version} kicad-packages3D>=${version}

From e24a14de67c826fc8e4c8f074cc7263054a7ab1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:51 -0300
Subject: [PATCH 0561/3482] kicad-i18n: update to 5.1.9.

---
 srcpkgs/kicad-i18n/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kicad-i18n/template b/srcpkgs/kicad-i18n/template
index 6fd55602335b..46f6e9c5c793 100644
--- a/srcpkgs/kicad-i18n/template
+++ b/srcpkgs/kicad-i18n/template
@@ -1,8 +1,8 @@
 # Template file for 'kicad-i18n'
 pkgname=kicad-i18n
-version=5.1.8
+version=5.1.9
 revision=1
-_commit=78adcd19e7ed53f4889d6db65a33dd8ec2d323e9
+_commit=04f3231f60d55400cb81564b2cd465a57d5192d5
 wrksrc="${pkgname}-${version}-${_commit}"
 build_style=cmake
 hostmakedepends="gettext"
@@ -12,4 +12,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad-pcb.org"
 distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=807eeceaa5688ca800fe01464b466755e7b9e3243cb0a776e2ea5ea1f963967b
+checksum=edd1ff381fc767c48270395b49156891c626eb7760768b4b082cd575b4038cce

From 0c4c175745e4e928a7ddf94ee4628992edda2879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:59 -0300
Subject: [PATCH 0562/3482] kicad: update to 5.1.9.

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index f11077d93bb3..22e748797542 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad'
 pkgname=kicad
-version=5.1.8
+version=5.1.9
 revision=1
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
@@ -19,7 +19,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="http://kicad-pcb.org"
 distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz"
-checksum=bf24f8ef427b4a989479b8e4af0b8ae5c54766755f12748e2e88a922c5344ca4
+checksum=841be864b9dc5c761193c3ee9cbdbed6729952d7b38451aa8e1977bdfdb6081b
 python_version=3
 
 build_options="spice occt"

From 3777ad1489b7310a1990266e10a678eb845cd8e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 26 Jan 2021 21:28:51 +0100
Subject: [PATCH 0563/3482] mame: update to 0.228

---
 srcpkgs/mame/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template
index 4e52dae71b9b..cd6dbb58ed78 100644
--- a/srcpkgs/mame/template
+++ b/srcpkgs/mame/template
@@ -1,6 +1,6 @@
 # Template file for 'mame'
 pkgname=mame
-version=0227
+version=0228
 revision=1
 wrksrc="mame-mame${version}"
 hostmakedepends="pkg-config python3 qt5-host-tools tar xz which"
@@ -13,7 +13,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="http://mamedev.org"
 distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz"
-checksum=95dbce00a4f05a35f66ef966fe9efad1e4e78ce62e0eba3f7031dfa6737829a5
+checksum=1d8e6f20491492f8b15892ff958f9b067c48eb90cc2fc974b08bde297e657244
 nodebug=yes
 replaces="sdlmame>=0 sdlmess>=0"
 

From b01ecccb893f2b7fae0a2f6742d44e77806b9a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 27 Jan 2021 01:32:27 +0100
Subject: [PATCH 0564/3482] firefox-esr: update to 78.7.0

---
 srcpkgs/firefox-esr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index b2670ec4c789..51ea21fb920b 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.6.1
+version=78.7.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=0d07b74cb66b94018e3d7f11531f95c76a955e0016a3c401241d0d85062ae7ce
+checksum=1aa041db28cd742e93d663a9da8defd33040b38d8b9470350538473251621643
 lib32disabled=yes
 conflicts="firefox>=0"
 

From d08e78eca484c7ddf98000b36ba576df7fe84552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 27 Jan 2021 01:37:54 +0100
Subject: [PATCH 0565/3482] firefox-esr-i18n: update to 78.7.0

---
 srcpkgs/firefox-esr-i18n/template | 188 +++++++++++++++---------------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index 36c781fe3d25..3a5f568b6eb2 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.6.1
+version=78.7.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="a633f63ff5d676d465ca5ba956f04e962fb0d4107d2ee9a02d90e230065bba56
- e36fe673d65a64b33904970f970a05aaa82d9e47986fd5189d9b61fde9583e64
- 381003ca95867ce2c5fc23d5dded8b6496fc62564a1e49ba13a132e2e423662b
- 61ad12d1f0c0d9ff7680e1516788b32db7c834204a28a16775abb9dd56da28b9
- 8d5f79749c1851d32664343e92f0a39499962303b243e72c38f591f9538b2b8f
- 1a3ee5c4482ef9bd2d36f405c48de92bf2eab7d6ae4cb75b61121faf5ffc99dc
- a2644033b6129aea582de8b71a6fc168fd71550841aaf58349872e83dbcd71c1
- c706077dcc397924d79c869ada2437fda15e013953bd6755de2105825448f6c4
- e52b5342e68496b72f56abd6e7e856bc50f21fc0516e44ae9d8bcbf9a60d203e
- 4374938c61a4e0379b332ed24f3d9244f13c0e28d55143a2b846b6e4935a1c24
- 95f7d3c0d1c220aa9abdcda3460caf6868e0318620e4e35d97d707d7b0117ab0
- 6d315dfce61f1143cb89e32c9b47fabaf58e18cb93c49085504950bc2cfae5a0
- b563395548b0c8c438f318d366bdbc264e9118b09206070625dfc03958ee2d9c
- a36fd78b3baa4ab96dba2058db293dc8956b96cfef2fa2c0bdba60c348bc67e7
- 4b36605ab7cc9190d372b028ffc7b3ca56252893d9481f3ff869f2c42474b0b2
- d36df1747bf91e61cc19ed2396d02430f887a1ccae4c3631175b50c3caef880f
- 0484c7f7062a2dde94f02c09138dd3c9af01a3e379f14b6c401d44a96ed541aa
- 1247b69fa7a26f026ae16bc87e307201df85ffc875bfb019d4251e158d197fed
- 981b82c331df5ea81f42116d299b91bd2fc279f3fa85242b13ea120ebc401f37
- 0ae72aa1beb2ced286c966ead603afc18f2db3c25cc6f9152755b1ed629c3467
- d4501c7f0fc09aaf3a099f902966d539bed62a10cde69b80c3d0792d800f795a
- 0d5816c2e5954c87c8c0d073332ca29d034f719864268ac0e2d01b08c7b74f68
- 38ec953a80215e6e2d7623a8d1e8adefa5039f64ae708c57e23d9fe2f94e904e
- 0dae0cf9422f75e0cd4b105fa423d7074ee6285b99afba7e76bf0b440996710a
- 75a14ded5448e539636f569930e7d17d67646c151645e944c18c39e0593fb551
- c5523e887848da0856d50be613501d9d038e31094bb0f9a3d7e2592fcf05ab14
- bf58395da0f409962148b1777f1c8aa26721c204fad1589b1492bc0e35cfae62
- 91b473495a5c82589465cf0cf0e84faa9e5ba9a7e9e033c457bf9da5c9c08986
- fc064c6b177eb293f4b4dc1ab40e236a72be8a44d5f383422e2a42d925606053
- 43d0e461b2fb6576e285658bebcb41a4585502b3e403ad60b562eae6affb7766
- 63d811853765803cb64b95eded3a0de7b867186882efe3e9f925ffd4d7bb940f
- fa093681acdcf7f45216e49b5882ace38e653182d61ca9159a9dd7bc2c59a57c
- 216db3820478c951f4594c03dcfee5480a0efdfbe5838acc4e73affcb17df31a
- 0f7a116b3516ba31fd804a1311276fa5c644e1f398f636bd48bfc1ce72661e5b
- 1266fe9ef4d0dfe24b199d7844300d5fb5321d7bb7225f7c902b415023911bcb
- b0a1d851050e941fe28f967443b8d7287dab3ecc3303ec7f761ffec4cc10ef47
- 7df9c803e9edd0e4980706fb5e6c2422919fde6da3d10866297704e2e86d986f
- 02c7a7956783a2395171353ba5fc45dc5296b876ea7af35be755f8666b38abd9
- 650c8c94aea499ebaf6875691dcc0fe1f7535e35a409d65d7ab6e7052d63cdd9
- 103603c61cc5d0734a7eeea8326a463cf5cf9c6b8f7d431441d442ea9344b354
- 3cd7767ebc5a218843fe2914ac026956addc60f82693fc43e60af1fe8abccbbe
- a2a195c07ba2fce554d3997542da1c8c6cf45d49d326373508537005e5b31f7c
- c39f0318614f2ee222964e4fd3768f772eb7348f17f9c21e4adfd66439551be7
- 65416f6af10605a388251ce3add878c95ac1a1e6e925c087144608e3c95690e2
- 7d590d53d6244384a2a7d3776bd5c7ab5e37a3b2edabcca5d6448ed7cc56cd62
- d0708cb5ee33a9ed981ee3a4e855d78ad54a2ab23e0b5bb82fc4287224fb3a04
- cb4b1a89b03c39e332544099f1868703c61cbfb522372c6a6ab3ff893b7ea0fa
- a38e2a11f7696217d9c105b62b335dbd5b5ef3193804cecd2afcaf6a089dda03
- a2b8989050b3c36bca76b8ac169e212d4ec19f487db8d908b1792ce8de8d4bcb
- ffac3cc7a1eafdcee369d3a88aba6bf3116da37cd636084c8b0be50839c09cc3
- 56d99171547a442c55ad25c6252244d964a7c2db4717ece4659ae9f6e515e085
- 12e547ce451cfaaa1919748e206726a65434dba8f871f79f575c3c73b53493dc
- aefc3626f4e4fe33074b8a08687b18b2ecf113d389712da5d73ae4957b7a00ae
- 35b244f8be1e0c573cad64abf7da006bfd7a854aabb645fd35dbaf86316965fb
- e550338dc4599958f32e07e3c034d836ced197e962dbc6311122eec1d2c0d81c
- bbc3841e98942c828ad53ddb514cd86abb2a394f22407364b702777c828d330b
- 4822eb9cc0cd4cc42ae8d4029f784a7b9c3a62a0d5dee5b8b020f1728254070a
- 3354806c46e6bc3cc62fb05cd33ef481b09ee96a053c569a66dab28eb30d7d10
- b3994f37b027aee6171a089c88b10bc0dd56e10f9844ab710d2821fcc9197edb
- b44c4deea5e29f6cb8be705ab06de7527bd5fa9312b7d9322e219c834d310102
- 6396200e5d3e55cd942a1238630b82fb65e0575bd2d76d645e99862d91813102
- 4b6f6477a89a192fda19e2c5a1d52194e9350d70f60836b8411af9958d23e90f
- 61e0efbf0218bb4dde676218adaad46aa0f8f1b89429dbfe1b93646035f6efdf
- fe222029c0e2a175a8950bb0c3335c2a277eb87db528c67347f87ba05f78a8b6
- 30e64b32873e24b79f94b73ae2c404ecdade3426f3a89d894c5096dc417db332
- 229a275ba9547322bd0183b3b0d16f4ce7c992461f5378512dc865080b2cf990
- 9392b96907c50749ed460bd0570bcdf085cdc22c63119b0a3570b4eb5be4441b
- 70b436cf4c6ebdf02e6ba5fc84dfaee35477bb6085cf010283dcae9760f4b46f
- 9ed7ea612383205971a2ca0fb573daf4530abb4134d968b72d96e8530c1edcb6
- 5b24f85474d578f578ea505b3fc6c326181fbb6e52744895700d66c5507d94d1
- 49590b2c0422f35a465fdcff13df2661137817758a648f4f0fa9ba0da33d3d1d
- 030cd2d86671c8a2009a4512b15cbb5bbf08b69d6b1e7937cd483b1ecbeab43a
- e4d798752e4263d6f486cb7339d5963eb60c9908e6f2835af637275c15e35412
- 46731b30a6cb27805f7e8167e66b1dadde77a39ffdafebc03f11300e2fb10667
- 76f1fbe98c36f2486dd15a1f15e0da9f012d2254860eacce2bdab160b1744db1
- 7ec19b9293c3954e9e3326ed74297b46627ac5f5eb4056c66c724b6fdec260f0
- db1ff15a26fdde55e626bdb49af86dc8d6f0b070b763d13c10d855d45edf924a
- 55bf8c6ade4797dd39301244e8c1afa0c37c677373bc760edbffee26a8b3fcf2
- f4e93da0fe15ba7687687991b8d00f5c9deabe37b6528ae5524682c5a7b91ecd
- 57677bf4805c6de175eef204874f8fec55b7ff9f52d1f2b785e2b943e8cc5b60
- 9fd5979c24743b52946eb5ee57894b4e3bb175f9e537527cfab4ed7942753423
- 46b9917fb197b9d0e3a2dd53630aa1aeb2f0a163cce7cd0177bc3a050a552aca
- 78a73aeb7ff1446e711efa44cf786e02f2d7c3a5217f14081ebf952748b4593b
- 55549f13d07fd904190956146372c4fd6a0a3f96f7729f8cb96c20a7598b8b93
- a79aea11e5a2fff37d0074ef2a1a947f1fe45c3228af25fc7030aad56017050b
- a5237e51a1f712755778267fe30c51dfaf476b8031e4192d0ed3319495abdfe1
- b466f0c29278ed5a02d36d87d77476dd3879af620cb98edb3f3760732e6e3ff1
- 4b9252648f34c232a5bf65363fcad8682f123ce98f8c5b317df5b1a97497a814
- e1b4daa5988928808bfe581cdebc78a62170214be7ed7c1c38ed5e083c6acff5
- 63780cc2d60299e2187709639c6f7a7194526668289a448aeb2eb1754b12d2f5
- 9b0701a0be10f6480f54332a8312d271266f3097d582ca88483365bfb931e2d1
- 76dd82fb3c1e32ef21255cb635026443ae508ae8f5ed4a8bd22337d16acd9333
- 0b64873a216da58695bc285607f992140b5172f8e3abb6f71864ad9aa3e97980"
+checksum="e0680e2bf60e550998b86ecd04d34f8b4e76e3bb356d2061231af690c9a3c2e6
+ 70dddb39c8cf269b1975e4828204275dcb0b8e8c579f3fe572cf912680b3be94
+ d27d6525afc388fe2bb4a24ca635c6b361534c2d6510e40b01144c74025e5355
+ c8f3dd4ce919435317dd506ad532d84c27f58e2208b443586ce9b7b97ad1c333
+ 07f0a5bca9361af2cdbd6564ae3aabea1ffd7682dd4253b456294a7aaa2c4fd0
+ be86979f9dc828b700ce05dd312bb02cab482ad389a0103d6aa4baa24b19bc14
+ 9498b1fffa6bffd98ca29e2a7fbf71291a023746d35275596d3d0819c00c74ff
+ 96be0d5fa322388a0b8d9e6b2633c03cc654cb18ae37f80fc675537d87b11c89
+ af7042ae5777c5b634c8ca044d0b9d3188ae22f386b769e8c0e920290fd5704d
+ be6380eccbe91b3aec03fcb5c46278ec87f61d8c7e9677f2ef47f983c44d0cfb
+ bf840c2319ea9881148af9f20dd2ac83d57cd9e685d40b76dae3c239292f74b6
+ ccec321436bd37f548807d5b454819a772bf53222c0318d0609572b2360202aa
+ 2ab653f9a863ed9da46da4a4618681ed231ef58ca069f2e076786b95db3c6f14
+ 2298d3af606f4a1a516e903d5cb3fdb47110e385d5bd2aed6faa85a89b60164d
+ 1f3c877cb4e1d6685bd3602579287e2d93bfdc49c3d3dd56ab9c12c1892c1551
+ 4f2fc2a2a4e0b2d1197119b8bac77d19fbb3ee745b114e8b62e0f6d325dff5f3
+ cebcb5b8c6f8d5bdd5aabac064fff4f70cc8047662ee2ea6dc892c1a843165fb
+ 799c7931302a33a2f61be7a43f2619729ad7702fc3530c293944637f18daa739
+ 6137f868d7023af0166935591ff8c33f910f08be0b4c9bb631fc12ceb7965587
+ 7525673f9cd4db238dbb3c478edde1089e4d45d1939a13b135a44679c2cdf2e8
+ b804d47f398dee126352f81b83baa40d8936c062cc40705b70bdb16dbf646958
+ b1bd30e53070b9ad7d3c4ce392da4f9fcc800069f6c064ab4e2b6eb70a081952
+ 7248db932ca9beccc23c8c179e0adc0f4b2a280cb3a62d6b0bb91941772471fc
+ 7816adfbdedc2a0ebb90ed54823dd3320ae4f4ee200c00105249b37bbf3b552e
+ 9e0fe5d6790a3283642404f29bebb06e8f6368a1b4ec35a55c2baa585f4fafe3
+ bfd19f18c78f91aaacd6a77b526845ae7e43c24c55149fce39c03ef8da63121d
+ 0e10a7ea0f3ff9a2d83490b500c383b8c483d0a22885a5174e415f2e632ddb43
+ 3ae8d77fa6baebc128b7eadc85e59a45a194cc782a03365af0054ef7b6c131ef
+ b3a0335e35c60cd867948f1f25ceba5ede118966d585a8b272d6976ae018c96e
+ 0fb538b79ac396be79b123aec8591e2604090f12e7ce7a1d2a439152be015fb7
+ 3e4b4d7bf8227ff768063b3ec5622b6ab3d3a23249c4a03dfa096026a5cd5d10
+ d251feda253e695c77b93860a2ab00f3e99fa90e0b05756ae771ca6156b344e8
+ ce4d7e9c3ffab3122ec116b3e0ea18e0d5e8c23d2c121d1507180477e76bb80c
+ 479d7bda7991b87a287a00e985c538d2055f2cf22e6cc7121aae1fd4cf1e9757
+ 21e8ffe1a6919962bf286385b54e1859e23eb337c0cb4fbf310d722feca54e3f
+ 548009e17942238de9a2f69bcb226d32dded300e901a19026602d1141126fb85
+ 9af6ee2975ac7a1c2f4b3c1bd63a9f1fb4d6db04131aafbb9dca4f497df8677b
+ 360e655189f1404655989623bef3fdb6da33846a779f2196b1cb80ce3799ff63
+ 7bf793bdd0322c9a871a564d7a7e3eecb36401b4c98a2c417f7ba11f4d9d8ed1
+ 26cce49dd6bdee1490a1cc62210c91e32c875494c473e937c96999b119614b89
+ e2b20759682a9dabf22e8b7f52840dd603af7aef7dbe46d5c66c76c80d664958
+ 7d2b6baa832d5f3ef03849ba5f5d79be513869cdb7a06a3052f30b9858d72fe4
+ 6f2a3129858f2c439a4f19507215cc54406b65edad25a0f78bc3568583b2fcc8
+ 929e84780fb4907525511547a40497413b0ea5ec591a013c4d675822580939b4
+ 1b1eae14a4a5b9d88866a5a9c03d3ed4b87c6189c0f6fd33027fe94b1879f3e7
+ 4b44b4cc69718604a866fd16295e814a38e49012a7da423b3e24308f49c99eee
+ e050321ef8fe64ee6073c63461bccc95a3adb27533c9a70c84d290f9e67ce1c2
+ f867d5579ff631ccb08d40dd0ebc94f202a205cfc77b381b88527fd113af851b
+ 849fc82129c125b41aae2cebcb6dad070cf156eb491662f9fc3aae3a8450a4b5
+ 6e4b51223d2c0ecdf792d5728ec893afa6e5588d6be024e49d18233202918f25
+ e38865f03a27fa6754c1e16d7519f6378676f8da3ea6c96833820d74b2babb89
+ 21d19019d90eec96728c50eebc0d1c3a8fa39481e999dc56bb01cee9d05816c1
+ ab9e68d5497f7d1505a58842530f3e24e292247dfd01d694ddc6de22b5ed4e1f
+ 149ad1fafc2e44f232521473df66198c0e70be03f5bfc6db2502174090ac986a
+ cc7bee0d016416207e97e006d7f84e5e680e914cabaffa4f6d36ca68ca8e9168
+ a22606075c78c814dcfcf5fa85514fcd026a9b71519138d74c9012a47a6c6e30
+ bf99363e1849bf0ce4107639fee3b2b3eec4eccf21e24082c9c565f03d3899d3
+ e4e003a2552434c5489865aa666e664c71342b7d842b33d8b650ed841bcd49c8
+ 2f076598229ad82565ecae1458321c8497128aa8ac409c305f21281b90a3d46d
+ d460168e536e0560fb8444b2e79cc2f30f80699942cc40c8e93f93c8c9e3607a
+ b189e3d4d90e2d3a7d85a0a9381a3efe9fc7bdb3e8ca074ad1bd2d9b0c06220a
+ 249f5ffa15a2373c034b6c2c38377d6ef61cf063c1b906a3becb38f38167ac8e
+ 646c87f5918a6c261ec883aa589f42b00831d8d9b827e17b2a50fdf1237c0cec
+ fa49ea2518c0d49ecac0881d480a6ec991bf4a5e74c7f049061d51b07ccfca34
+ c824290dd4715abcae813491b974ce7a306eb2a07ba495a6925ec8b9a11953a8
+ d3ccb2b9c1ec7ba46dbd2118bd6fcf442d6b28927a4821ed0b503b5ec7a0b024
+ d280632c05436c3639b607cbaab0b268e7f03f7090ee86c5fb3fa72bb385db95
+ 922a937523f222b87d8ee30b74b5dbaa7e895989e4c0ea4e293e64751178e564
+ 90caad4cff7db7838673aa7ba6635de68937c5146cf955b6686be924115d2d5d
+ 3613227480ae4ae19a00673d9cd50014b9c42ae0f24c241b111693d03e49e92e
+ ff399f50ab7f52b9899c4e33da944ba8649fbff1b8a6e317a912a130bec7ce90
+ c21864cf17d6d8b6d8ead7d221eb19ff1d51842ddaecc961116c1e4c69426301
+ ef1e3a66f66cf5850f060dc02607de6d35ab27a7aa5512bf87a03a0492e8a0f1
+ cd1a549f293eadf20460f71d31182081e37aa7971073c68b27615937d7dde78a
+ 53751982192bff3bb6927f954f7307ae42ff0a592298f4c7d67a687372307d17
+ 35e0409118384857a4f6e0576362e01046c7b871c40a71dde4ee47c41305fc7e
+ f4c1dc455166d1eee3199215b4b521a5d33156ea6c5607eaf25a16cfbb2157b4
+ 9299724da6721b598508e4b4b3e612155175bde60c276ec83b8765ea67d96132
+ a61ccbb3eed3089a3ee5233333f2501d4fe226573828b6fb3fa314e1df0ba972
+ 00357932c13c8004c9766ad5eba0044d99ea2127971800ebc0ebeabb389b0bad
+ b1e699ccbb0b12d5bae96f1353c81635ce5bac471505a8407a2af1aa1e7313e7
+ 20d9500429a5b9b2f6341b8d1af95bfba8ec9e16757bf4cbf75dc71a0571da79
+ fb1293643e647f947a669a113d179cadbb8fdd3e563a08f569f8ed35ee3bd94b
+ 1b810baec4acfa15bf8af63dded213d6ba5048eec11dd721e08b7e936616cb70
+ bfa27acd239c7978e7fb8555e4ed6de6d65701ce4ca2abcfd7e4358ec3bba3ca
+ e4a806b55579cd7f6a1de04c601644af122cad80a1777314d2d13305fd48b162
+ 2c919b76de1ec61a36905d0c5ffebf21bfed8bea177f917a9412ff6e8ff99d72
+ 0817006cf0288f31e1fd496f9a33f42dd63de368727a70a8a0e6d7ff7bdd48ac
+ 6f54c41fe252a9ddbe245e525c96804636ab03598caf014b75f6d482a752210b
+ ae0916d2154ee8231330f05fb848bf041190c9453be130e39164192a57ea0c69
+ 8c0045761f74fff9b012785913d9b38f0b829f969d7770fbb04a6b01fec05d44
+ 6e79fbbf5bf4d8444302c626b05b57b5b25726d1a890b3c5bf43d425a3ba51e2
+ 61288b7808de9ce97a4750569362ff918d6c4476fcf620ec742b2270a9327d1a"

From f732676052a27cbcbbbfeeb26915f743d309e885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 17:33:09 -0300
Subject: [PATCH 0566/3482] mdocml: fix behavior when localized man pages are
 present.

Using the -a option with makewhatis(8) makes it scan every file under
the configured manpaths, instead of only the ones in directories that
match "man*". When localized man pages are present, this makes it so
files under the "$some_lang/man*" directories are also indexed, which
can lead, as shown in #28146, to `man w3m` displaying a localized man
page instead of the default english one from /usr/share/man/man1/w3m.1.

Without a mandoc.db in the manpath, man(1) behaves predictably, and
removing from -a from the makewhatis(8) invocations makes it behave
predictably even with a mandoc.db available.

Users who wish to use localized man pages are expected to configure
manpaths in man.conf(5) or use the MANPATH env var.

Fixes #28146
---
 srcpkgs/mdocml/INSTALL                     | 2 +-
 srcpkgs/mdocml/files/makewhatis.cron.daily | 3 +--
 srcpkgs/mdocml/template                    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mdocml/INSTALL b/srcpkgs/mdocml/INSTALL
index 36be63101b75..7aa787b70f05 100644
--- a/srcpkgs/mdocml/INSTALL
+++ b/srcpkgs/mdocml/INSTALL
@@ -1,6 +1,6 @@
 case "$ACTION" in
 post)
 	echo "Regenerating man db..."
-	usr/bin/makewhatis -a -Tutf8
+	usr/bin/makewhatis -Tutf8
 	;;
 esac
diff --git a/srcpkgs/mdocml/files/makewhatis.cron.daily b/srcpkgs/mdocml/files/makewhatis.cron.daily
index ee334fa94f47..efe892e39fe7 100755
--- a/srcpkgs/mdocml/files/makewhatis.cron.daily
+++ b/srcpkgs/mdocml/files/makewhatis.cron.daily
@@ -1,3 +1,2 @@
 #!/bin/sh
-makewhatis -a -Tutf8
-exit $?
+exec makewhatis -Tutf8
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index d5759e2aefed..366c1f9180f6 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -1,7 +1,7 @@
 # Template file for 'mdocml'
 pkgname=mdocml
 version=1.14.5
-revision=6
+revision=7
 wrksrc="mandoc-${version}"
 build_style=configure
 make_build_args="all man.cgi"

From faac4774ede954e3b9bbe5005da4685088f9b5d8 Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:37:18 +0100
Subject: [PATCH 0567/3482] gnome-desktop: update to 3.38.3.

---
 srcpkgs/gnome-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 86c1d11e182a..1d225d66abff 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=3.38.1
+version=3.38.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=17903513fed60814e967512dd892751cb6a1d2716136232884bc65bd53cc3be0
+checksum=bfe00257b2bb59fff04ac1c144804084d1c253e66f9d7408f6060bbf7ad1d831
 
 build_options="gir"
 build_options_default="gir"

From 9a4ab0da7fd805e6667166f7f57a868db5b2c732 Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:40:33 +0100
Subject: [PATCH 0568/3482] mutter: update to 3.38.3.

---
 .../patches/dont-pull-generated-headers.patch | 49 -------------------
 srcpkgs/mutter/template                       | 26 ++++++----
 2 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/mutter/patches/dont-pull-generated-headers.patch

diff --git a/srcpkgs/mutter/patches/dont-pull-generated-headers.patch b/srcpkgs/mutter/patches/dont-pull-generated-headers.patch
deleted file mode 100644
index a75365a6324d..000000000000
--- a/srcpkgs/mutter/patches/dont-pull-generated-headers.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From ff379fb93ae2539bf9fae70ccc8e0351e5665fb0 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 5 Oct 2020 12:13:07 +0200
-Subject: [PATCH] backend: Don't pull generated headers (indirectly)
-
-Use a typedef for MetaRemoteDesktop, so tests poking MetaBackend don't
-indirectly depend upon generated headers. This is arguably a code fix
-for a build system bug.
-
-https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1470
-
-Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1449
-(or something...)
----
- src/backends/meta-backend-private.h | 4 ----
- src/backends/meta-backend-types.h   | 4 ++++
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git src/backends/meta-backend-private.h src/backends/meta-backend-private.h
-index 6d7d3ad758..5f4981fda5 100644
---- src/backends/meta-backend-private.h
-+++ src/backends/meta-backend-private.h
-@@ -42,10 +42,6 @@
- #include "backends/meta-settings-private.h"
- #include "core/util-private.h"
- 
--#ifdef HAVE_REMOTE_DESKTOP
--#include "backends/meta-remote-desktop.h"
--#endif
--
- #define DEFAULT_XKB_RULES_FILE "evdev"
- #define DEFAULT_XKB_MODEL "pc105+inet"
- 
-diff --git src/backends/meta-backend-types.h src/backends/meta-backend-types.h
-index 4753c07440..146a8c3d7c 100644
---- src/backends/meta-backend-types.h
-+++ src/backends/meta-backend-types.h
-@@ -59,4 +59,8 @@ typedef struct _MetaScreenCastStream MetaScreenCastStream;
- 
- typedef struct _MetaWaylandCompositor MetaWaylandCompositor;
- 
-+#ifdef HAVE_REMOTE_DESKTOP
-+typedef struct _MetaRemoteDesktop MetaRemoteDesktop;
-+#endif
-+
- #endif /* META_BACKEND_TYPE_H */
--- 
-GitLab
-
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 80bfe109da60..70df3b8cf4be 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,13 +1,14 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=3.38.1
+version=3.38.3
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
  -Dprofiler=false -Dintrospection=true -Dxwayland_path=/usr/bin/Xwayland
  -Dxwayland_initfd=disabled"
-hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server"
+hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
+ xorg-server-xwayland"
 makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
  json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
  libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
@@ -18,22 +19,29 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e921570c9fdf63805dbd40aa21daa05504a1b9a21432d6119c54c17ee0217a33
+checksum=b2321e73d1e3fe2e90e6301f42bba07f4d94bc64756a2bf13d75ae9d6faa201f
 shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
  libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"
 
-case "$XBPS_MACHINE" in i686*)
-	pre_build() {
-		ninja ${makejobs} -C build src/meta-dbus-display-config.h
-	}
-;;
-esac
+# Upstream keeps pulling generated headers even though it can cause race
+# conditions in meson/ninja
+pre_build() {
+	ninja ${makejobs} -C build src/meta-dbus-display-config.h
+}
 
 # needs X
 do_check() {
 	:
 }
 
+post_install() {
+	# modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
+	# meant to be called with 'pkg-config --variable'
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-7.pc
+}
+
 mutter-devel_package() {
 	depends="gtk+3-devel graphene-devel clutter-devel
 	 libX11-devel libXtst-devel mutter-${version}_${revision}"

From 025c643dede5371bb328b2bb10cdf66d433d0691 Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:41:23 +0100
Subject: [PATCH 0569/3482] gnome-shell: update to 3.38.3.

---
 srcpkgs/gnome-shell/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 6753b6ac54e0..448ad9323811 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,27 +1,27 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.1
+version=3.38.3
 revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false"
 hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
- asciidoc perl glib-devel mutter-devel gettext gjs-devel"
-makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
+ asciidoc perl glib-devel gettext gjs-devel"
+makedepends="at-spi2-atk evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  libnma-devel polkit-devel pulseaudio-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
-depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
+depends="elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4
+checksum=5345b418cb12a972955ce5cceaed6662480027336b5c51daea5730575b621ced
 
 # needs X
 do_check() {

From aaf396987aa83164c56ba728553c454c7e66b71e Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:43:13 +0100
Subject: [PATCH 0570/3482] gnome-control-center: update to 3.38.3.

---
 srcpkgs/gnome-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index ad35007c4b21..a7ccbdbcfb97 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.38.2
+version=3.38.3
 revision=2
 build_style=meson
 build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1500e0ec0dbbb3f0b9289d084d6987b9430fe444872adbea5ca7fe0cd5f8476c
+checksum=3b4a4b18ba91803dce133f443f9d1d1f5a1b6c26b7727876e0a699349f5696e3
 
 build_options="cheese"
 build_options_default="cheese"

From d02f147e00722240104c1a7b21aa169c46f33ed1 Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Tue, 26 Jan 2021 11:23:48 +0100
Subject: [PATCH 0571/3482] gnome-core: remove caribou dependency.

---
 srcpkgs/gnome-core/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 4aab60c6b747..075bd15cdd37 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
 version=3.38.0
-revision=2
+revision=3
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
 maintainer="q66 <daniel@octaforge.org>"
@@ -13,7 +13,6 @@ depends="
  at-spi2-core>=2.38.0
  at-spi2-atk>=2.38.0
  cantarell-fonts>=0.201
- caribou>=0.4.21
  dconf>=0.36.0
  evolution-data-server>=3.38.0
  folks>=0.14.0

From a0c8f531b3829b97dd700d8ccfa4ec122b0ad69a Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:42:16 +0100
Subject: [PATCH 0572/3482] gnome-shell-extensions: update to 3.38.2.

---
 srcpkgs/gnome-shell-extensions/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 14c3c8a44668..4ea740326654 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=3.38.1
+version=3.38.2
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9da38631ffb804284753e5d592f88b7953215cb8967d7a1c4f652d289f040c94
+checksum=57a44279a750215af51ff29162b7b7a7b287f6afa0a28bb51d3b27b2cb49f643

From 7d6be95241c58960e751c39acf00043cc9d23695 Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:44:56 +0100
Subject: [PATCH 0573/3482] gdm: update to 3.38.2.1.

---
 srcpkgs/gdm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 60d528dac134..6ef190e057ca 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=3.38.0
+version=3.38.2.1
 revision=2
 build_helper="gir"
 build_style=meson
@@ -21,8 +21,8 @@ short_desc="GNOME Display Manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=46d4415c39c94ccee81fbac21102e2ebcd284d39858c893e759900b1e88435ba
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
+checksum=ca58a205d5ebfcbdab56a11716b898e16ae5dff21aee79d076046444628ec4da
 
 conf_files="
 	/etc/gdm/custom.conf

From d0c85ab2eb5de0d2ce5616d07081d975533ec6da Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 27 Jan 2021 00:29:52 -0500
Subject: [PATCH 0574/3482] rust: rust-std should not depend on itself

---
 srcpkgs/rust/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 6bb928e14783..4d25635d409d 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -354,6 +354,7 @@ rust-doc_package() {
 
 rust-std_package() {
 	short_desc+=" - standard library"
+	depends=""
 	pkg_install() {
 		vmove usr/lib/rustlib
 	}

From a1aec36a6cd997dae5b37775a8c22c5390f0c090 Mon Sep 17 00:00:00 2001
From: Enfau Kerus <kerus@enfa.uk>
Date: Wed, 27 Jan 2021 15:44:28 +0800
Subject: [PATCH 0575/3482] common/shlibs: add missing rtaudio libs

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 1226e31c1899..92979332fb14 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3043,6 +3043,7 @@ libPocoEncodings.so.64 poco-1.9.4_1
 libPocoNetSSL.so.64 poco-1.9.4_1
 libPocoCrypto.so.64 poco-1.9.4_1
 libopenblas.so.0 openblas-0.2.19_1
+librtaudio.so.6 rtaudio-5.1.0_1
 librtmidi.so.5 rtmidi-4.0.0_1
 libbiblesync.so.2.1.0 biblesync-2.1.0_1
 libbac-9.4.2.so bacula-common-9.4.2_1

From 32e31679dc2a8b8f7b594f73157cdd19c9f7ad49 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 27 Jan 2021 12:58:18 +0100
Subject: [PATCH 0576/3482] linux5.10: update to 5.10.11.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index f7dd7929610a..e5930f6f0bbb 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.10
+version=5.10.11
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=60ed866fa951522a5255ea37ec3ac2006d3f3427d4783a13ef478464f37cdb19
+checksum=02ef2b56b00fc5145701c603a5235e1265772e40d488a936b27ba65fe78e710f
 python_version=3
 patch_args="-Np1"
 

From fcdbc44cf337e8a6e91ee4c130c090fdfc0fdaa6 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 20 Jan 2021 17:06:26 -0500
Subject: [PATCH 0577/3482] chromium: update to 88.0.4324.96.

- Built for x86_64, x86_64-musl, i686.
- Tested on x86_64.

- Add API deprecation warning message.
---
 srcpkgs/chromium/INSTALL.msg                  |  8 ++++
 .../files/musl-patches/musl-fixes.patch       | 10 ++---
 .../chromium-87-CursorFactory-include.patch   | 36 -----------------
 ...-87-ServiceWorkerContainerHost-crash.patch | 22 -----------
 .../chromium-88-AXTreeFormatter-include.patch | 27 +++++++++++++
 ...ium-88-BookmarkModelObserver-include.patch | 21 ++++++++++
 ...um-88-CompositorFrameReporter-dcheck.patch | 36 +++++++++++++++++
 .../chromium-88-StringPool-include.patch      | 20 ++++++++++
 ...romium-88-federated_learning-include.patch | 21 ++++++++++
 ...hromium-88-ideographicSpaceCharacter.patch | 27 +++++++++++++
 .../patches/chromium-88-ityp-include.patch    | 25 ++++++++++++
 .../patches/chromium-88-vaapi-attribute.patch | 39 +++++++++++++++++++
 ...remove-unsupported-compiler-warnings.patch | 13 ++++---
 .../patches/xxx-ppc64le-support.patch         | 33 ++++++++--------
 srcpkgs/chromium/template                     |  6 +--
 15 files changed, 256 insertions(+), 88 deletions(-)
 create mode 100644 srcpkgs/chromium/INSTALL.msg
 delete mode 100644 srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-88-AXTreeFormatter-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-88-BookmarkModelObserver-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-88-CompositorFrameReporter-dcheck.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-88-StringPool-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-88-federated_learning-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-88-ideographicSpaceCharacter.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-88-ityp-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-88-vaapi-attribute.patch

diff --git a/srcpkgs/chromium/INSTALL.msg b/srcpkgs/chromium/INSTALL.msg
new file mode 100644
index 000000000000..ea95f5157e29
--- /dev/null
+++ b/srcpkgs/chromium/INSTALL.msg
@@ -0,0 +1,8 @@
+On March 15, 2021, Google will be limiting access to their private Chrome APIs:
+
+    https://blog.chromium.org/2021/01/limiting-private-api-availability-in.html
+
+This means that after this date, chromium users will no longer be able to take
+advantage of features such as Google account sync (including bookmarks), spell
+checking, translation, and safe browsing. These features will only be available
+with the restricted google-chrome package.
diff --git a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
index 6b50f61fcbdb..a7832ff32e8d 100644
--- a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
+++ b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
@@ -117,18 +117,18 @@ diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/incl
  #include <arpa/inet.h>
  #include <stdint.h>
  #endif
---- ./base/logging.cc.orig
-+++ ./base/logging.cc
-@@ -545,8 +545,7 @@
+--- ./base/logging.cc.orig	2021-01-20 12:09:54.227038757 -0500
++++ ./base/logging.cc	2021-01-20 12:24:32.600301351 -0500
+@@ -557,8 +557,7 @@
  
  LogMessage::~LogMessage() {
    size_t stack_start = stream_.tellp();
 -#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
 -    !defined(OS_AIX)
 +#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__)
-   if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
      // Include a stack trace on a fatal, unless a debugger is attached.
-     base::debug::StackTrace trace;
+     base::debug::StackTrace stack_trace;
 --- ./third_party/blink/renderer/platform/wtf/stack_util.cc.orig
 +++ ./third_party/blink/renderer/platform/wtf/stack_util.cc
 @@ -28,7 +28,7 @@
diff --git a/srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch b/srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch
deleted file mode 100644
index d345e584830e..000000000000
--- a/srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c4f6e8cd34a245c3640b86a91c9694d69594d80b Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 16 Sep 2020 15:05:02 +0000
-Subject: [PATCH] IWYU: ui::CursorFactory is now required independent from
- Ozone
-
----
- .../ui/views/chrome_browser_main_extra_parts_views_linux.cc  | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
-index 5a97d61..ccedd2a 100644
---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
-+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
-@@ -7,6 +7,7 @@
- #include "chrome/browser/themes/theme_service_aura_linux.h"
- #include "chrome/browser/ui/browser_list.h"
- #include "chrome/browser/ui/views/theme_profile_key.h"
-+#include "ui/base/cursor/cursor_factory.h"
- #include "ui/display/screen.h"
- #include "ui/views/linux_ui/linux_ui.h"
- 
-@@ -15,10 +16,6 @@
- #include "ui/gtk/gtk_ui_delegate.h"
- #endif
- 
--#if defined(USE_OZONE)
--#include "ui/base/cursor/cursor_factory.h"
--#endif
--
- #if defined(USE_X11)
- #include "ui/gfx/x/connection.h"  // nogncheck
- #if BUILDFLAG(USE_GTK)
--- 
-2.26.2
-
diff --git a/srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch b/srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch
deleted file mode 100644
index 286b86691f13..000000000000
--- a/srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Bug: https://bugs.gentoo.org/750038
-Upstream bug: https://crbug.com/1135070
-
---- content/browser/service_worker/service_worker_container_host.cc
-+++ content/browser/service_worker/service_worker_container_host.cc
-@@ -626,6 +626,16 @@
-     int64_t registration_id) {
-   DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId());
-   DCHECK(base::Contains(registration_object_hosts_, registration_id));
-+
-+  // ServiceWorkerRegistrationObjectHost to be deleted may have the last reference to
-+  // ServiceWorkerRegistration that indirectly owns this ServiceWorkerContainerHost.
-+  // If we erase the object host directly from the map, |this| could be deleted
-+  // during the map operation and may crash. To avoid the case, we take the
-+  // ownership of the object host from the map first, and then erase the entry
-+  // from the map. See https://crbug.com/1135070 for details.
-+  std::unique_ptr<ServiceWorkerRegistrationObjectHost> to_be_deleted =
-+      std::move(registration_object_hosts_[registration_id]);
-+  DCHECK(to_be_deleted);
-   registration_object_hosts_.erase(registration_id);
- }
- 
diff --git a/srcpkgs/chromium/patches/chromium-88-AXTreeFormatter-include.patch b/srcpkgs/chromium/patches/chromium-88-AXTreeFormatter-include.patch
new file mode 100644
index 000000000000..547810989206
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-AXTreeFormatter-include.patch
@@ -0,0 +1,27 @@
+From 6e402d97c2dec5726f37e95f97b7f7e12b1d3b1d Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Wed, 11 Nov 2020 11:02:13 +0100
+Subject: [PATCH] IWYU: include headers for std::vector and std::unique_ptr in AXTreeFormatter
+
+Fix these build errors with libstdc++:
+../../ui/accessibility/platform/inspect/tree_formatter.h:35:12: error: ‘std::vector’ has not been declared
+../../ui/accessibility/platform/inspect/tree_formatter.h:61:16: error: ‘unique_ptr’ in namespace ‘std’ does not name a template type
+
+Bug: 957519
+Change-Id: I402ac0644255b3cd4932ff2fe72d999b125a7895
+---
+
+diff --git a/ui/accessibility/platform/inspect/tree_formatter.h b/ui/accessibility/platform/inspect/tree_formatter.h
+index 4a70a4d..bb23768 100644
+--- ui/accessibility/platform/inspect/tree_formatter.h
++++ ui/accessibility/platform/inspect/tree_formatter.h
+@@ -5,6 +5,9 @@
+ #ifndef UI_ACCESSIBILITY_PLATFORM_INSPECT_TREE_FORMATTER_H_
+ #define UI_ACCESSIBILITY_PLATFORM_INSPECT_TREE_FORMATTER_H_
+ 
++#include <memory>
++#include <vector>
++
+ #include "ui/accessibility/platform/inspect/inspect.h"
+ 
+ #include "ui/gfx/native_widget_types.h"
diff --git a/srcpkgs/chromium/patches/chromium-88-BookmarkModelObserver-include.patch b/srcpkgs/chromium/patches/chromium-88-BookmarkModelObserver-include.patch
new file mode 100644
index 000000000000..0b26a60a36e7
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-BookmarkModelObserver-include.patch
@@ -0,0 +1,21 @@
+From 127ec3b1bf26ab37f2ae8333f284008868756274 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sat, 21 Nov 2020 15:59:23 +0000
+Subject: [PATCH] IWYU: size_t is defined stddef.h
+
+Change-Id: I4400ac7c6004b49ec6e72c44f2754e2166642f88
+---
+
+diff --git a/components/bookmarks/browser/bookmark_model_observer.h b/components/bookmarks/browser/bookmark_model_observer.h
+index 69c40e7..0e5eb96 100644
+--- components/bookmarks/browser/bookmark_model_observer.h
++++ components/bookmarks/browser/bookmark_model_observer.h
+@@ -7,6 +7,8 @@
+ 
+ #include <set>
+ 
++#include <stddef.h>
++
+ class GURL;
+ 
+ namespace bookmarks {
diff --git a/srcpkgs/chromium/patches/chromium-88-CompositorFrameReporter-dcheck.patch b/srcpkgs/chromium/patches/chromium-88-CompositorFrameReporter-dcheck.patch
new file mode 100644
index 000000000000..aa1c52e0b7e2
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-CompositorFrameReporter-dcheck.patch
@@ -0,0 +1,36 @@
+From 56c654a91600e3bf254aa9f66c1151b0850b6ee4 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Wed, 11 Nov 2020 10:24:47 +0100
+Subject: [PATCH] GCC: do not pass unique_ptr to DCHECK_NE, but the actual pointer, in CompositorFrameReporter
+
+DCHECK_NE comparison requires CheckOpValueStr to be defined for the
+type, or providing an output stream operator. A unique_ptr does not
+provide any.
+
+Compilation in GCC is failing in CompositorFrameReporter because of
+this:
+../../cc/metrics/compositor_frame_reporter.cc: In member function ‘void cc::CompositorFrameReporter::ReportEventLatencyHistograms() const’:
+../../base/check_op.h:224:59: error: no matching function for call to ‘CheckOpValueStr(const std::unique_ptr<cc::EventMetrics>&)’
+
+Fixed comparing the result of get() method for unique_ptr instead of
+the unique_ptr.
+
+Bug: 819294
+Change-Id: I11103d1867c7196c1de92e72f9f12dcfd31c29f1
+
+(updated to use DCHECK as suggested in comments)
+---
+
+diff --git a/cc/metrics/compositor_frame_reporter.cc b/cc/metrics/compositor_frame_reporter.cc
+index 725beb0..fafd0f3 100644
+--- cc/metrics/compositor_frame_reporter.cc
++++ cc/metrics/compositor_frame_reporter.cc
+@@ -686,7 +686,7 @@
+ 
+ void CompositorFrameReporter::ReportEventLatencyHistograms() const {
+   for (const auto& event_metrics : events_metrics_) {
+-    DCHECK_NE(event_metrics, nullptr);
++    DCHECK(event_metrics);
+     const std::string histogram_base_name =
+         GetEventLatencyHistogramBaseName(*event_metrics);
+     const int event_type_index = static_cast<int>(event_metrics->type());
diff --git a/srcpkgs/chromium/patches/chromium-88-StringPool-include.patch b/srcpkgs/chromium/patches/chromium-88-StringPool-include.patch
new file mode 100644
index 000000000000..e55bbae2ece7
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-StringPool-include.patch
@@ -0,0 +1,20 @@
+From 372366b4180533f27d3250a50810828370d697b0 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sat, 21 Nov 2020 16:12:18 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+Change-Id: Ia5226e1432a622f4f4abc8f1b18bcab8638a73c6
+---
+
+diff --git a/src/trace_processor/containers/string_pool.h b/src/trace_processor/containers/string_pool.h
+index 11ae91c..58c6db2 100644
+--- third_party/perfetto/src/trace_processor/containers/string_pool.h
++++ third_party/perfetto/src/trace_processor/containers/string_pool.h
+@@ -22,6 +22,7 @@
+ 
+ #include <unordered_map>
+ #include <vector>
++#include <limits>
+ 
+ #include "perfetto/ext/base/optional.h"
+ #include "perfetto/ext/base/paged_memory.h"
diff --git a/srcpkgs/chromium/patches/chromium-88-federated_learning-include.patch b/srcpkgs/chromium/patches/chromium-88-federated_learning-include.patch
new file mode 100644
index 000000000000..3eb1537d8012
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-federated_learning-include.patch
@@ -0,0 +1,21 @@
+From bcb20babee602b55fe4bd026e13a41d10b89632f Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sat, 21 Nov 2020 15:55:02 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+Change-Id: I1b6b07ebb397a29c84d3ed51ae41523e3ecab497
+---
+
+diff --git a/components/federated_learning/floc_constants.cc b/components/federated_learning/floc_constants.cc
+index df66e5d..2eb50f1 100644
+--- components/federated_learning/floc_constants.cc
++++ components/federated_learning/floc_constants.cc
+@@ -4,6 +4,8 @@
+ 
+ #include "components/federated_learning/floc_constants.h"
+ 
++#include <limits>
++
+ namespace federated_learning {
+ 
+ // This is only for experimentation and won't be served to websites.
diff --git a/srcpkgs/chromium/patches/chromium-88-ideographicSpaceCharacter.patch b/srcpkgs/chromium/patches/chromium-88-ideographicSpaceCharacter.patch
new file mode 100644
index 000000000000..38a11423b2de
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-ideographicSpaceCharacter.patch
@@ -0,0 +1,27 @@
+From 75ff882bb5f2fcd14431e65fa638ae72bdb47086 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sun, 15 Nov 2020 14:31:23 +0000
+Subject: [PATCH] fix ideographicSpaceCharacter constant for system icu
+
+https://chromium-review.googlesource.com/c/chromium/src/+/1687411
+renamed ideographicSpaceCharacter to kIdeographicSpaceCharacter.
+---
+ third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
+index fb8ab05..5d4ea13 100644
+--- third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
++++ third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
+@@ -432,7 +432,7 @@ String TextCodecICU::Decode(const char* bytes,
+   // ICU decodes it as U+E5E5.
+   if (!strcmp(encoding_.GetName(), "GBK")) {
+     if (EqualIgnoringASCIICase(encoding_.GetName(), "gb18030"))
+-      resultString.Replace(0xE5E5, ideographicSpaceCharacter);
++      resultString.Replace(0xE5E5, kIdeographicSpaceCharacter);
+     // Make GBK compliant to the encoding spec and align with GB18030
+     resultString.Replace(0x01F9, 0xE7C8);
+     // FIXME: Once https://www.w3.org/Bugs/Public/show_bug.cgi?id=28740#c3
+-- 
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/chromium-88-ityp-include.patch b/srcpkgs/chromium/patches/chromium-88-ityp-include.patch
new file mode 100644
index 000000000000..c54b6fffd541
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-ityp-include.patch
@@ -0,0 +1,25 @@
+From bc383a5dd7fa8f2b535f28815fd6932fbc0d2a45 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Wed, 28 Oct 2020 16:00:35 +0000
+Subject: [PATCH] IWYU: include stddef.h for size_t
+
+---
+ third_party/dawn/src/common/ityp_array.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/dawn/src/common/ityp_array.h b/third_party/dawn/src/common/ityp_array.h
+index 48e080f..c784198 100644
+--- third_party/dawn/src/common/ityp_array.h
++++ third_party/dawn/src/common/ityp_array.h
+@@ -21,6 +21,8 @@
+ #include <array>
+ #include <type_traits>
+ 
++#include <stddef.h>
++
+ namespace ityp {
+ 
+     // ityp::array is a helper class that wraps std::array with the restriction that
+-- 
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/chromium-88-vaapi-attribute.patch b/srcpkgs/chromium/patches/chromium-88-vaapi-attribute.patch
new file mode 100644
index 000000000000..e4161af45c7f
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-vaapi-attribute.patch
@@ -0,0 +1,39 @@
+From 4f4604877f3b666ac7a373ae443e3c3795424569 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 6 Nov 2020 11:18:42 +0000
+Subject: [PATCH] GCC: fix attribute on function definition
+
+GCC does not accept attributes at the end for function definitions.
+Solution is to move it before function name. Otherwise GCC fails like
+this:
+
+../../base/compiler_specific.h:97:28: error: attributes are not allowed
+on a function-definition
+   97 | #define WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+         |                            ^~~~~~~~~~~~~
+	 ../../media/gpu/vaapi/vaapi_wrapper.h:322:36: note: in
+	 expansion of macro 'WARN_UNUSED_RESULT'
+	   322 |                     const T* data) WARN_UNUSED_RESULT {
+	       |                                    ^~~~~~~~~~~~~~~~~~
+---
+ media/gpu/vaapi/vaapi_wrapper.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/media/gpu/vaapi/vaapi_wrapper.h b/media/gpu/vaapi/vaapi_wrapper.h
+index fd1fd82..deeda1f 100644
+--- media/gpu/vaapi/vaapi_wrapper.h
++++ media/gpu/vaapi/vaapi_wrapper.h
+@@ -318,8 +318,8 @@ class MEDIA_GPU_EXPORT VaapiWrapper
+   // Convenient templatized version of SubmitBuffer() where |size| is deduced to
+   // be the size of the type of |*data|.
+   template <typename T>
+-  bool SubmitBuffer(VABufferType va_buffer_type,
+-                    const T* data) WARN_UNUSED_RESULT {
++  bool WARN_UNUSED_RESULT SubmitBuffer(VABufferType va_buffer_type,
++                                       const T* data) {
+     return SubmitBuffer(va_buffer_type, sizeof(T), data);
+   }
+   // Batch-version of SubmitBuffer(), where the lock for accessing libva is
+-- 
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch b/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
index 4286b16b13f1..3016b065212d 100644
--- a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
+++ b/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
@@ -1,6 +1,6 @@
---- build/config/compiler/BUILD.gn.orig	2020-11-17 13:39:13.000000000 -0500
-+++ build/config/compiler/BUILD.gn	2020-11-18 20:54:58.313154596 -0500
-@@ -1536,22 +1530,12 @@
+--- build/config/compiler/BUILD.gn.orig	2021-01-20 09:01:44.362114311 -0500
++++ build/config/compiler/BUILD.gn	2021-01-20 09:03:41.880232248 -0500
+@@ -1534,9 +1534,6 @@
  
            # TODO(https://crbug.com/1028110): Evaluate and possible enable.
            "-Wno-deprecated-copy",
@@ -10,9 +10,10 @@
          ]
  
          cflags_c += [
-           # TODO(https://crbug.com/995993): Clean up and enable.
-           "-Wno-implicit-fallthrough",
-         ]
+@@ -1548,13 +1545,6 @@
+           # TODO(https://crbug.com/1143700): Clean up and re-enable.
+           cflags_objc = [ "-Wno-gnu-folding-constant" ]
+         }
 -
 -        if (enable_wmax_tokens) {
 -          cflags += [ "-Wmax-tokens" ]
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index 17c3e0cfddef..805755c21258 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -211,17 +211,17 @@ diff --git sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 index f51915edc..ca2f4f106 100644
 --- sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 +++ sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -36,7 +36,8 @@
- #include <sys/ioctl.h>
+@@ -40,7 +40,8 @@
  #include <sys/ptrace.h>
- #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(__arm__) && \
--    !defined(__aarch64__) && !defined(PTRACE_GET_THREAD_AREA)
-+    !defined(__aarch64__) && !defined(PTRACE_GET_THREAD_AREA) && \
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
+-    !defined(PTRACE_GET_THREAD_AREA)
++    !defined(PTRACE_GET_THREAD_AREA) &&			    \
 +    !defined(__powerpc64__)
  // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
  // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
  // asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
-@@ -45,6 +46,11 @@
+@@ -49,6 +50,11 @@
  #endif
  #endif  // !OS_NACL_NONSFI
  
@@ -233,7 +233,7 @@ index f51915edc..ca2f4f106 100644
  #if defined(OS_ANDROID)
  
  #if !defined(F_DUPFD_CLOEXEC)
-@@ -107,6 +113,15 @@ inline bool IsArchitectureMips() {
+@@ -98,6 +104,15 @@
  #endif
  }
  
@@ -249,7 +249,7 @@ index f51915edc..ca2f4f106 100644
  // Ubuntu's version of glibc has a race condition in sem_post that can cause
  // it to call futex(2) with bogus op arguments. To workaround this, we need
  // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
-@@ -248,6 +263,8 @@ ResultExpr RestrictFcntlCommands() {
+@@ -239,6 +254,8 @@
    uint64_t kOLargeFileFlag = O_LARGEFILE;
    if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
      kOLargeFileFlag = 0100000;
@@ -258,7 +258,7 @@ index f51915edc..ca2f4f106 100644
  
    const Arg<int> cmd(1);
    const Arg<long> long_arg(2);
-@@ -262,14 +279,23 @@ ResultExpr RestrictFcntlCommands() {
+@@ -253,14 +270,23 @@
                F_SETLKW,
                F_GETLK,
                F_DUPFD,
@@ -285,15 +285,16 @@ index f51915edc..ca2f4f106 100644
  ResultExpr RestrictSocketcallCommand() {
    // Unfortunately, we are unable to restrict the first parameter to
    // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
-@@ -418,7 +444,7 @@ ResultExpr RestrictPrlimitToGetrlimit(pid_t target_pid) {
- ResultExpr RestrictPtrace() {
-   const Arg<int> request(0);
-   return Switch(request).CASES((
+@@ -413,7 +439,7 @@
+ #endif
+   return Switch(request)
+       .CASES((
 -#if !defined(__aarch64__)
 +#if !defined(__aarch64__) && !defined(__powerpc64__)
-         PTRACE_GETREGS,
-         PTRACE_GETFPREGS,
-         PTRACE_GET_THREAD_AREA,
+                  PTRACE_GETREGS, PTRACE_GETFPREGS, PTRACE_GET_THREAD_AREA,
+                  PTRACE_GETREGSET,
+ #endif
+
 diff --git sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
 index ba4289f05..9a4d5ab2d 100644
 --- sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 6a8ec3827dd9..348389798a2e 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,15 +1,15 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See http://www.chromium.org/developers/calendar for the latest version
-version=87.0.4280.141
-revision=2
+version=88.0.4324.96
+revision=1
 archs="i686* x86_64* aarch64* armv7l* ppc64le*"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=147591d7fc21e1a173701d28bbf35baddb91e64dd96ec16d8eee9a5113403375
+checksum=8995c5bb28559579f3bed51841420253637f912c425908fe5aa389ce40e9c79f
 nocross=yes
 
 lib32disabled=yes

From 423d0920e71fd987473bc557f253663f8f371368 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 21 Jan 2021 13:20:08 -0500
Subject: [PATCH 0578/3482] chromium-widevine: update to 88.0.4324.96.

---
 srcpkgs/chromium-widevine/INSTALL  | 2 +-
 srcpkgs/chromium-widevine/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chromium-widevine/INSTALL b/srcpkgs/chromium-widevine/INSTALL
index d4723ffdf1f4..de1264d34d68 100644
--- a/srcpkgs/chromium-widevine/INSTALL
+++ b/srcpkgs/chromium-widevine/INSTALL
@@ -1,6 +1,6 @@
 # INSTALL
 
-checksum=b7edb7cd5c166bf3c0a1d245baa5924e242c3b81b97090468bec778f41f40373
+checksum=4c3fca6ba917db4635368c99df61cd811c5138daa1ad890d4dc4271dd0014124
 _baseUrl="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable"
 _filename="google-chrome-stable_${VERSION%_*}-1_amd64.deb"
 DISTFILE="${_baseUrl}/${_filename}"
diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template
index be13eec954a4..8dc78d1edecf 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
 _channel="stable"
 
 pkgname=chromium-widevine
-version=87.0.4280.141
+version=88.0.4324.96
 revision=1
 archs="x86_64"
 create_wrksrc=yes

From 814104ed838144aa69de167c0e4f7577c0b512aa Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Tue, 26 Jan 2021 17:56:39 +0000
Subject: [PATCH 0579/3482] Thunar: update to 4.16.2.

sgn: Add back the reverts and glib-devel (required for thunar-uca)
Close: #28248
---
 srcpkgs/Thunar/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 004b48ee50c2..befa4cc39b80 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,15 +1,15 @@
 # Template file for 'Thunar'
 pkgname=Thunar
 reverts="4.17.0_1"
-version=4.16.1
-revision=2
+version=4.16.2
+revision=1
 wrksrc=thunar-${version}
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-gio-unix --enable-gudev
  --enable-exif --enable-pcre --disable-static --enable-notifications
  --with-locales-dir=/usr/share/locale"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel"
 makedepends="exo-devel libexif-devel libgudev-devel libnotify-devel xfce4-panel-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Thunar File Manager"
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://docs.xfce.org/xfce/thunar/Start"
 changelog="https://raw.githubusercontent.com/xfce-mirror/thunar/master/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=da2d17d2cb69eb33768690b714cc232ed367cbd71eb9543aaa2a805d05dc3ce1
+checksum=67a90b98c436192f9aa6cd18a22a089e713007864aebfa65f36f121c86ba7add
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd

From 2d98eb37a385780bd25d0f3d249e17fe47eb03f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 09:36:39 -0500
Subject: [PATCH 0580/3482] python3-pybind11: update to 2.6.2.

---
 srcpkgs/python3-pybind11/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pybind11/template b/srcpkgs/python3-pybind11/template
index 1aa374b6b4e2..6dcafe286361 100644
--- a/srcpkgs/python3-pybind11/template
+++ b/srcpkgs/python3-pybind11/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pybind11'
 pkgname=python3-pybind11
-version=2.6.1
+version=2.6.2
 revision=1
 wrksrc="pybind11-${version}"
 build_style=python3-module
@@ -13,13 +13,16 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pybind/pybind11"
 distfiles="https://github.com/pybind/pybind11/archive/v${version}.tar.gz"
-checksum=cdbe326d357f18b83d10322ba202d69f11b2f49e2d87ade0dc2be0c5c34f8e2a
+checksum=8ff2fff22df038f5cd02cea8af56622bc67f5b64534f1b83b9f133b8366acff2
 
 
-post_build() {
+post_patch() {
 	# These dependencies are not packaged and don't affect the man page
 	vsed -e '/sphinxcontrib.rsvgconverter/d' \
 		-e '/sphinxcontrib.moderncmakedomain/d' -i docs/conf.py
+}
+
+post_build() {
 	# Build the man page
 	make $makejobs -C docs man
 }

From 193bc2f00c0690d9e6738d47a3e24ef1dd11dd27 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 09:36:44 -0500
Subject: [PATCH 0581/3482] python3-pyopencl: update to 2021.1.

---
 srcpkgs/python3-pyopencl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 49ef0a074a7b..2ceffe9836fd 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
-version=2020.3.1
+version=2021.1
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11, Apache-2.0, BSD-3-Clause"
 homepage="https://mathema.tician.de/software/pyopencl"
 distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz"
-checksum=abc689307cf34d3dcc94d43815f64e2265469b50ecce6c903a3180589666fb36
+checksum=262a29708a5465bd12b75d838f8d1107cd9321f54cb1c553c0064db10f3d5041
 
 do_configure() {
 	./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \

From d978c5fa3f8b35987d37d4b0d97e3f30b6c7ba3b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 09:47:39 -0500
Subject: [PATCH 0582/3482] python3-hypothesis: update to 6.0.3.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 1a5c4de03b2d..f7304f48399a 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=5.49.0
+version=6.0.3
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=b756a941014df75f772d01cc4fde4383c8dabc6db95f32cce094012f576f6762
+checksum=c5cdf04d720b4746f04a2a541c73d3e3584e98bd2024b37b17c06511b668336e
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 76592c1a0b3b893de77f64f12794c2a6a85f6c83 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 10:02:43 -0500
Subject: [PATCH 0583/3482] python3-pytest: update to 6.2.2.

---
 srcpkgs/python3-pytest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pytest/template b/srcpkgs/python3-pytest/template
index 4c291e13efb9..6a38a983b04c 100644
--- a/srcpkgs/python3-pytest/template
+++ b/srcpkgs/python3-pytest/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytest'
 pkgname=python3-pytest
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="pytest-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ license="MIT"
 homepage="https://docs.pytest.org/en/latest/"
 changelog="https://docs.pytest.org/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz"
-checksum=66e419b1899bc27346cb2c993e12c5e5e8daba9073c1fbce33b9807abc95c306
+checksum=9d1edf9e7d0b84d72ea3dbcdfd22b35fb543a5e8f2a60092dd578936bf63d7f9
 alternatives="
  pytest:pytest:/usr/bin/pytest3
  pytest:py.test:/usr/bin/py.test3"

From 6b2d69440eac9398cb8ee874ab331b1b31bb9771 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 10:02:49 -0500
Subject: [PATCH 0584/3482] python3-josepy: update to 1.6.0.

---
 srcpkgs/python3-josepy/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-josepy/template b/srcpkgs/python3-josepy/template
index 46c6ecaf7cf4..228f0a40502f 100644
--- a/srcpkgs/python3-josepy/template
+++ b/srcpkgs/python3-josepy/template
@@ -1,14 +1,19 @@
 # Template file for 'python3-josepy'
 pkgname=python3-josepy
-version=1.5.0
+version=1.6.0
 revision=1
 wrksrc="josepy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-cryptography python3-openssl python3-setuptools python3-six"
+checkdepends="python3-pytest python3-mock $depends"
 short_desc="JOSE protocol implementation in Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/josepy"
 distfiles="${PYPI_SITE}/j/josepy/josepy-${version}.tar.gz"
-checksum=502a36f86efe2a6d09bf7018bca9fd8f8f24d8090a966aa037dbc844459ff9c8
+checksum=0aab1c3ceffe045e7fd5bcfe7685e27e9d2758518d9ba7116b5de34087e70bf5
+
+pre_check() {
+	vsed -e '/addopts/d' -i pytest.ini
+}

From 8774c00b1980f18e2d7ec9e134d4d7eaa906614d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 10:10:57 -0500
Subject: [PATCH 0585/3482] python3-pyzmq: update to 21.0.2.

---
 srcpkgs/python3-pyzmq/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 230b21a04319..162a999f7a74 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=21.0.1
+version=21.0.2
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=c3a630dd7716e8e127d43b22598e256a2d11a847b8cc3310350528960037fa06
+checksum=098c13c6198913c2a0690235fa74d2e49161755f66b663beaec89651554cc79c
 
 pre_build() {
 	cat > setup.cfg <<-EOF

From 9846aa52aa1b09147e36246f2c686ff32bf389dd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 11:34:44 -0500
Subject: [PATCH 0586/3482] python-urllib3: update to 1.26.3.

---
 srcpkgs/python-urllib3/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python-urllib3/template b/srcpkgs/python-urllib3/template
index 8a395f6aec69..4888a2760953 100644
--- a/srcpkgs/python-urllib3/template
+++ b/srcpkgs/python-urllib3/template
@@ -1,6 +1,6 @@
 # Template file for 'python-urllib3'
 pkgname=python-urllib3
-version=1.26.2
+version=1.26.3
 revision=1
 wrksrc="urllib3-${version}"
 build_style=python-module
@@ -11,14 +11,14 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://urllib3.readthedocs.io/"
 distfiles="${PYPI_SITE}/u/urllib3/urllib3-${version}.tar.gz"
-checksum=19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08
+checksum=de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73
 
 post_install() {
-	# replace bundled copy of six
-	for pyver in $py2_ver $py3_ver; do
-		rm -f ${DESTDIR}/usr/lib/python${pyver}/site-packages/urllib3/packages/six.py
-		ln -sf ../../six.py ${DESTDIR}/usr/lib/python${pyver}/site-packages/urllib3/packages/six.py
+	for sitelib in ${py3_sitelib} ${py2_sitelib}; do
+		rm ${DESTDIR}/${sitelib}/urllib3/packages/six.py
+		ln -sf ../../six.py ${DESTDIR}/${sitelib}/urllib3/packages/six.py
 	done
+
 	vlicense LICENSE.txt
 }
 

From d1eb5bde6298cd23484eb9ed38fd2bef451e2bab Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 10:53:59 -0600
Subject: [PATCH 0587/3482] bpytop: update to 1.0.61.

---
 srcpkgs/bpytop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bpytop/template b/srcpkgs/bpytop/template
index 9436b9d4be0c..c4b2e00034cf 100644
--- a/srcpkgs/bpytop/template
+++ b/srcpkgs/bpytop/template
@@ -1,6 +1,6 @@
 # Template file for 'bpytop'
 pkgname=bpytop
-version=1.0.60
+version=1.0.61
 revision=1
 build_style=gnu-makefile
 depends="python3-psutil"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aristocratos/bpytop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7fc1a40ac6b9cb8f78f1e0e2e7bd58b9197c333ad4c5a4f2cb464d3f8183835b
+checksum=01bc712df11cb7022fff510e118130f4834c3dcd1f85267ada9c50a30af5919b
 
 pre_configure() {
 	vsed -e '/^update_check/s/\$update_check/false/' -i bpytop.py

From 2a76c8f9c21d1105e91b117ad4252ec5164ec9b5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 10:56:49 -0600
Subject: [PATCH 0588/3482] downloader-cli: update to 0.3.1.

---
 srcpkgs/downloader-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/downloader-cli/template b/srcpkgs/downloader-cli/template
index f406399f0dd8..f56449f6f966 100644
--- a/srcpkgs/downloader-cli/template
+++ b/srcpkgs/downloader-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'downloader-cli'
 pkgname=downloader-cli
-version=0.2.0
-revision=2
+version=0.3.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-urllib3 python3-downloader-cli"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/deepjyoti30/downloader-cli"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c9c3e7c2ecc9cfe5d51032fc9783b6cc5e879746231535f86279f0a910659881
+checksum=bd88aad5967b2fc7f70f715725a51a398c56e4fae791463dafda3a69730b277d
 
 post_install() {
 	vlicense LICENSE

From 80815e7ec848c526a6a0a4fb573faf559b0cf45c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 27 Jan 2021 18:49:21 +0100
Subject: [PATCH 0589/3482] icecat: remove

---
 srcpkgs/icecat-i18n-ach                       |   1 -
 srcpkgs/icecat-i18n-af                        |   1 -
 srcpkgs/icecat-i18n-an                        |   1 -
 srcpkgs/icecat-i18n-ar                        |   1 -
 srcpkgs/icecat-i18n-ast                       |   1 -
 srcpkgs/icecat-i18n-az                        |   1 -
 srcpkgs/icecat-i18n-be                        |   1 -
 srcpkgs/icecat-i18n-bg                        |   1 -
 srcpkgs/icecat-i18n-bn                        |   1 -
 srcpkgs/icecat-i18n-br                        |   1 -
 srcpkgs/icecat-i18n-bs                        |   1 -
 srcpkgs/icecat-i18n-ca                        |   1 -
 srcpkgs/icecat-i18n-cak                       |   1 -
 srcpkgs/icecat-i18n-cs                        |   1 -
 srcpkgs/icecat-i18n-cy                        |   1 -
 srcpkgs/icecat-i18n-da                        |   1 -
 srcpkgs/icecat-i18n-de                        |   1 -
 srcpkgs/icecat-i18n-dsb                       |   1 -
 srcpkgs/icecat-i18n-el                        |   1 -
 srcpkgs/icecat-i18n-en-CA                     |   1 -
 srcpkgs/icecat-i18n-en-GB                     |   1 -
 srcpkgs/icecat-i18n-en-US                     |   1 -
 srcpkgs/icecat-i18n-eo                        |   1 -
 srcpkgs/icecat-i18n-es-AR                     |   1 -
 srcpkgs/icecat-i18n-es-CL                     |   1 -
 srcpkgs/icecat-i18n-es-ES                     |   1 -
 srcpkgs/icecat-i18n-es-MX                     |   1 -
 srcpkgs/icecat-i18n-et                        |   1 -
 srcpkgs/icecat-i18n-eu                        |   1 -
 srcpkgs/icecat-i18n-fa                        |   1 -
 srcpkgs/icecat-i18n-ff                        |   1 -
 srcpkgs/icecat-i18n-fi                        |   1 -
 srcpkgs/icecat-i18n-fr                        |   1 -
 srcpkgs/icecat-i18n-fy-NL                     |   1 -
 srcpkgs/icecat-i18n-ga-IE                     |   1 -
 srcpkgs/icecat-i18n-gd                        |   1 -
 srcpkgs/icecat-i18n-gl                        |   1 -
 srcpkgs/icecat-i18n-gn                        |   1 -
 srcpkgs/icecat-i18n-gu-IN                     |   1 -
 srcpkgs/icecat-i18n-he                        |   1 -
 srcpkgs/icecat-i18n-hi-IN                     |   1 -
 srcpkgs/icecat-i18n-hr                        |   1 -
 srcpkgs/icecat-i18n-hsb                       |   1 -
 srcpkgs/icecat-i18n-hu                        |   1 -
 srcpkgs/icecat-i18n-hy-AM                     |   1 -
 srcpkgs/icecat-i18n-ia                        |   1 -
 srcpkgs/icecat-i18n-id                        |   1 -
 srcpkgs/icecat-i18n-is                        |   1 -
 srcpkgs/icecat-i18n-it                        |   1 -
 srcpkgs/icecat-i18n-ja                        |   1 -
 srcpkgs/icecat-i18n-ka                        |   1 -
 srcpkgs/icecat-i18n-kab                       |   1 -
 srcpkgs/icecat-i18n-kk                        |   1 -
 srcpkgs/icecat-i18n-km                        |   1 -
 srcpkgs/icecat-i18n-kn                        |   1 -
 srcpkgs/icecat-i18n-ko                        |   1 -
 srcpkgs/icecat-i18n-lij                       |   1 -
 srcpkgs/icecat-i18n-lt                        |   1 -
 srcpkgs/icecat-i18n-lv                        |   1 -
 srcpkgs/icecat-i18n-mk                        |   1 -
 srcpkgs/icecat-i18n-mr                        |   1 -
 srcpkgs/icecat-i18n-ms                        |   1 -
 srcpkgs/icecat-i18n-my                        |   1 -
 srcpkgs/icecat-i18n-nb-NO                     |   1 -
 srcpkgs/icecat-i18n-ne-NP                     |   1 -
 srcpkgs/icecat-i18n-nl                        |   1 -
 srcpkgs/icecat-i18n-nn-NO                     |   1 -
 srcpkgs/icecat-i18n-oc                        |   1 -
 srcpkgs/icecat-i18n-pa-IN                     |   1 -
 srcpkgs/icecat-i18n-pl                        |   1 -
 srcpkgs/icecat-i18n-pt-BR                     |   1 -
 srcpkgs/icecat-i18n-pt-PT                     |   1 -
 srcpkgs/icecat-i18n-rm                        |   1 -
 srcpkgs/icecat-i18n-ro                        |   1 -
 srcpkgs/icecat-i18n-ru                        |   1 -
 srcpkgs/icecat-i18n-si                        |   1 -
 srcpkgs/icecat-i18n-sk                        |   1 -
 srcpkgs/icecat-i18n-sl                        |   1 -
 srcpkgs/icecat-i18n-son                       |   1 -
 srcpkgs/icecat-i18n-sq                        |   1 -
 srcpkgs/icecat-i18n-sr                        |   1 -
 srcpkgs/icecat-i18n-sv-SE                     |   1 -
 srcpkgs/icecat-i18n-ta                        |   1 -
 srcpkgs/icecat-i18n-te                        |   1 -
 srcpkgs/icecat-i18n-th                        |   1 -
 srcpkgs/icecat-i18n-tr                        |   1 -
 srcpkgs/icecat-i18n-uk                        |   1 -
 srcpkgs/icecat-i18n-ur                        |   1 -
 srcpkgs/icecat-i18n-uz                        |   1 -
 srcpkgs/icecat-i18n-vi                        |   1 -
 srcpkgs/icecat-i18n-xh                        |   1 -
 srcpkgs/icecat-i18n-zh-CN                     |   1 -
 srcpkgs/icecat-i18n-zh-TW                     |   1 -
 srcpkgs/icecat/files/icecat-wayland           |   2 -
 srcpkgs/icecat/files/icecat.desktop           | 116 ---
 srcpkgs/icecat/files/mozconfig                |  35 -
 srcpkgs/icecat/files/stab.h                   |  71 --
 srcpkgs/icecat/files/vendor.js                |   9 -
 .../patches/big-endian-image-decoders.patch   |  88 --
 .../icecat/patches/fix-arm-opus-include.patch |  11 -
 srcpkgs/icecat/patches/fix-cross.patch        |  16 -
 .../patches/fix-desktop-icon-path.patch       |  11 -
 .../icecat/patches/fix-fortify-inline.patch   |  11 -
 .../icecat/patches/fix-i686-ppc-musl.patch    |  11 -
 .../patches/fix-image-format-warning.patch    |  39 -
 srcpkgs/icecat/patches/fix-tools.patch        |  13 -
 srcpkgs/icecat/patches/fix-wasm-arm.patch     |  15 -
 .../icecat/patches/fix-webrtc-glibcisms.patch |  20 -
 srcpkgs/icecat/patches/flac-no-ffvpx.patch    |  26 -
 srcpkgs/icecat/patches/mallinfo.patch         |  34 -
 .../icecat/patches/musl-rust.configure.patch  |  26 -
 srcpkgs/icecat/patches/ppc32-fix-build.patch  |  36 -
 srcpkgs/icecat/patches/rust-configure.patch   |  42 -
 srcpkgs/icecat/patches/rust-has-i128.patch    |  21 -
 srcpkgs/icecat/patches/sandbox-fork.patch     |  13 -
 .../icecat/patches/sandbox-largefile.patch    |  17 -
 srcpkgs/icecat/patches/skia-sucks1.patch      |  77 --
 srcpkgs/icecat/patches/skia-sucks2.patch      |  44 -
 srcpkgs/icecat/patches/skia-sucks3.patch      |  56 --
 srcpkgs/icecat/patches/sndio.patch            |  52 -
 srcpkgs/icecat/template                       | 951 ------------------
 srcpkgs/icecat/update                         |   2 -
 122 files changed, 1958 deletions(-)
 delete mode 120000 srcpkgs/icecat-i18n-ach
 delete mode 120000 srcpkgs/icecat-i18n-af
 delete mode 120000 srcpkgs/icecat-i18n-an
 delete mode 120000 srcpkgs/icecat-i18n-ar
 delete mode 120000 srcpkgs/icecat-i18n-ast
 delete mode 120000 srcpkgs/icecat-i18n-az
 delete mode 120000 srcpkgs/icecat-i18n-be
 delete mode 120000 srcpkgs/icecat-i18n-bg
 delete mode 120000 srcpkgs/icecat-i18n-bn
 delete mode 120000 srcpkgs/icecat-i18n-br
 delete mode 120000 srcpkgs/icecat-i18n-bs
 delete mode 120000 srcpkgs/icecat-i18n-ca
 delete mode 120000 srcpkgs/icecat-i18n-cak
 delete mode 120000 srcpkgs/icecat-i18n-cs
 delete mode 120000 srcpkgs/icecat-i18n-cy
 delete mode 120000 srcpkgs/icecat-i18n-da
 delete mode 120000 srcpkgs/icecat-i18n-de
 delete mode 120000 srcpkgs/icecat-i18n-dsb
 delete mode 120000 srcpkgs/icecat-i18n-el
 delete mode 120000 srcpkgs/icecat-i18n-en-CA
 delete mode 120000 srcpkgs/icecat-i18n-en-GB
 delete mode 120000 srcpkgs/icecat-i18n-en-US
 delete mode 120000 srcpkgs/icecat-i18n-eo
 delete mode 120000 srcpkgs/icecat-i18n-es-AR
 delete mode 120000 srcpkgs/icecat-i18n-es-CL
 delete mode 120000 srcpkgs/icecat-i18n-es-ES
 delete mode 120000 srcpkgs/icecat-i18n-es-MX
 delete mode 120000 srcpkgs/icecat-i18n-et
 delete mode 120000 srcpkgs/icecat-i18n-eu
 delete mode 120000 srcpkgs/icecat-i18n-fa
 delete mode 120000 srcpkgs/icecat-i18n-ff
 delete mode 120000 srcpkgs/icecat-i18n-fi
 delete mode 120000 srcpkgs/icecat-i18n-fr
 delete mode 120000 srcpkgs/icecat-i18n-fy-NL
 delete mode 120000 srcpkgs/icecat-i18n-ga-IE
 delete mode 120000 srcpkgs/icecat-i18n-gd
 delete mode 120000 srcpkgs/icecat-i18n-gl
 delete mode 120000 srcpkgs/icecat-i18n-gn
 delete mode 120000 srcpkgs/icecat-i18n-gu-IN
 delete mode 120000 srcpkgs/icecat-i18n-he
 delete mode 120000 srcpkgs/icecat-i18n-hi-IN
 delete mode 120000 srcpkgs/icecat-i18n-hr
 delete mode 120000 srcpkgs/icecat-i18n-hsb
 delete mode 120000 srcpkgs/icecat-i18n-hu
 delete mode 120000 srcpkgs/icecat-i18n-hy-AM
 delete mode 120000 srcpkgs/icecat-i18n-ia
 delete mode 120000 srcpkgs/icecat-i18n-id
 delete mode 120000 srcpkgs/icecat-i18n-is
 delete mode 120000 srcpkgs/icecat-i18n-it
 delete mode 120000 srcpkgs/icecat-i18n-ja
 delete mode 120000 srcpkgs/icecat-i18n-ka
 delete mode 120000 srcpkgs/icecat-i18n-kab
 delete mode 120000 srcpkgs/icecat-i18n-kk
 delete mode 120000 srcpkgs/icecat-i18n-km
 delete mode 120000 srcpkgs/icecat-i18n-kn
 delete mode 120000 srcpkgs/icecat-i18n-ko
 delete mode 120000 srcpkgs/icecat-i18n-lij
 delete mode 120000 srcpkgs/icecat-i18n-lt
 delete mode 120000 srcpkgs/icecat-i18n-lv
 delete mode 120000 srcpkgs/icecat-i18n-mk
 delete mode 120000 srcpkgs/icecat-i18n-mr
 delete mode 120000 srcpkgs/icecat-i18n-ms
 delete mode 120000 srcpkgs/icecat-i18n-my
 delete mode 120000 srcpkgs/icecat-i18n-nb-NO
 delete mode 120000 srcpkgs/icecat-i18n-ne-NP
 delete mode 120000 srcpkgs/icecat-i18n-nl
 delete mode 120000 srcpkgs/icecat-i18n-nn-NO
 delete mode 120000 srcpkgs/icecat-i18n-oc
 delete mode 120000 srcpkgs/icecat-i18n-pa-IN
 delete mode 120000 srcpkgs/icecat-i18n-pl
 delete mode 120000 srcpkgs/icecat-i18n-pt-BR
 delete mode 120000 srcpkgs/icecat-i18n-pt-PT
 delete mode 120000 srcpkgs/icecat-i18n-rm
 delete mode 120000 srcpkgs/icecat-i18n-ro
 delete mode 120000 srcpkgs/icecat-i18n-ru
 delete mode 120000 srcpkgs/icecat-i18n-si
 delete mode 120000 srcpkgs/icecat-i18n-sk
 delete mode 120000 srcpkgs/icecat-i18n-sl
 delete mode 120000 srcpkgs/icecat-i18n-son
 delete mode 120000 srcpkgs/icecat-i18n-sq
 delete mode 120000 srcpkgs/icecat-i18n-sr
 delete mode 120000 srcpkgs/icecat-i18n-sv-SE
 delete mode 120000 srcpkgs/icecat-i18n-ta
 delete mode 120000 srcpkgs/icecat-i18n-te
 delete mode 120000 srcpkgs/icecat-i18n-th
 delete mode 120000 srcpkgs/icecat-i18n-tr
 delete mode 120000 srcpkgs/icecat-i18n-uk
 delete mode 120000 srcpkgs/icecat-i18n-ur
 delete mode 120000 srcpkgs/icecat-i18n-uz
 delete mode 120000 srcpkgs/icecat-i18n-vi
 delete mode 120000 srcpkgs/icecat-i18n-xh
 delete mode 120000 srcpkgs/icecat-i18n-zh-CN
 delete mode 120000 srcpkgs/icecat-i18n-zh-TW
 delete mode 100644 srcpkgs/icecat/files/icecat-wayland
 delete mode 100644 srcpkgs/icecat/files/icecat.desktop
 delete mode 100644 srcpkgs/icecat/files/mozconfig
 delete mode 100644 srcpkgs/icecat/files/stab.h
 delete mode 100644 srcpkgs/icecat/files/vendor.js
 delete mode 100644 srcpkgs/icecat/patches/big-endian-image-decoders.patch
 delete mode 100644 srcpkgs/icecat/patches/fix-arm-opus-include.patch
 delete mode 100644 srcpkgs/icecat/patches/fix-cross.patch
 delete mode 100644 srcpkgs/icecat/patches/fix-desktop-icon-path.patch
 delete mode 100644 srcpkgs/icecat/patches/fix-fortify-inline.patch
 delete mode 100644 srcpkgs/icecat/patches/fix-i686-ppc-musl.patch
 delete mode 100644 srcpkgs/icecat/patches/fix-image-format-warning.patch
 delete mode 100644 srcpkgs/icecat/patches/fix-tools.patch
 delete mode 100644 srcpkgs/icecat/patches/fix-wasm-arm.patch
 delete mode 100644 srcpkgs/icecat/patches/fix-webrtc-glibcisms.patch
 delete mode 100644 srcpkgs/icecat/patches/flac-no-ffvpx.patch
 delete mode 100644 srcpkgs/icecat/patches/mallinfo.patch
 delete mode 100644 srcpkgs/icecat/patches/musl-rust.configure.patch
 delete mode 100644 srcpkgs/icecat/patches/ppc32-fix-build.patch
 delete mode 100644 srcpkgs/icecat/patches/rust-configure.patch
 delete mode 100644 srcpkgs/icecat/patches/rust-has-i128.patch
 delete mode 100644 srcpkgs/icecat/patches/sandbox-fork.patch
 delete mode 100644 srcpkgs/icecat/patches/sandbox-largefile.patch
 delete mode 100644 srcpkgs/icecat/patches/skia-sucks1.patch
 delete mode 100644 srcpkgs/icecat/patches/skia-sucks2.patch
 delete mode 100644 srcpkgs/icecat/patches/skia-sucks3.patch
 delete mode 100644 srcpkgs/icecat/patches/sndio.patch
 delete mode 100644 srcpkgs/icecat/template
 delete mode 100644 srcpkgs/icecat/update

diff --git a/srcpkgs/icecat-i18n-ach b/srcpkgs/icecat-i18n-ach
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-ach
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-af b/srcpkgs/icecat-i18n-af
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-af
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-an b/srcpkgs/icecat-i18n-an
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-an
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ar b/srcpkgs/icecat-i18n-ar
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-ar
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ast b/srcpkgs/icecat-i18n-ast
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-ast
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-az b/srcpkgs/icecat-i18n-az
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-az
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-be b/srcpkgs/icecat-i18n-be
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-be
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-bg b/srcpkgs/icecat-i18n-bg
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-bg
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-bn b/srcpkgs/icecat-i18n-bn
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-bn
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-br b/srcpkgs/icecat-i18n-br
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-br
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-bs b/srcpkgs/icecat-i18n-bs
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-bs
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ca b/srcpkgs/icecat-i18n-ca
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-ca
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-cak b/srcpkgs/icecat-i18n-cak
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-cak
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-cs b/srcpkgs/icecat-i18n-cs
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-cs
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-cy b/srcpkgs/icecat-i18n-cy
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-cy
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-da b/srcpkgs/icecat-i18n-da
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-da
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-de b/srcpkgs/icecat-i18n-de
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-de
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-dsb b/srcpkgs/icecat-i18n-dsb
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-dsb
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-el b/srcpkgs/icecat-i18n-el
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-el
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-en-CA b/srcpkgs/icecat-i18n-en-CA
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-en-CA
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-en-GB b/srcpkgs/icecat-i18n-en-GB
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-en-GB
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-en-US b/srcpkgs/icecat-i18n-en-US
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-en-US
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-eo b/srcpkgs/icecat-i18n-eo
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-eo
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-es-AR b/srcpkgs/icecat-i18n-es-AR
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-es-AR
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-es-CL b/srcpkgs/icecat-i18n-es-CL
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-es-CL
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-es-ES b/srcpkgs/icecat-i18n-es-ES
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-es-ES
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-es-MX b/srcpkgs/icecat-i18n-es-MX
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-es-MX
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-et b/srcpkgs/icecat-i18n-et
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-et
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-eu b/srcpkgs/icecat-i18n-eu
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-eu
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-fa b/srcpkgs/icecat-i18n-fa
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-fa
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ff b/srcpkgs/icecat-i18n-ff
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-ff
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-fi b/srcpkgs/icecat-i18n-fi
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-fi
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-fr b/srcpkgs/icecat-i18n-fr
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-fr
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-fy-NL b/srcpkgs/icecat-i18n-fy-NL
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-fy-NL
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ga-IE b/srcpkgs/icecat-i18n-ga-IE
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-ga-IE
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-gd b/srcpkgs/icecat-i18n-gd
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-gd
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-gl b/srcpkgs/icecat-i18n-gl
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-gl
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-gn b/srcpkgs/icecat-i18n-gn
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-gn
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-gu-IN b/srcpkgs/icecat-i18n-gu-IN
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-gu-IN
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-he b/srcpkgs/icecat-i18n-he
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-he
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-hi-IN b/srcpkgs/icecat-i18n-hi-IN
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-hi-IN
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-hr b/srcpkgs/icecat-i18n-hr
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-hr
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-hsb b/srcpkgs/icecat-i18n-hsb
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-hsb
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-hu b/srcpkgs/icecat-i18n-hu
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-hu
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-hy-AM b/srcpkgs/icecat-i18n-hy-AM
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-hy-AM
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ia b/srcpkgs/icecat-i18n-ia
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-ia
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-id b/srcpkgs/icecat-i18n-id
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-id
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-is b/srcpkgs/icecat-i18n-is
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-is
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-it b/srcpkgs/icecat-i18n-it
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-it
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ja b/srcpkgs/icecat-i18n-ja
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-ja
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ka b/srcpkgs/icecat-i18n-ka
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-ka
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-kab b/srcpkgs/icecat-i18n-kab
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-kab
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-kk b/srcpkgs/icecat-i18n-kk
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-kk
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-km b/srcpkgs/icecat-i18n-km
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-km
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-kn b/srcpkgs/icecat-i18n-kn
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-kn
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ko b/srcpkgs/icecat-i18n-ko
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-ko
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-lij b/srcpkgs/icecat-i18n-lij
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-lij
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-lt b/srcpkgs/icecat-i18n-lt
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-lt
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-lv b/srcpkgs/icecat-i18n-lv
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-lv
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-mk b/srcpkgs/icecat-i18n-mk
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-mk
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-mr b/srcpkgs/icecat-i18n-mr
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-mr
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ms b/srcpkgs/icecat-i18n-ms
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-ms
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-my b/srcpkgs/icecat-i18n-my
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-my
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-nb-NO b/srcpkgs/icecat-i18n-nb-NO
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-nb-NO
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ne-NP b/srcpkgs/icecat-i18n-ne-NP
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-ne-NP
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-nl b/srcpkgs/icecat-i18n-nl
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-nl
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-nn-NO b/srcpkgs/icecat-i18n-nn-NO
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-nn-NO
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-oc b/srcpkgs/icecat-i18n-oc
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-oc
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-pa-IN b/srcpkgs/icecat-i18n-pa-IN
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-pa-IN
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-pl b/srcpkgs/icecat-i18n-pl
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-pl
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-pt-BR b/srcpkgs/icecat-i18n-pt-BR
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-pt-BR
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-pt-PT b/srcpkgs/icecat-i18n-pt-PT
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-pt-PT
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-rm b/srcpkgs/icecat-i18n-rm
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-rm
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ro b/srcpkgs/icecat-i18n-ro
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-ro
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ru b/srcpkgs/icecat-i18n-ru
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-ru
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-si b/srcpkgs/icecat-i18n-si
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-si
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-sk b/srcpkgs/icecat-i18n-sk
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-sk
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-sl b/srcpkgs/icecat-i18n-sl
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-sl
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-son b/srcpkgs/icecat-i18n-son
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-son
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-sq b/srcpkgs/icecat-i18n-sq
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-sq
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-sr b/srcpkgs/icecat-i18n-sr
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-sr
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-sv-SE b/srcpkgs/icecat-i18n-sv-SE
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-sv-SE
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ta b/srcpkgs/icecat-i18n-ta
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-ta
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-te b/srcpkgs/icecat-i18n-te
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-te
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-th b/srcpkgs/icecat-i18n-th
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-th
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-tr b/srcpkgs/icecat-i18n-tr
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-tr
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-uk b/srcpkgs/icecat-i18n-uk
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-uk
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ur b/srcpkgs/icecat-i18n-ur
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-ur
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-uz b/srcpkgs/icecat-i18n-uz
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-uz
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-vi b/srcpkgs/icecat-i18n-vi
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-vi
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-xh b/srcpkgs/icecat-i18n-xh
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-xh
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-zh-CN b/srcpkgs/icecat-i18n-zh-CN
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-zh-CN
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-zh-TW b/srcpkgs/icecat-i18n-zh-TW
deleted file mode 120000
index 7659ab69f6a0..000000000000
--- a/srcpkgs/icecat-i18n-zh-TW
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat/files/icecat-wayland b/srcpkgs/icecat/files/icecat-wayland
deleted file mode 100644
index ca6010f3044a..000000000000
--- a/srcpkgs/icecat/files/icecat-wayland
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec env MOZ_ENABLE_WAYLAND= /usr/lib/icecat/icecat "$@"
diff --git a/srcpkgs/icecat/files/icecat.desktop b/srcpkgs/icecat/files/icecat.desktop
deleted file mode 100644
index 5bc7c6c86985..000000000000
--- a/srcpkgs/icecat/files/icecat.desktop
+++ /dev/null
@@ -1,116 +0,0 @@
-[Desktop Entry]
-Name=GNU-IceCat
-GenericName=GNU Web Browser
-GenericName[af]=GNU Web Blaaier
-GenericName[ar]=GNU متصفح ويب
-GenericName[az]=GNU Veb Səyyahı
-GenericName[bg]=GNU Браузър
-GenericName[bn]=GNU ওয়েব ব্রাউজার
-GenericName[br]=GNU Furcher ar Gwiad
-GenericName[bs]=GNU WWW Preglednik
-GenericName[ca]=GNU Fullejador web
-GenericName[cs]=GNU WWW prohlížeč
-GenericName[cy]=GNU Porydd Gwe
-GenericName[da]=GNU Browser
-GenericName[de]=GNU Web-Browser
-GenericName[el]=GNU Περιηγητής Ιστού
-GenericName[eo]=GNU TTT-legilo
-GenericName[es]=GNU Navegador web
-GenericName[et]=GNU Veebilehitseja
-GenericName[eu]=GNU Web arakatzailea
-GenericName[fa]=GNU مرورگر وب
-GenericName[fi]=GNU WWW-selain
-GenericName[fo]=GNU Alnótsfar
-GenericName[fr]=GNU Navigateur web
-GenericName[gl]=GNU Navegador Web
-GenericName[he]=GNU דפדפן אינטרנט
-GenericName[hi]=GNU वेब ब्राउज़र
-GenericName[hr]=GNU Web preglednik
-GenericName[hu]=GNU Webböngésző
-GenericName[is]=GNU Vafri
-GenericName[it]=GNU Browser Web
-GenericName[ja]=GNU ウェブブラウザ
-GenericName[ko]=GNU 웹 브라우저
-GenericName[lo]=GNU ເວັບບຣາວເຊີ
-GenericName[lt]=GNU Žiniatinklio naršyklė
-GenericName[lv]=GNU Web Pārlūks
-GenericName[mk]=GNU Прелистувач на Интернет 
-GenericName[mn]=GNU Веб-Хөтөч
-GenericName[nb]=GNU Nettleser
-GenericName[nds]=GNU Nettkieker
-GenericName[nl]=GNU Webbrowser
-GenericName[nn]=GNU Nettlesar
-GenericName[nso]=GNU Seinyakisi sa Web
-GenericName[pa]=GNU ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=GNU Przeglądarka WWW
-GenericName[pt]=GNU Navegador Web
-GenericName[pt_BR]=GNU Navegador Web
-GenericName[ro]=GNU Navigator de web
-GenericName[ru]=GNU Веб-браузер
-GenericName[se]=GNU Fierpmádatlogan
-GenericName[sk]=GNU Webový prehliadač
-GenericName[sl]=GNU Spletni brskalnik
-GenericName[sr]=GNU Веб претраживач
-GenericName[sr@Latn]=GNU Veb pretraživač
-GenericName[ss]=GNU Ibrawuza yeWeb 
-GenericName[sv]=GNU Webbläsare
-GenericName[ta]=GNU வலை உலாவி
-GenericName[tg]=GNU Тафсиргари вэб
-GenericName[th]=GNU เว็บบราวเซอร์
-GenericName[tr]=GNU Web Tarayıcı
-GenericName[uk]=GNU Навігатор Тенет
-GenericName[uz]=GNU Веб-браузер
-GenericName[ven]=GNU Buronza ya Webu
-GenericName[vi]=GNU Trình duyệt Web
-GenericName[wa]=GNU Betchteu waibe
-GenericName[xh]=GNU Umkhangeli zincwadi we Web
-GenericName[zh_CN]=GNU 网页浏览器
-GenericName[zh_TW]=GNU 網頁瀏覽器
-GenericName[zu]=GNU Umcingi we-Web
-Comment=Browse the World Wide Web
-Comment[ar]=تصفح الشبكة العنكبوتية العالمية
-Comment[ast]=Restola pela Rede
-Comment[bn]=ইন্টারনেট ব্রাউজ করুন
-Comment[ca]=Navegueu per la web
-Comment[cs]=Prohlížení stránek World Wide Webu
-Comment[da]=Surf på internettet
-Comment[de]=Im Internet surfen
-Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
-Comment[es]=Navegue por la web
-Comment[et]=Lehitse veebi
-Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
-Comment[fi]=Selaa Internetin WWW-sivuja
-Comment[fr]=Naviguer sur le Web
-Comment[gl]=Navegar pola rede
-Comment[he]=גלישה ברחבי האינטרנט
-Comment[hr]=Pretražite web
-Comment[hu]=A világháló böngészése
-Comment[it]=Esplora il web
-Comment[ja]=ウェブを閲覧します
-Comment[ko]=웹을 돌아 다닙니다
-Comment[ku]=Li torê bigere
-Comment[lt]=Naršykite internete
-Comment[nb]=Surf på nettet
-Comment[nl]=Verken het internet
-Comment[nn]=Surf på nettet
-Comment[no]=Surf på nettet
-Comment[pl]=Przeglądanie stron WWW
-Comment[pt]=Navegue na Internet
-Comment[pt_BR]=Navegue na Internet
-Comment[ro]=Navigați pe Internet
-Comment[ru]=Доступ в Интернет
-Comment[sk]=Prehliadanie internetu
-Comment[sl]=Brskajte po spletu
-Comment[sv]=Surfa på webben
-Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
-Comment[uk]=Перегляд сторінок Інтернету
-Comment[vi]=Để duyệt các trang web
-Comment[zh_CN]=浏览互联网
-Comment[zh_TW]=瀏覽網際網路
-Exec=icecat %u
-Icon=icecat
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=true
-Categories=Network;WebBrowser;
diff --git a/srcpkgs/icecat/files/mozconfig b/srcpkgs/icecat/files/mozconfig
deleted file mode 100644
index 708ee9eded9b..000000000000
--- a/srcpkgs/icecat/files/mozconfig
+++ /dev/null
@@ -1,35 +0,0 @@
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --with-system-icu
-# XXX: the system's libpng doesn't have APNG support
-ac_add_options --without-system-png
-ac_add_options --enable-system-pixman
-ac_add_options --enable-system-ffi
-
-nspr_config_args="
- --libdir=${XBPS_CROSS_BASE}/usr/lib
- --includedir=${XBPS_CROSS_BASE}/usr/include/nspr"
-
-nss_config_args="
- --libdir=${XBPS_CROSS_BASE}/usr/lib
- --includedir=${XBPS_CROSS_BASE}/usr/include/nss"
-
-ac_add_options --disable-tests
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-install-strip
-ac_add_options --disable-strip
-ac_add_options --disable-profiling
-ac_add_options --enable-release
-ac_add_options --enable-optimize="$CFLAGS"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-application=browser
-ac_add_options --allow-addon-sideload
diff --git a/srcpkgs/icecat/files/stab.h b/srcpkgs/icecat/files/stab.h
deleted file mode 100644
index 6f70af39897a..000000000000
--- a/srcpkgs/icecat/files/stab.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$OpenBSD: stab.h,v 1.3 2003/06/02 19:34:12 millert Exp $	*/
-/*	$NetBSD: stab.h,v 1.4 1994/10/26 00:56:25 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)stab.h	5.2 (Berkeley) 4/4/91
- */
-
-#ifndef _STAB_H_
-#define _STAB_H_
-
-/*
- * The following are symbols used by various debuggers and by the Pascal
- * compiler.  Each of them must have one (or more) of the bits defined by
- * the N_STAB mask set.
- */
-
-#define	N_GSYM		0x20	/* global symbol */
-#define	N_FNAME		0x22	/* F77 function name */
-#define	N_FUN		0x24	/* procedure name */
-#define	N_STSYM		0x26	/* data segment variable */
-#define	N_LCSYM		0x28	/* bss segment variable */
-#define	N_MAIN		0x2a	/* main function name */
-#define	N_PC		0x30	/* global Pascal symbol */
-#define	N_RSYM		0x40	/* register variable */
-#define	N_SLINE		0x44	/* text segment line number */
-#define	N_DSLINE	0x46	/* data segment line number */
-#define	N_BSLINE	0x48	/* bss segment line number */
-#define	N_SSYM		0x60	/* structure/union element */
-#define	N_SO		0x64	/* main source file name */
-#define	N_LSYM		0x80	/* stack variable */
-#define	N_BINCL		0x82	/* include file beginning */
-#define	N_SOL		0x84	/* included source file name */
-#define	N_PSYM		0xa0	/* parameter variable */
-#define	N_EINCL		0xa2	/* include file end */
-#define	N_ENTRY		0xa4	/* alternate entry point */
-#define	N_LBRAC		0xc0	/* left bracket */
-#define	N_EXCL		0xc2	/* deleted include file */
-#define	N_RBRAC		0xe0	/* right bracket */
-#define	N_BCOMM		0xe2	/* begin common */
-#define	N_ECOMM		0xe4	/* end common */
-#define	N_ECOML		0xe8	/* end common (local name) */
-#define	N_LENG		0xfe	/* length of preceding entry */
-
-#endif /* !_STAB_H_ */
diff --git a/srcpkgs/icecat/files/vendor.js b/srcpkgs/icecat/files/vendor.js
deleted file mode 100644
index d8d606bc15d7..000000000000
--- a/srcpkgs/icecat/files/vendor.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default browser checking.
-pref("browser.shell.checkDefaultBrowser", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
diff --git a/srcpkgs/icecat/patches/big-endian-image-decoders.patch b/srcpkgs/icecat/patches/big-endian-image-decoders.patch
deleted file mode 100644
index ccb417b61f15..000000000000
--- a/srcpkgs/icecat/patches/big-endian-image-decoders.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1626236
-https://bug1626236.bmoattachments.org/attachment.cgi?id=9137096
-
-# HG changeset patch
-# User msirringhaus@suse.de
-# Date 1582805876 -3600
-#      Thu Feb 27 13:17:56 2020 +0100
-# Node ID cc3d09abea31068e57f1ab918782f9f86fc6a158
-# Parent  9cd90914846f667f18babc491a74c164ae5d6e9f
-imported patch decoder_workaround.patch
-
-diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp
---- image/decoders/nsGIFDecoder2.cpp	Thu Feb 27 12:57:14 2020 +0100
-+++ image/decoders/nsGIFDecoder2.cpp	Fri Mar 27 13:06:18 2020 +0100
-@@ -422,6 +422,9 @@
-   MOZ_ASSERT(mSwizzleFn);
-   uint8_t* data = reinterpret_cast<uint8_t*>(aColormap);
-   mSwizzleFn(data, data, aColors);
-+#if MOZ_BIG_ENDIAN()
-+  SwizzleRow(SurfaceFormat::A8R8G8B8, SurfaceFormat::B8G8R8A8)(data, data, aColors);
-+#endif
- }
- 
- LexerResult nsGIFDecoder2::DoDecode(SourceBufferIterator& aIterator,
-diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp
---- image/decoders/nsJPEGDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
-+++ image/decoders/nsJPEGDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
-@@ -263,6 +263,9 @@
-         case JCS_YCbCr:
-           // By default, we will output directly to BGRA. If we need to apply
-           // special color transforms, this may change.
-+#if MOZ_BIG_ENDIAN()
-+          mInfo.out_color_space = MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB;
-+#else
-           switch (SurfaceFormat::OS_RGBX) {
-             case SurfaceFormat::B8G8R8X8:
-               mInfo.out_color_space = JCS_EXT_BGRX;
-@@ -277,6 +280,7 @@
-               mState = JPEG_ERROR;
-               return Transition::TerminateFailure();
-           }
-+#endif
-           break;
-         case JCS_CMYK:
-         case JCS_YCCK:
-diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp
---- image/decoders/nsPNGDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
-+++ image/decoders/nsPNGDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
-@@ -361,7 +361,7 @@
-                                    IResumable* aOnResume) {
-   MOZ_ASSERT(!HasError(), "Shouldn't call DoDecode after error!");
- 
--  return mLexer.Lex(aIterator, aOnResume,
-+  LexerResult res = mLexer.Lex(aIterator, aOnResume,
-                     [=](State aState, const char* aData, size_t aLength) {
-                       switch (aState) {
-                         case State::PNG_DATA:
-@@ -371,6 +371,14 @@
-                       }
-                       MOZ_CRASH("Unknown State");
-                     });
-+
-+#if MOZ_BIG_ENDIAN()
-+  if(res.is<TerminalState>() && res.as<TerminalState>() == TerminalState::SUCCESS) {
-+      NativeEndian::swapToLittleEndianInPlace<uint32_t>((uint32_t*)(mImageData), mImageDataLength / 4);
-+  }
-+#endif
-+
-+  return res;
- }
- 
- LexerTransition<nsPNGDecoder::State> nsPNGDecoder::ReadPNGData(
-diff -r 9cd90914846f image/decoders/nsWebPDecoder.cpp
---- image/decoders/nsWebPDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
-+++ image/decoders/nsWebPDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
-@@ -237,7 +237,12 @@
-   // WebP doesn't guarantee that the alpha generated matches the hint in the
-   // header, so we always need to claim the input is BGRA. If the output is
-   // BGRX, swizzling will mask off the alpha channel.
-+#if MOZ_BIG_ENDIAN()
-+  mBuffer.colorspace = MODE_ARGB;
-+  SurfaceFormat inFormat = mFormat;
-+#else
-   SurfaceFormat inFormat = SurfaceFormat::OS_RGBA;
-+#endif
- 
-   SurfacePipeFlags pipeFlags = SurfacePipeFlags();
-   if (mFormat == SurfaceFormat::OS_RGBA &&
diff --git a/srcpkgs/icecat/patches/fix-arm-opus-include.patch b/srcpkgs/icecat/patches/fix-arm-opus-include.patch
deleted file mode 100644
index 6e0c5875da39..000000000000
--- a/srcpkgs/icecat/patches/fix-arm-opus-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/libopus/silk/arm/arm_silk_map.c.orig	2019-03-19 20:55:01.249609964 +0100
-+++ media/libopus/silk/arm/arm_silk_map.c	2019-03-19 20:55:25.769400255 +0100
-@@ -28,7 +28,7 @@
- # include "config.h"
- #endif
-
--#include "main_FIX.h"
-+#include "../fixed/main_FIX.h"
- #include "NSQ.h"
- #include "SigProc_FIX.h"
-
diff --git a/srcpkgs/icecat/patches/fix-cross.patch b/srcpkgs/icecat/patches/fix-cross.patch
deleted file mode 100644
index 9b8a816d269d..000000000000
--- a/srcpkgs/icecat/patches/fix-cross.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-terrible hack to fix cross builds
-overwrite HOST_* flags to get rid of -MF
-
-note: this patch was used from firefox-77 until 80, dropped with the update to 81
-
---- third_party/rust/glslopt/build.rs
-+++ third_party/rust/glslopt/build.rs
-@@ -28,6 +28,8 @@
-     env::remove_var(format!("CXXFLAGS_{}", &target));
-     env::remove_var(format!("CFLAGS_{}", target.replace("-", "_")));
-     env::remove_var(format!("CXXFLAGS_{}", target.replace("-", "_")));
-+    env::set_var("HOST_CFLAGS", "-O2");
-+    env::set_var("HOST_CXXFLAGS", "-O2");
-
-     configure(&mut cc::Build::new())
-         .warnings(false)
diff --git a/srcpkgs/icecat/patches/fix-desktop-icon-path.patch b/srcpkgs/icecat/patches/fix-desktop-icon-path.patch
deleted file mode 100644
index c2c34db5377f..000000000000
--- a/srcpkgs/icecat/patches/fix-desktop-icon-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- taskcluster/docker/icecat-snap/icecat.desktop.orig	2019-01-18 19:31:39.428839442 +0100
-+++ taskcluster/docker/icecat-snap/icecat.desktop	2019-01-18 19:32:20.689063456 +0100
-@@ -154,7 +154,7 @@
- Terminal=false
- X-MultipleArgs=false
- Type=Application
--Icon=/browser/chrome/icons/default/default128.png
-+Icon=icecat
- Categories=GNOME;GTK;Network;WebBrowser;
- MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
- StartupNotify=true
diff --git a/srcpkgs/icecat/patches/fix-fortify-inline.patch b/srcpkgs/icecat/patches/fix-fortify-inline.patch
deleted file mode 100644
index c1190197d329..000000000000
--- a/srcpkgs/icecat/patches/fix-fortify-inline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
-+++ media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
-@@ -27,8 +27,5 @@
- typedef int16_t    int16;
- typedef unsigned short ushort;
- typedef unsigned long  ulong;
--#ifndef __GNUC_STDC_INLINE__
--#define inline
--#endif
- 
- #endif /* _SDP_OS_DEFS_H_ */
diff --git a/srcpkgs/icecat/patches/fix-i686-ppc-musl.patch b/srcpkgs/icecat/patches/fix-i686-ppc-musl.patch
deleted file mode 100644
index 6df609bbf16d..000000000000
--- a/srcpkgs/icecat/patches/fix-i686-ppc-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
-+++ mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
-@@ -41,7 +41,7 @@
- #define MOZ_STACKWALK_SUPPORTS_MACOSX 0
- #endif
- 
--#if (defined(linux) && \
-+#if defined(__GLIBC__) && (defined(linux) && \
-      ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
-       defined(HAVE__UNWIND_BACKTRACE)))
- #define MOZ_STACKWALK_SUPPORTS_LINUX 1
diff --git a/srcpkgs/icecat/patches/fix-image-format-warning.patch b/srcpkgs/icecat/patches/fix-image-format-warning.patch
deleted file mode 100644
index 9b3b38d90653..000000000000
--- a/srcpkgs/icecat/patches/fix-image-format-warning.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-# HG changeset patch
-# User Lee Salzman <lsalzman@mozilla.com>
-# Date 1462463631 14400
-#      Thu May 05 11:53:51 2016 -0400
-# Node ID 8da374804a09977c8f89af5e6e0cb37cb074595d
-# Parent  29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
-handle big-endian formats in Cairo format conversions
-
---- gfx/2d/HelpersCairo.h
-+++ gfx/2d/HelpersCairo.h
-@@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su
-     case SurfaceFormat::R5G6B5_UINT16:
-       return CAIRO_FORMAT_RGB16_565;
-     default:
--      gfxCriticalError() << "Unknown image format " << (int)format;
-+      // _UINT32 formats don't match B8G8R8[AX]8 on big-endian platforms,
-+      // and Moz2d uses B8G8R8[AX]8 as if it was _UINT32.
-+      // See bug 1269654
-+      if (format == SurfaceFormat::B8G8R8X8) {
-+        return CAIRO_FORMAT_RGB24;
-+      } else if (format != SurfaceFormat::B8G8R8A8) {
-+        gfxCriticalError() << "Unknown image format " << (int)format;
-+      }
-       return CAIRO_FORMAT_ARGB32;
-   }
- }
-@@ -177,7 +184,11 @@ static inline cairo_content_t GfxFormatToCairoContent(
-     case SurfaceFormat::A8:
-       return CAIRO_CONTENT_ALPHA;
-     default:
--      gfxCriticalError() << "Unknown image content format " << (int)format;
-+      if (format == SurfaceFormat::B8G8R8X8) {
-+        return CAIRO_CONTENT_COLOR;
-+      } else if (format != SurfaceFormat::B8G8R8A8) {
-+        gfxCriticalError() << "Unknown image content format " << (int)format;
-+      }
-       return CAIRO_CONTENT_COLOR_ALPHA;
-   }
- }
diff --git a/srcpkgs/icecat/patches/fix-tools.patch b/srcpkgs/icecat/patches/fix-tools.patch
deleted file mode 100644
index 1af39bc61186..000000000000
--- a/srcpkgs/icecat/patches/fix-tools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig	2019-01-29 12:09:40.980448579 +0100
-+++ tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:11:09.689590967 +0100
-@@ -497,8 +501,10 @@
- ucontext_t sSyncUContext;
- 
- void Registers::SyncPopulate() {
-+#if defined(__GLIBC__)
-   if (!getcontext(&sSyncUContext)) {
-     PopulateRegsFromContext(*this, &sSyncUContext);
-   }
-+#endif
- }
- #endif
diff --git a/srcpkgs/icecat/patches/fix-wasm-arm.patch b/srcpkgs/icecat/patches/fix-wasm-arm.patch
deleted file mode 100644
index e6ad61c9f442..000000000000
--- a/srcpkgs/icecat/patches/fix-wasm-arm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- js/src/wasm/WasmSignalHandlers.cpp
-+++ js/src/wasm/WasmSignalHandlers.cpp
-@@ -243,9 +243,9 @@
- // If you run into compile problems on a tier-3 platform, you can disable the
- // emulation here.
- 
--#if defined(__linux__) && defined(__arm__)
--#  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
--#endif
-+// #if defined(__linux__) && defined(__arm__)
-+// #  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
-+// #endif
- 
- #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
- #  include <sys/user.h>
diff --git a/srcpkgs/icecat/patches/fix-webrtc-glibcisms.patch b/srcpkgs/icecat/patches/fix-webrtc-glibcisms.patch
deleted file mode 100644
index cf895dd8448b..000000000000
--- a/srcpkgs/icecat/patches/fix-webrtc-glibcisms.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig	2019-01-29 11:20:52.298793223 +0100
-+++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:21:48.250250850 +0100
-@@ -14,7 +14,7 @@
- #ifndef __GLIBC_PREREQ
- #define __GLIBC_PREREQ(a, b) 0
- #endif
--#if __GLIBC_PREREQ(2, 16)
-+#if !__GLIBC__ || __GLIBC_PREREQ(2, 16)
- #include <sys/auxv.h>
- #else
- #include <fcntl.h>
-@@ -32,7 +32,7 @@
-   int architecture = 0;
-   unsigned long hwcap = 0;
-   const char* platform = NULL;
--#if __GLIBC_PREREQ(2, 16)
-+#if !__GLIBC__ || __GLIBC_PREREQ(2, 16)
-   hwcap = getauxval(AT_HWCAP);
-   platform = (const char*)getauxval(AT_PLATFORM);
- #else
diff --git a/srcpkgs/icecat/patches/flac-no-ffvpx.patch b/srcpkgs/icecat/patches/flac-no-ffvpx.patch
deleted file mode 100644
index e3f60e8ecf64..000000000000
--- a/srcpkgs/icecat/patches/flac-no-ffvpx.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Enable FLAC on platforms without ffvpx like powerpc*
-
-diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
-index 53fc3c9937f7..b23771ab80fa 100644
---- dom/media/flac/FlacDecoder.cpp
-+++ dom/media/flac/FlacDecoder.cpp
-@@ -7,6 +7,7 @@
- #include "FlacDecoder.h"
- #include "MediaContainerType.h"
- #include "mozilla/StaticPrefs_media.h"
-+#include "PDMFactory.h"
- 
- namespace mozilla {
- 
-@@ -14,6 +15,11 @@ namespace mozilla {
- bool FlacDecoder::IsEnabled() {
- #ifdef MOZ_FFVPX
-   return StaticPrefs::media_flac_enabled();
-+#elif defined(MOZ_FFMPEG)
-+  RefPtr<PDMFactory> platform = new PDMFactory();
-+  return StaticPrefs::media_flac_enabled() &&
-+         platform->SupportsMimeType("audio/flac"_ns,
-+                                    /* DecoderDoctorDiagnostics* */ nullptr);
- #else
-   // Until bug 1295886 is fixed.
-   return false;
diff --git a/srcpkgs/icecat/patches/mallinfo.patch b/srcpkgs/icecat/patches/mallinfo.patch
deleted file mode 100644
index afea86c0a2ce..000000000000
--- a/srcpkgs/icecat/patches/mallinfo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- xpcom/base/nsMemoryReporterManager.cpp.orig	2019-03-19 17:12:20.844810044 +0100
-+++ xpcom/base/nsMemoryReporterManager.cpp	2019-03-19 17:13:32.505133615 +0100
-@@ -123,6 +123,7 @@
-   return GetProcSelfSmapsPrivate(aN);
- }
- 
-+#ifdef __GLIBC__
- #  ifdef HAVE_MALLINFO
- #    define HAVE_SYSTEM_HEAP_REPORTER 1
- static MOZ_MUST_USE nsresult SystemHeapSize(int64_t* aSizeOut) {
-@@ -142,6 +143,7 @@
-   return NS_OK;
- }
- #  endif
-+#endif // __GLIBC__
- 
- #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
-     defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
-@@ -642,6 +644,7 @@
-   return NS_OK;
- }
- 
-+#ifdef __GLIBC__
- #  define HAVE_SYSTEM_HEAP_REPORTER 1
- // Windows can have multiple separate heaps. During testing there were multiple
- // heaps present but the non-default ones had sizes no more than a few 10s of
-@@ -698,6 +701,7 @@
-   *aSizeOut = heapsSize;
-   return NS_OK;
- }
-+#endif // __GLIBC__
- 
- struct SegmentKind {
-   DWORD mState;
diff --git a/srcpkgs/icecat/patches/musl-rust.configure.patch b/srcpkgs/icecat/patches/musl-rust.configure.patch
deleted file mode 100644
index d8f387136e0f..000000000000
--- a/srcpkgs/icecat/patches/musl-rust.configure.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- build/moz.configure/rust.configure	2019-10-28 12:05:04.930404603 +0700
-+++ build/moz.configure/rust.configure	2019-10-28 12:09:42.742338957 +0700
-@@ -297,11 +297,20 @@
-                     suffix = 'hf'
-                 else:
-                     suffix = ''
-+
-+                narrowed = []
-                 for p in prefixes:
-                     for c in candidates:
--                        if c.rust_target.startswith('{}-'.format(p)) and \
--                                c.rust_target.endswith(suffix):
--                            return c.rust_target
-+                        if c.rust_target.startswith('{}-'.format(p)):
-+                            narrowed.append(c.rust_target)
-+
-+                for target in narrowed:
-+                    if target.endswith(host_or_target.raw_os):
-+                        return target
-+
-+                for target in narrowed:
-+                    if target.endswith(suffix):
-+                        return target
- 
-             # See if we can narrow down on the exact alias
-             narrowed = [c for c in candidates if c.target.alias == host_or_target.alias]
diff --git a/srcpkgs/icecat/patches/ppc32-fix-build.patch b/srcpkgs/icecat/patches/ppc32-fix-build.patch
deleted file mode 100644
index c1a8f422d0a9..000000000000
--- a/srcpkgs/icecat/patches/ppc32-fix-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-This is not a complete/correct patch, but it makes firefox build. For now
-mostly for tracking, so a real fix can be made, but right now it still
-segfaults on start.
-
-Ref: https://hg.mozilla.org/mozilla-central/rev/08339a56f3ae
-Ref: https://hg.mozilla.org/mozilla-central/rev/d16fcad6aa60
-Ref: https://hg.mozilla.org/mozilla-central/rev/ab87611d012e
-Ref: https://hg.mozilla.org/mozilla-central/file/tip/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp
-
---- xpcom/reflect/xptcall/xptcall.h
-+++ xpcom/reflect/xptcall/xptcall.h
-@@ -71,6 +71,11 @@ struct nsXPTCVariant {
-     ExtendedVal ext;
-   };
- 
-+#if defined(__powerpc__) && !defined(__powerpc64__)
-+  // this field is still necessary on ppc32, as an address
-+  // to it is taken certain places in xptcall
-+  void *ptr;
-+#endif
-   nsXPTType type;
-   uint8_t flags;
- 
-@@ -91,7 +96,12 @@ struct nsXPTCVariant {
-   };
- 
-   void ClearFlags() { flags = 0; }
-+#if defined(__powerpc__) && !defined(__powerpc64__)
-+  void SetIndirect() { ptr = &val; flags |= IS_INDIRECT; }
-+  bool IsPtrData() const { return IsIndirect(); }
-+#else
-   void SetIndirect() { flags |= IS_INDIRECT; }
-+#endif
- 
-   bool IsIndirect() const { return 0 != (flags & IS_INDIRECT); }
- 
diff --git a/srcpkgs/icecat/patches/rust-configure.patch b/srcpkgs/icecat/patches/rust-configure.patch
deleted file mode 100644
index 887c102bc55a..000000000000
--- a/srcpkgs/icecat/patches/rust-configure.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Mozilla rustc check does not support crossbuild: let's remove it
-Remove calls to unwrap_rustup, they fail if rustup isn't present
-
---- build/moz.configure/rust.configure.orig	2019-10-17 04:19:59.000000000 +0700
-+++ build/moz.configure/rust.configure	2019-10-22 11:48:55.616022140 +0700
-@@ -78,9 +78,6 @@
- 
-     return unwrap
- 
--rustc = unwrap_rustup(rustc, 'rustc')
--cargo = unwrap_rustup(cargo, 'cargo')
--
- 
- set_config('CARGO', cargo)
- set_config('RUSTC', rustc)
-@@ -348,26 +345,6 @@
- 
-             os.write(in_fd, source)
-             os.close(in_fd)
--
--            cmd = [
--                rustc,
--                '--crate-type', 'staticlib',
--                target_arg,
--                '-o', out_path,
--                in_path,
--            ]
--
--            def failed():
--                die(dedent('''\
--                Cannot compile for {} with {}
--                The target may be unsupported, or you may not have
--                a rust std library for that target installed. Try:
--
--                  rustup target add {}
--                '''.format(host_or_target.alias, rustc, rustc_target)))
--            check_cmd_output(*cmd, onerror=failed)
--            if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
--                failed()
-         finally:
-             os.remove(in_path)
-             os.remove(out_path)
diff --git a/srcpkgs/icecat/patches/rust-has-i128.patch b/srcpkgs/icecat/patches/rust-has-i128.patch
deleted file mode 100644
index 4c90cd3d1061..000000000000
--- a/srcpkgs/icecat/patches/rust-has-i128.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-The configure check fails for cross builds.
-i128 is supported since rust-1.26, so it is safe for us to assume it is always present
-
---- third_party/rust/num-traits/build.rs.orig	2020-02-14 23:57:25.985355610 +0100
-+++ third_party/rust/num-traits/build.rs	2020-02-14 23:58:36.255710188 +0100
-@@ -1,14 +1,5 @@
--extern crate autocfg;
--
--use std::env;
--
- fn main() {
--    let ac = autocfg::new();
--    if ac.probe_type("i128") {
--        println!("cargo:rustc-cfg=has_i128");
--    } else if env::var_os("CARGO_FEATURE_I128").is_some() {
--        panic!("i128 support was not detected!");
--    }
-+    println!("cargo:rustc-cfg=has_i128");
- 
-     autocfg::rerun_path("build.rs");
- }
diff --git a/srcpkgs/icecat/patches/sandbox-fork.patch b/srcpkgs/icecat/patches/sandbox-fork.patch
deleted file mode 100644
index 72640cb7f705..000000000000
--- a/srcpkgs/icecat/patches/sandbox-fork.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-make SYS_fork non-fatal, musl uses it for fork(2)
-
---- security/sandbox/linux/SandboxFilter.cpp
-+++ security/sandbox/linux/SandboxFilter.cpp
-@@ -1253,6 +1253,8 @@
-         // usually do something reasonable on error.
-       case __NR_clone:
-         return ClonePolicy(Error(EPERM));
-+      case __NR_fork:
-+        return Error(ENOSYS);
- 
- #  ifdef __NR_fadvise64
-       case __NR_fadvise64:
diff --git a/srcpkgs/icecat/patches/sandbox-largefile.patch b/srcpkgs/icecat/patches/sandbox-largefile.patch
deleted file mode 100644
index 494ca82df5ac..000000000000
--- a/srcpkgs/icecat/patches/sandbox-largefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- security/sandbox/linux/SandboxFilter.cpp	2020-11-23 22:41:14.556378950 +0100
-+++ security/sandbox/linux/SandboxFilter.cpp	2020-11-23 22:40:23.595806444 +0100
-@@ -68,7 +68,13 @@
- 
- // The headers define O_LARGEFILE as 0 on x86_64, but we need the
- // actual value because it shows up in file flags.
--#define O_LARGEFILE_REAL 00100000
-+#if defined(__x86_64__) || defined(__i386__) || defined(__mips__)
-+#define O_LARGEFILE_REAL 0100000
-+#elif defined(__powerpc__)
-+#define O_LARGEFILE_REAL 0200000
-+#else
-+#define O_LARGEFILE_REAL O_LARGEFILE
-+#endif
- 
- // Not part of UAPI, but userspace sees it in F_GETFL; see bug 1650751.
- #define FMODE_NONOTIFY 0x4000000
diff --git a/srcpkgs/icecat/patches/skia-sucks1.patch b/srcpkgs/icecat/patches/skia-sucks1.patch
deleted file mode 100644
index 05ad34a3fc38..000000000000
--- a/srcpkgs/icecat/patches/skia-sucks1.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c5
-https://bugzilla.mozilla.org/attachment.cgi?id=9028600
-
---- gfx/skia/skia/third_party/skcms/skcms.cc
-+++ gfx/skia/skia/third_party/skcms/skcms.cc
-@@ -30,6 +30,8 @@
-         #include <avx512fintrin.h>
-         #include <avx512dqintrin.h>
-     #endif
-+#elif defined(__BIG_ENDIAN__)
-+    #define SKCMS_PORTABLE
- #endif
- 
- // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.
-@@ -280,20 +282,28 @@ enum {
- static uint16_t read_big_u16(const uint8_t* ptr) {
-     uint16_t be;
-     memcpy(&be, ptr, sizeof(be));
--#if defined(_MSC_VER)
--    return _byteswap_ushort(be);
-+#if defined(__BIG_ENDIAN__)
-+    return be;
- #else
-+    #if defined(_MSC_VER)
-+    return _byteswap_ushort(be);
-+    #else
-     return __builtin_bswap16(be);
-+    #endif
- #endif
- }
- 
- static uint32_t read_big_u32(const uint8_t* ptr) {
-     uint32_t be;
-     memcpy(&be, ptr, sizeof(be));
--#if defined(_MSC_VER)
--    return _byteswap_ulong(be);
-+#if defined(__BIG_ENDIAN__)
-+    return be;
- #else
-+    #if defined(_MSC_VER)
-+    return _byteswap_ulong(be);
-+    #else
-     return __builtin_bswap32(be);
-+    #endif
- #endif
- }
- 
---- gfx/2d/DrawTargetSkia.cpp
-+++ gfx/2d/DrawTargetSkia.cpp
-@@ -138,8 +138,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& a
-   return surfaceBounds.Intersect(bounds);
- }
- 
--static const int kARGBAlphaOffset =
--    SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
-+static const int kARGBAlphaOffset = 0;
- 
- static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
-                              const int32_t aStride, SurfaceFormat aFormat) {
---- gfx/2d/Types.h
-+++ gfx/2d/Types.h
-@@ -87,15 +87,8 @@ enum class SurfaceFormat : int8_t {
- // The following values are endian-independent synonyms. The _UINT32 suffix
- // indicates that the name reflects the layout when viewed as a uint32_t
- // value.
--#if MOZ_LITTLE_ENDIAN()
-   A8R8G8B8_UINT32 = B8G8R8A8,  // 0xAARRGGBB
-   X8R8G8B8_UINT32 = B8G8R8X8,  // 0x00RRGGBB
--#elif MOZ_BIG_ENDIAN()
--  A8R8G8B8_UINT32 = A8R8G8B8,  // 0xAARRGGBB
--  X8R8G8B8_UINT32 = X8R8G8B8,  // 0x00RRGGBB
--#else
--#  error "bad endianness"
--#endif
- 
-   // The following values are OS and endian-independent synonyms.
-   //
diff --git a/srcpkgs/icecat/patches/skia-sucks2.patch b/srcpkgs/icecat/patches/skia-sucks2.patch
deleted file mode 100644
index 207b3cf67334..000000000000
--- a/srcpkgs/icecat/patches/skia-sucks2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-# HG changeset patch
-# Parent  aecb4600e5da17443b224c79eee178c1d8e155e3
-For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the
-right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white).
-
-diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h
---- gfx/skia/skia/include/private/SkNx.h	Tue Aug 20 09:46:55 2019 +0200
-+++ gfx/skia/skia/include/private/SkNx.h	Mon Sep 09 10:04:06 2019 +0200
-@@ -238,7 +238,18 @@
-     AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; }
-     AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; }
- 
-+    // On Big endian the commented out variant doesn't work,
-+    // and honestly, I have no idea why it exists in the first place.
-+    // The reason its broken is, I think, that it defaults to the double-variant of ToBits()
-+    // which gets a 64-bit integer, and FromBits returns 32-bit,
-+    // cutting off the wrong half again.
-+    // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles).
-+    // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system)
-+#ifdef SK_CPU_BENDIAN
-+    AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; }
-+#else
-     AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); }
-+#endif
-     AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); }
-     AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); }
- 
-diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h
---- gfx/skia/skia/src/opts/SkBlitMask_opts.h	Tue Aug 20 09:46:55 2019 +0200
-+++ gfx/skia/skia/src/opts/SkBlitMask_opts.h	Mon Sep 09 10:04:06 2019 +0200
-@@ -203,7 +203,13 @@
-             //   ~~~>
-             // a = 1*aa + d(1-1*aa) = aa + d(1-aa)
-             // c = 0*aa + d(1-1*aa) =      d(1-aa)
-+
-+            // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0
-+#ifdef SK_CPU_BENDIAN
-+            return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0))
-+#else
-             return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255))
-+#endif
-                  + d.approxMulDiv255(aa.inv());
-         };
-         while (h --> 0) {
diff --git a/srcpkgs/icecat/patches/skia-sucks3.patch b/srcpkgs/icecat/patches/skia-sucks3.patch
deleted file mode 100644
index f4e890f0536c..000000000000
--- a/srcpkgs/icecat/patches/skia-sucks3.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-CompositableHost.cpp patch added by @q66, based on patch in issue 1602730.
-
-# HG changeset patch
-# Parent  46ea866ca3acb8bb5e1709ceb799b9c94f591dec
-Problem description: Tab-titles that are too long to fit into a tab get faded out.
-                     On big endian this is broken and instead of fading out, the 
-                     tab gets white and the font transparent, leading to an unreadable
-                     tab-title
-Solution: This is not a real solution, but a hack. The real solution would have been
-          to byte-swap the correct buffer, but I could not find it.
-          So the next best thing is to deactivate the fading-effect. Now all tab-titles
-          are readable, albeit not as pretty to look at as they could be. 
-Side-effects: I have not yet found an unwanted side-effect.
-
-diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
---- gfx/2d/DrawTargetSkia.cpp	Tue Oct 22 12:27:22 2019 +0200
-+++ gfx/2d/DrawTargetSkia.cpp	Thu Oct 31 09:11:56 2019 +0100
-@@ -1861,6 +1861,14 @@
-       SkCanvas::kPreserveLCDText_SaveLayerFlag |
-           (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0));
- 
-+#if MOZ_BIG_ENDIAN()
-+  // Pushing a layer where an aMask is defined produces wrong output.
-+  // We _should_ endian swap the data, but I couldn't find a workable way to do so
-+  // Therefore I deactivate those layers in the meantime.
-+  // The result is: Tab-titles that are longer than the available space should be faded out.
-+  //                The fading doesn't work, so we deactivate the fading-effect here.
-+  if (!aMask)
-+#endif
-   mCanvas->saveLayer(saveRec);
- 
-   SetPermitSubpixelAA(aOpaque);
---- gfx/layers/composite/CompositableHost.cpp
-+++ gfx/layers/composite/CompositableHost.cpp
-@@ -13,6 +13,7 @@
- #include "ImageHost.h"  // for ImageHostBuffered, etc
- #include "Layers.h"
- #include "TiledContentHost.h"  // for TiledContentHost
-+#include "mozilla/EndianUtils.h"
- #include "mozilla/gfx/gfxVars.h"
- #include "mozilla/layers/LayersSurfaces.h"  // for SurfaceDescriptor
- #include "mozilla/layers/TextureHost.h"     // for TextureHost, etc
-@@ -92,9 +93,13 @@ bool CompositableHost::AddMaskEffect(EffectChain& aEffects,
-   }
-   MOZ_ASSERT(source);
- 
-+  // Setting an alpha-mask here breaks the URL-bar on big endian (s390x)
-+  // if the typed URL is too long for the textbox (automatic scrolling needed)
-+#if MOZ_LITTLE_ENDIAN()
-   RefPtr<EffectMask> effect =
-       new EffectMask(source, source->GetSize(), aTransform);
-   aEffects.mSecondaryEffects[EffectTypes::MASK] = effect;
-+#endif
-   return true;
- }
- 
diff --git a/srcpkgs/icecat/patches/sndio.patch b/srcpkgs/icecat/patches/sndio.patch
deleted file mode 100644
index c5e5c486dd1c..000000000000
--- a/srcpkgs/icecat/patches/sndio.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- old-configure.in.orig
-+++ old-configure.in
-@@ -2818,6 +2818,22 @@
-     _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES"
- fi
- 
-+dnl ==================================
-+dnl = Check sndio availability
-+dnl ==================================
-+
-+MOZ_ARG_ENABLE_BOOL(sndio,
-+[  --enable-sndio         Enable sndio support],
-+   MOZ_SNDIO=1,
-+   MOZ_SNDIO=)
-+
-+if test -n "$MOZ_SNDIO"; then
-+    MOZ_SNDIO_LIBS="-lsndio"
-+    AC_SUBST_LIST(MOZ_SNDIO_LIBS)
-+fi
-+
-+AC_SUBST(MOZ_SNDIO)
-+
- dnl ========================================================
- dnl =
- dnl = Maintainer debug option (no --enable equivalent)
---- media/libcubeb/src/moz.build.orig
-+++ media/libcubeb/src/moz.build
-@@ -44,11 +44,13 @@
-     ]
-     DEFINES['USE_JACK'] = True
- 
--if CONFIG['OS_ARCH'] == 'OpenBSD':
-+if CONFIG['MOZ_SNDIO']:
-     SOURCES += [
-         'cubeb_sndio.c',
-     ]
-     DEFINES['USE_SNDIO'] = True
-+
-+if CONFIG['OS_ARCH'] == 'OpenBSD':
-     DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True
- 
- if CONFIG['OS_TARGET'] == 'Darwin':
---- build/moz.configure/old.configure	2020-06-30 12:17:04.087609070 +0200
-+++ -	2020-06-30 12:18:26.027756310 +0200
-@@ -210,6 +210,7 @@
- @old_configure_options(
-     '--cache-file',
-     '--datadir',
-+    '--enable-sndio',
-     '--enable-crashreporter',
-     '--enable-dbus',
-     '--enable-debug-js-modules',
diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template
deleted file mode 100644
index 450250fe7fdc..000000000000
--- a/srcpkgs/icecat/template
+++ /dev/null
@@ -1,951 +0,0 @@
-# Template file for 'icecat'
-pkgname=icecat
-version=78.6.1
-revision=1
-build_helper="rust qemu"
-hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
- llvm clang nodejs-lts-10 cbindgen python nasm which tar"
-makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
- pixman-devel libevent-devel libnotify-devel libvpx-devel
- libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std
- libXdamage-devel freetype-devel $(vopt_if alsa alsa-lib-devel)
- $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel)
- $(vopt_if xscreensaver libXScrnSaver-devel)
- $(vopt_if sndio sndio-devel) $(vopt_if jack jack-devel)"
-depends="nss>=3.53 desktop-file-utils hicolor-icon-theme"
-short_desc="GNU version of the Firefox browser"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="MPL-1.1, GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://www.gnu.org/software/${pkgname}/"
-distfiles="https://distfiles.voidlinux.de/${pkgname}-${version}/${pkgname}-${version}-gnu1.tar.xz"
-checksum=2e4857523a465b39206aa3438e8c799610852ca95c93ae4cb4eb128cd4a28235
-lib32disabled=yes
-
-build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland"
-build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
-
-case $XBPS_TARGET_MACHINE in
-	armv[56]*) broken="required NEON extensions are not supported on armv[56]" ;;
-	ppc64*) ;;
-	ppc*) broken="xptcall bitrot" ;;
-esac
-
-CXXFLAGS="-Wno-class-memaccess -Wno-unused-function"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-fi
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
-
-# We need this because cargo verifies checksums of all files
-# in vendor crates when it builds and gives us no way to
-# override or update the file sanely... so just clear out the file list
-_clear_vendor_checksums() {
-	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
-}
-
-# Function to install a language pack
-# FIXME: The *.xpi files have to be signed to be accepted as plugins
-#        yet how do you sign a package if you don't have a signing key?
-_install_langpack() {
-	local lang=$1
-	local tempdir="$(ls -d ${wrksrc}/obj-*/dist/linux-*/xpi|head -n1)"
-	vinstall "${tempdir}"/${sourcepkg}-${version}.${lang}.langpack.xpi \
-		644 usr/lib/icecat/browser/extensions
-}
-
-post_extract() {
-	if [ "$XBPS_TARGET_LIBC" = musl ]; then
-		cp "${FILESDIR}/stab.h" toolkit/crashreporter/google-breakpad/src/
-	fi
-}
-
-post_patch() {
-	_clear_vendor_checksums num-traits
-	_clear_vendor_checksums glslopt
-}
-
-do_build() {
-	local lang languages="en-US $(cat browser/locales/all-locales)"
-	local triplet
-
-	cp ${FILESDIR}/mozconfig .mozconfig
-
-	if [ "$XBPS_TARGET_LIBC" = musl ]; then
-		echo "ac_add_options --disable-jemalloc" >>.mozconfig
-		echo "ac_add_options --disable-gold" >>.mozconfig
-		echo "ac_add_options --enable-release" >>.mozconfig
-	fi
-
-	case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*|arm*)
-		echo "ac_add_options --disable-elf-hack" >>.mozconfig
-		;;
-	esac
-
-	# webrtc currently fails to build on 32-bit ppc...
-	case "$XBPS_TARGET_MACHINE" in
-	ppc64*) ;;
-	ppc*) echo "ac_add_options --disable-webrtc" >>.mozconfig ;;
-	esac
-
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		export LDFLAGS+=" -latomic"
-	fi
-
-	if [ "$CROSS_BUILD" ]; then
-		BINDGEN_INCLUDE_FLAGS=$( $CPP -x c++ -v /dev/null -o /dev/null 2>&1 | \
-			sed -n '/#include <...> search starts here:/,/End of search list./p' | \
-			sed '1,1d;$d' | sed  's/^ /-I/' | paste -s )
-
-		export BINDGEN_CFLAGS="--target=$XBPS_CROSS_TRIPLET \
-			--sysroot=${XBPS_CROSS_BASE} ${BINDGEN_INCLUDE_FLAGS}"
-		export HOST_CC="${CC_host}"
-		export TARGET_CC="${CC}"
-		export HOST_CFLAGS="${XBPS_CFLAGS}"
-		export HOST_CXXFLAGS="${XBPS_CXXFLAGS}"
-		echo "ac_cv_sqlite_secure_delete=yes" >> .mozconfig
-		echo "ac_cv_sqlite_threadsafe=yes" >> .mozconfig
-		echo "ac_cv_sqlite_enable_fts3=yes" >> .mozconfig
-		echo "ac_cv_sqlite_dbstat_vtab=yes" >> .mozconfig
-		echo "ac_cv_sqlite_enable_unlock_notify=yes" >> .mozconfig
-		echo "ac_cv_prog_hostcxx_works=1" >> .mozconfig
-		echo "ac_add_options --target=$XBPS_CROSS_TRIPLET" >>.mozconfig
-		echo "ac_add_options --host=$XBPS_TRIPLET" >>.mozconfig
-	else
-		echo "ac_add_options --target=$XBPS_TRIPLET" >>.mozconfig
-		echo "ac_add_options --host=$XBPS_TRIPLET" >>.mozconfig
-	fi
-
-	mkdir -p third_party/rust/libloading/.deps
-
-	case "$XBPS_TARGET_MACHINE" in
-	armv7*)
-		export CFLAGS+=" -mfpu=neon -Wno-psabi"
-		export CXXFLAGS+=" -mfpu=neon -Wno-psabi"
-		;;
-	esac
-
-	# work around large debug symbols on 32-bit hosts
-	if [ "$XBPS_WORDSIZE" = "32" ]; then
-		export CFLAGS="${CFLAGS/-g/-g1}"
-		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
-		export LDFLAGS+=" -Wl,--no-keep-memory"
-		# patch the rust debug level, this is hardcoded
-		sed -i "s/debug_info = '2'/debug_info = '1'/" \
-		build/moz.configure/toolchain.configure
-	fi
-
-	# FIXME: incompatible with rust 1.48 in this release
-	#case "$XBPS_TARGET_MACHINE" in
-	#aarch64*|i686*|x86_64*)
-	#	echo "ac_add_options --enable-rust-simd" >>.mozconfig ;;
-	#esac
-
-	export LDFLAGS+=" -Wl,-rpath=/usr/lib/icecat"
-
-	if [ "$SOURCE_DATE_EPOCH" ]; then
-		export MOZ_BUILD_DATE=$(date --date "@$SOURCE_DATE_EPOCH" "+%Y%m%d%H%M%S")
-	fi
-
-	export MOZ_MAKE_FLAGS="${makejobs}"
-	export MOZ_NOSPAM=1
-	export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
-	export MACH_USE_SYSTEM_PYTHON=1
-
-	export AS=$CC
-
-	cat >>.mozconfig <<EOF
-ac_add_options $(vopt_enable alsa)
-ac_add_options $(vopt_enable jack)
-ac_add_options $(vopt_enable sndio)
-ac_add_options $(vopt_enable dbus)
-ac_add_options $(vopt_enable dbus necko-wifi)
-ac_add_options $(vopt_enable pulseaudio)
-ac_add_options --with-l10n-base=${wrksrc}/l10n
-ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' 'cairo-gtk3')
-EOF
-	rm -f old-configure
-	./mach build
-
-	# Make langpacks for all languages
-	dir=$(ls -d obj-*/browser/locales)
-	cd ${wrksrc}/${dir}
-	for lang in ${languages[*]}; do
-		msg_normal "Making langpack for ${lang} ...\n"
-		make ${makejobs} langpack-${lang} LOCALE_MERGEDIR=.
-	done
-}
-
-do_install() {
-	export MACH_USE_SYSTEM_PYTHON=1
-	DESTDIR="$DESTDIR" ./mach install
-
-	vbin ${FILESDIR}/icecat-wayland
-	vinstall ${FILESDIR}/vendor.js 644 usr/lib/icecat/browser/defaults/preferences
-	vinstall ${FILESDIR}/icecat.desktop 644 usr/share/applications
-
-	for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-		vinstall ${wrksrc}/browser/branding/official/default${i%x*}.png 644 \
-			usr/share/icons/hicolor/${i}/apps icecat.png
-	done
-	vinstall ${wrksrc}/browser/branding/official/default256.png 644 \
-		usr/share/pixmaps icecat.png
-
-	# Use system-provided dictionaries
-	rm -rf ${DESTDIR}/usr/lib/icecat/{dictionaries,hyphenation}
-	ln -s /usr/share/hunspell ${DESTDIR}/usr/lib/icecat/dictionaries
-	ln -s /usr/share/hyphen ${DESTDIR}/usr/lib/icecat/hyphenation
-
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-	ln -sf icecat ${DESTDIR}/usr/lib/icecat/icecat-bin
-
-	# Remove the development files - noone uses them
-	rm -rf ${DESTDIR}/usr/{include,lib/icecat-devel,share/idl}
-}
-
-icecat-i18n-ach_package() {
-	short_desc+=" - Acholi language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-af_package() {
-	short_desc+=" - Afrikaans language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-an_package() {
-	short_desc+=" - Aragonese language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-ar_package() {
-	short_desc+=" - Arabic language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-ast_package() {
-	short_desc+=" - Asturian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-az_package() {
-	short_desc+=" - Azerbaijani language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-be_package() {
-	short_desc+=" - Belarusian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-bg_package() {
-	short_desc+=" - Bulgarian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-bn_package() {
-	short_desc+=" - Bengali language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-br_package() {
-	short_desc+=" - Breton language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-bs_package() {
-	short_desc+=" - Bosnian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-ca_package() {
-	short_desc+=" - Catalan language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-cak_package() {
-	short_desc+=" - Kaqchikel language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-cs_package() {
-	short_desc+=" - Czech language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-cy_package() {
-	short_desc+=" - Welsh language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-da_package() {
-	short_desc+=" - Danish language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-de_package() {
-	short_desc+=" - German language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-dsb_package() {
-	short_desc+=" - Lower Sorbian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-el_package() {
-	short_desc+=" - Greek language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-en-CA_package() {
-	short_desc+=" - English (Canada) language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-en-GB_package() {
-	short_desc+=" - English (British) language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-en-US_package() {
-	short_desc+=" - English (US) language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-eo_package() {
-	short_desc+=" - Esperanto language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-es-AR_package() {
-	short_desc+=" - Spanish (Argentina) language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-es-CL_package() {
-	short_desc+=" - Spanish (Chile) language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-es-ES_package() {
-	short_desc+=" - Spanish (Spain) language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-es-MX_package() {
-	short_desc+=" - Spanish (Mexico) language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-et_package() {
-	short_desc+=" - Estonian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-eu_package() {
-	short_desc+=" - Basque language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-fa_package() {
-	short_desc+=" - Persian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-ff_package() {
-	short_desc+=" - Fulah language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-fi_package() {
-	short_desc+=" - Finnish language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-fr_package() {
-	short_desc+=" - French language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-fy-NL_package() {
-	short_desc+=" - Frisian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-ga-IE_package() {
-	short_desc+=" - Irish language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-gd_package() {
-	short_desc+=" - Gaelic (Scotland) language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-gl_package() {
-	short_desc+=" - Galician language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-gn_package() {
-	short_desc+=" - Guarani language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-gu-IN_package() {
-	short_desc+=" - Gujarati (India) language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-he_package() {
-	short_desc+=" - Hebrew language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-hi-IN_package() {
-	short_desc+=" - Hindi (India) language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-hr_package() {
-	short_desc+=" - Croatian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-hsb_package() {
-	short_desc+=" - Upper Sorbian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-hu_package() {
-	short_desc+=" - Hungarian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-hy-AM_package() {
-	short_desc+=" - Armenian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-ia_package() {
-	short_desc+=" - Interlingua language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-id_package() {
-	short_desc+=" - Indonesian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-is_package() {
-	short_desc+=" - Icelandic language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-it_package() {
-	short_desc+=" - Italian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-ja_package() {
-	short_desc+=" - Japanese language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-ka_package() {
-	short_desc+=" - Georgian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-kab_package() {
-	short_desc+=" - Kabyle language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-kk_package() {
-	short_desc+=" - Kazakh language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-km_package() {
-	short_desc+=" - Khmer language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-kn_package() {
-	short_desc+=" - Kannada language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-ko_package() {
-	short_desc+=" - Korean language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-lij_package() {
-	short_desc+=" - Ligurian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-lt_package() {
-	short_desc+=" - Lithuanian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-lv_package() {
-	short_desc+=" - Latvian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-mk_package() {
-	short_desc+=" - Macedonian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-mr_package() {
-	short_desc+=" - Marathi language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-ms_package() {
-	short_desc+=" - Malay language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-my_package() {
-	short_desc+=" - Burmese language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-nb-NO_package() {
-	short_desc+=" - Norwegian (Bokmål) language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-ne-NP_package() {
-	short_desc+=" - Nepali language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-nl_package() {
-	short_desc+=" - Dutch language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-nn-NO_package() {
-	short_desc+=" - Norwegian (Nynorsk) language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-oc_package() {
-	short_desc+=" - Occitan language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-pa-IN_package() {
-	short_desc+=" - Punjabi language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-pl_package() {
-	short_desc+=" - Polish language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-pt-BR_package() {
-	short_desc+=" - Portuguese (Brazilian) language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-pt-PT_package() {
-	short_desc+=" - Portuguese (Portugal) language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-rm_package() {
-	short_desc+=" - Romansh language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-ro_package() {
-	short_desc+=" - Romanian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-ru_package() {
-	short_desc+=" - Russian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-si_package() {
-	short_desc+=" - Sinhala language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-sk_package() {
-	short_desc+=" - Slovak language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-sl_package() {
-	short_desc+=" - Slovenian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-son_package() {
-	short_desc+=" - Songhai language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-sq_package() {
-	short_desc+=" - Albanian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-sr_package() {
-	short_desc+=" - Serbian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-sv-SE_package() {
-	short_desc+=" - Swedish language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-ta_package() {
-	short_desc+=" - Tamil language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-te_package() {
-	short_desc+=" - Telugu language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-th_package() {
-	short_desc+=" - Thai language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-tr_package() {
-	short_desc+=" - Turkish language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-uk_package() {
-	short_desc+=" - Ukrainian language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-ur_package() {
-	short_desc+=" - Urdu language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-uz_package() {
-	short_desc+=" - Uzbek language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-vi_package() {
-	short_desc+=" - Vietnamese language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-xh_package() {
-	short_desc+=" - Xhosa language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-zh-CN_package() {
-	short_desc+=" - Chinese (simplified) language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
-
-icecat-i18n-zh-TW_package() {
-	short_desc+=" - Chinese (traditional) language files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		_install_langpack ${pkgname#icecat-i18n-}
-	}
-}
diff --git a/srcpkgs/icecat/update b/srcpkgs/icecat/update
deleted file mode 100644
index 9bed5c29c8de..000000000000
--- a/srcpkgs/icecat/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://ftp.gnu.org/gnu/gnuzilla/
-pattern="\K[\d]+\.[\d]+\.[\d]+"

From a08059eac1d702ec6cb4201c8d73a84c4938ec80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 27 Jan 2021 18:49:36 +0100
Subject: [PATCH 0590/3482] removed-packages: add icecat

---
 srcpkgs/removed-packages/template | 94 +++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9286101886af..dd48bbd92d28 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -37,6 +37,100 @@ replaces="
  gtkhtml-devel<=4.10.0_1
  libgtkhtml<=4.10.0_1
  httperf<=0.9.0_9
+ icecat<=78.6.1_1
+ icecat-i18n-ach<=78.6.1_1
+ icecat-i18n-af<=78.6.1_1
+ icecat-i18n-an<=78.6.1_1
+ icecat-i18n-ar<=78.6.1_1
+ icecat-i18n-ast<=78.6.1_1
+ icecat-i18n-az<=78.6.1_1
+ icecat-i18n-be<=78.6.1_1
+ icecat-i18n-bg<=78.6.1_1
+ icecat-i18n-bn<=78.6.1_1
+ icecat-i18n-br<=78.6.1_1
+ icecat-i18n-bs<=78.6.1_1
+ icecat-i18n-ca<=78.6.1_1
+ icecat-i18n-cak<=78.6.1_1
+ icecat-i18n-cs<=78.6.1_1
+ icecat-i18n-cy<=78.6.1_1
+ icecat-i18n-da<=78.6.1_1
+ icecat-i18n-de<=78.6.1_1
+ icecat-i18n-dsb<=78.6.1_1
+ icecat-i18n-el<=78.6.1_1
+ icecat-i18n-en-CA<=78.6.1_1
+ icecat-i18n-en-GB<=78.6.1_1
+ icecat-i18n-en-US<=78.6.1_1
+ icecat-i18n-eo<=78.6.1_1
+ icecat-i18n-es-AR<=78.6.1_1
+ icecat-i18n-es-CL<=78.6.1_1
+ icecat-i18n-es-ES<=78.6.1_1
+ icecat-i18n-es-MX<=78.6.1_1
+ icecat-i18n-et<=78.6.1_1
+ icecat-i18n-eu<=78.6.1_1
+ icecat-i18n-fa<=78.6.1_1
+ icecat-i18n-ff<=78.6.1_1
+ icecat-i18n-fi<=78.6.1_1
+ icecat-i18n-fr<=78.6.1_1
+ icecat-i18n-fy-NL<=78.6.1_1
+ icecat-i18n-ga-IE<=78.6.1_1
+ icecat-i18n-gd<=78.6.1_1
+ icecat-i18n-gl<=78.6.1_1
+ icecat-i18n-gn<=78.6.1_1
+ icecat-i18n-gu<=IN-78.6.1_1
+ icecat-i18n-he<=78.6.1_1
+ icecat-i18n-hi<=IN-78.6.1_1
+ icecat-i18n-hr<=78.6.1_1
+ icecat-i18n-hsb<=78.6.1_1
+ icecat-i18n-hu<=78.6.1_1
+ icecat-i18n-hy-AM<=78.6.1_1
+ icecat-i18n-ia<=78.6.1_1
+ icecat-i18n-id<=78.6.1_1
+ icecat-i18n-is<=78.6.1_1
+ icecat-i18n-it<=78.6.1_1
+ icecat-i18n-ja<=78.6.1_1
+ icecat-i18n-ka<=78.6.1_1
+ icecat-i18n-kab<=78.6.1_1
+ icecat-i18n-kk<=78.6.1_1
+ icecat-i18n-km<=78.6.1_1
+ icecat-i18n-kn<=78.6.1_1
+ icecat-i18n-ko<=78.6.1_1
+ icecat-i18n-lij<=78.6.1_1
+ icecat-i18n-lt<=78.6.1_1
+ icecat-i18n-lv<=78.6.1_1
+ icecat-i18n-mk<=78.6.1_1
+ icecat-i18n-mr<=78.6.1_1
+ icecat-i18n-ms<=78.6.1_1
+ icecat-i18n-my<=78.6.1_1
+ icecat-i18n-nb-NO<=78.6.1_1
+ icecat-i18n-ne-NP<=78.6.1_1
+ icecat-i18n-nl<=78.6.1_1
+ icecat-i18n-nn-NO<=78.6.1_1
+ icecat-i18n-oc<=78.6.1_1
+ icecat-i18n-pa-IN<=78.6.1_1
+ icecat-i18n-pl<=78.6.1_1
+ icecat-i18n-pt-BR<=78.6.1_1
+ icecat-i18n-pt-PT<=78.6.1_1
+ icecat-i18n-rm<=78.6.1_1
+ icecat-i18n-ro<=78.6.1_1
+ icecat-i18n-ru<=78.6.1_1
+ icecat-i18n-si<=78.6.1_1
+ icecat-i18n-sk<=78.6.1_1
+ icecat-i18n-sl<=78.6.1_1
+ icecat-i18n-son<=78.6.1_1
+ icecat-i18n-sq<=78.6.1_1
+ icecat-i18n-sr<=78.6.1_1
+ icecat-i18n-sv<=SE-78.6.1_1
+ icecat-i18n-ta<=78.6.1_1
+ icecat-i18n-te<=78.6.1_1
+ icecat-i18n-th<=78.6.1_1
+ icecat-i18n-tr<=78.6.1_1
+ icecat-i18n-uk<=78.6.1_1
+ icecat-i18n-ur<=78.6.1_1
+ icecat-i18n-uz<=78.6.1_1
+ icecat-i18n-vi<=78.6.1_1
+ icecat-i18n-xh<=78.6.1_1
+ icecat-i18n-zh-CN<=78.6.1_1
+ icecat-i18n-zh-TW<=78.6.1_1
  isl16<=0.16_2
  kadu<=4.3_6
  keepassx<=0.4.4_2

From ebc296df5d2b2af990044516537b6d75bce9f96b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 27 Jan 2021 19:06:21 +0100
Subject: [PATCH 0591/3482] removed-packages: bump

---
 srcpkgs/removed-packages/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dd48bbd92d28..9451ae48a635 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=13
+revision=14
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 620642a9c84071bd863967262f5cfd32a73fbd15 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 12:08:42 -0600
Subject: [PATCH 0592/3482] python3-simber: update to 0.2.1.

---
 srcpkgs/python3-simber/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-simber/template b/srcpkgs/python3-simber/template
index ab6940241166..e39741af0357 100644
--- a/srcpkgs/python3-simber/template
+++ b/srcpkgs/python3-simber/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-simber'
 pkgname=python3-simber
-version=0.1.2
+version=0.2.1
 revision=1
 wrksrc="simber-${version}"
 build_style=python3-module
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://simber.deepjyoti30.dev/"
 distfiles="https://github.com/deepjyoti30/simber/archive/${version}.tar.gz"
-checksum=42ee86e9f5afb32d5410284496370cca0af11ce9c9fafdc5a9e055b06a982945
+checksum=11b91250b67d74f8c1725079fee1cd6ea64e690f992a7dfc1523f70d3de78b09
 
 post_install() {
 	vlicense LICENSE

From 75fe2d6cee28bc0627980e0b4aad0e0536db4d3c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 11:07:54 -0600
Subject: [PATCH 0593/3482] opensurge: update to 0.5.2.

---
 srcpkgs/opensurge/patches/fix-installdir.patch        | 11 -----------
 .../patches/{fix_ssize_t.patch => fix-ssize.patch}    |  0
 srcpkgs/opensurge/template                            | 10 +++++++---
 3 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/opensurge/patches/fix-installdir.patch
 rename srcpkgs/opensurge/patches/{fix_ssize_t.patch => fix-ssize.patch} (100%)

diff --git a/srcpkgs/opensurge/patches/fix-installdir.patch b/srcpkgs/opensurge/patches/fix-installdir.patch
deleted file mode 100644
index e1bdf99d0a52..000000000000
--- a/srcpkgs/opensurge/patches/fix-installdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -651,7 +651,7 @@
- # Installing on *nix
- IF(UNIX)
-   INSTALL(CODE "MESSAGE(\"Installing ${GAME_NAME} ${GAME_VERSION}... Make sure that you have the appropriate privileges.\")")
--  INSTALL(TARGETS "${GAME_UNIXNAME}" RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}")
-+  INSTALL(TARGETS "${GAME_UNIXNAME}" RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
-   INSTALL(FILES LICENSE README.md CHANGES.md logo.png surge.png surge.rocks DESTINATION "${GAME_DATADIR}")
-   INSTALL(DIRECTORY characters scripts sprites config images levels musics quests samples scripts themes languages fonts licenses DESTINATION "${GAME_DATADIR}" PATTERN ".git" EXCLUDE)
-   IF(DESKTOP_INSTALL)
diff --git a/srcpkgs/opensurge/patches/fix_ssize_t.patch b/srcpkgs/opensurge/patches/fix-ssize.patch
similarity index 100%
rename from srcpkgs/opensurge/patches/fix_ssize_t.patch
rename to srcpkgs/opensurge/patches/fix-ssize.patch
diff --git a/srcpkgs/opensurge/template b/srcpkgs/opensurge/template
index 5fb036d9253a..1e8d42c4fa82 100644
--- a/srcpkgs/opensurge/template
+++ b/srcpkgs/opensurge/template
@@ -1,7 +1,7 @@
 # Template file for 'opensurge'
 pkgname=opensurge
-version=0.5.1.2
-revision=4
+version=0.5.2
+revision=1
 build_style=cmake
 hostmakedepends="surgescript pkg-config"
 makedepends="allegro5-devel surgescript surgescript-devel"
@@ -10,5 +10,9 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://opensurge2d.org/"
 distfiles="https://github.com/alemart/opensurge/archive/v${version}.tar.gz"
-checksum=d060e3215231741ce0b4e5b897af52f8755c57660c8a33856bf921c83af18ba2
+checksum=838b8ba506e45c800091d8ba7bb830d024907934fba35bf369d92fe13feaa3de
 replaces="opensurge-data>=0"
+
+pre_configure() {
+	vsed -i CMakeLists.txt -e 's/GAME_BINDIR "games"/GAME_BINDIR "bin"/'
+}

From 370fc0e3c7544c03909664d59aa5ac4d1e47cfb8 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 11:40:47 -0600
Subject: [PATCH 0594/3482] spotifyd: update to 0.3.0.

---
 srcpkgs/spotifyd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index 00b166756980..cb77beb238b1 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,7 +1,7 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
-version=0.2.24
-revision=4
+version=0.3.0
+revision=1
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Spotifyd/spotifyd"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d3763f4647217a8f98ee938b50e141d67a5f3d33e9378894fde2a92c9845ef80
+checksum=47b3d9a87a9bc8ff5a46b9ba3ccb5ea0b305964c6f334e601a0316697d8bcd4a
 
 build_options="alsa pulseaudio portaudio dbus"
 desc_option_portaudio="Enable PortAudio backend"

From 930fedb82e6de0a25ca32769abd1a0f5ff0c51b3 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 11:42:37 -0600
Subject: [PATCH 0595/3482] yara: update to 4.0.3.

---
 srcpkgs/yara/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 38b32a09bd38..f066214b73ba 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,7 +1,7 @@
 # Template file for 'yara'
 pkgname=yara
-version=4.0.2
-revision=2
+version=4.0.3
+revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://virustotal.github.io/yara/"
 distfiles="https://github.com/VirusTotal/yara/archive/v${version}.tar.gz"
-checksum=05ad88eac9a9f0232432fd14516bdaeda14349d6cf0cac802d76e369abcee001
+checksum=d95b7f5e2981328a10ea206e3384d661bd4d488e43e8d1785152bdea44d89880
 
 pre_configure() {
 	autoreconf -fi

From 42c9b73051b97aa789da182962acf59e297c3cbb Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 11:42:42 -0600
Subject: [PATCH 0596/3482] python3-yara: update to 4.0.3.

---
 srcpkgs/python3-yara/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-yara/template b/srcpkgs/python3-yara/template
index cb8c10b57599..3543276a9dd2 100644
--- a/srcpkgs/python3-yara/template
+++ b/srcpkgs/python3-yara/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-yara'
 pkgname=python3-yara
-version=4.0.2
-revision=2
+version=4.0.3
+revision=1
 wrksrc="yara-python-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="http://virustotal.github.io/yara/"
 distfiles="https://github.com/VirusTotal/yara-python/archive/v${version}.tar.gz"
-checksum=6e747caefa8d208bf40b078ef0a71f3866fa9075091239cc362bd23bf436d816
+checksum=92e8e29d1d74e4889bf7bb5fe5b0092a48cb207c558393ec4cbe5f8f2fcadaab

From 9b1341906998257b15cd00e674d696c454aab6cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 18:46:42 -0300
Subject: [PATCH 0597/3482] couchdb: remove package.

---
 srcpkgs/couchdb/INSTALL           |  6 -----
 srcpkgs/couchdb/files/couchdb/run |  6 -----
 srcpkgs/couchdb/template          | 40 -------------------------------
 srcpkgs/couchdb/update            |  1 -
 srcpkgs/removed-packages/template |  1 +
 5 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 srcpkgs/couchdb/INSTALL
 delete mode 100755 srcpkgs/couchdb/files/couchdb/run
 delete mode 100644 srcpkgs/couchdb/template
 delete mode 100644 srcpkgs/couchdb/update

diff --git a/srcpkgs/couchdb/INSTALL b/srcpkgs/couchdb/INSTALL
deleted file mode 100644
index 753e71b95d68..000000000000
--- a/srcpkgs/couchdb/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "$ACTION" in
-        post)
-                chown -R couchdb /var/lib/couchdb/ /var/log/couchdb/
-        ;;
-esac
-
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
deleted file mode 100755
index 25d1abb82722..000000000000
--- a/srcpkgs/couchdb/files/couchdb/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-export HOME=/var/lib/couchdb
-mkdir -p /var/run/couchdb
-chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null  -e /dev/null
-
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
deleted file mode 100644
index 5ca5eacbaab0..000000000000
--- a/srcpkgs/couchdb/template
+++ /dev/null
@@ -1,40 +0,0 @@
-# Template file for 'couchdb'
-pkgname=couchdb
-version=1.7.1
-revision=2
-wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
-conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
-depends="erlang"
-short_desc="A document-oriented database"
-maintainer="Gerardo Di Iorio <arete74@gmail.com>"
-license="Apache-2.0"
-homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
-
-system_accounts="couchdb"
-couchdb_homedir="/var/lib/couchdb"
-make_dirs="
-	/var/lib/couchdb 0700 couchdb couchdb
-	/var/log/couchdb 0750 couchdb couchdb"
-
-if [ "$CROSS_BUILD" ]; then
-	makedepends+=" erlang"
-	configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
-fi
-
-pre_configure() {
-	sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
-	sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
-}
-
-
-post_install() {
-	vsv couchdb
-}
diff --git a/srcpkgs/couchdb/update b/srcpkgs/couchdb/update
deleted file mode 100644
index bad80599c945..000000000000
--- a/srcpkgs/couchdb/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=apache-$pkgname
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9451ae48a635..4e053cd1e5fc 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -16,6 +16,7 @@ replaces="
  bokken<=1.8_3
  caja-gksu<=1.20.2_2
  california<=0.4.0_4
+ couchdb<=1.7.1_2
  ctpp2<=2.8.3_7
  ctpp2-devel<=2.8.3_7
  djmount<=0.71_8

From 80fc90767dc3fd98dd7703b8a297f12a2ee62bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 18:43:23 -0300
Subject: [PATCH 0598/3482] js: remove package.

---
 common/shlibs                          |   1 -
 srcpkgs/js-devel                       |   1 -
 srcpkgs/js/patches/js185-destdir.patch |  15 ---
 srcpkgs/js/patches/js185-gcc6.patch    | 135 -------------------------
 srcpkgs/js/template                    |  57 -----------
 srcpkgs/js/update                      |   1 -
 srcpkgs/removed-packages/template      |   1 +
 7 files changed, 1 insertion(+), 210 deletions(-)
 delete mode 120000 srcpkgs/js-devel
 delete mode 100644 srcpkgs/js/patches/js185-destdir.patch
 delete mode 100644 srcpkgs/js/patches/js185-gcc6.patch
 delete mode 100644 srcpkgs/js/template
 delete mode 100644 srcpkgs/js/update

diff --git a/common/shlibs b/common/shlibs
index 92979332fb14..80f722f7f4ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -863,7 +863,6 @@ libquadmath.so.0 libquadmath-4.4.0_1
 libgfortran.so.5 libgfortran-8.2.0_1
 libgnarl-10.so libada-10.2.0_1
 libgnat-10.so libada-10.2.0_1
-libmozjs185.so.1.0 js-1.8.5_1
 libwebp.so.7 libwebp-0.6.0_1
 libwebpmux.so.3 libwebp-0.6.0_1
 libwebpdemux.so.2 libwebp-0.5.0_1
diff --git a/srcpkgs/js-devel b/srcpkgs/js-devel
deleted file mode 120000
index bc42fd64f541..000000000000
--- a/srcpkgs/js-devel
+++ /dev/null
@@ -1 +0,0 @@
-js
\ No newline at end of file
diff --git a/srcpkgs/js/patches/js185-destdir.patch b/srcpkgs/js/patches/js185-destdir.patch
deleted file mode 100644
index 30854e121035..000000000000
--- a/srcpkgs/js/patches/js185-destdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-#https://bugzilla.mozilla.org/show_bug.cgi?id=628723
-
---- js/src/Makefile.in.old	2011-04-10 04:21:19.918608008 -0700
-+++ js/src/Makefile.in	2011-04-10 04:21:58.088607992 -0700
-@@ -888,8 +888,8 @@
- ifeq (,$(HOST_BIN_SUFFIX))
- 	mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
- 	@[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
--	ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
--	ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
-+	ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER)
-+	ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER)
- endif
- endif
- ifneq (,$(IMPORT_LIBRARY))
diff --git a/srcpkgs/js/patches/js185-gcc6.patch b/srcpkgs/js/patches/js185-gcc6.patch
deleted file mode 100644
index 7495e7190bc7..000000000000
--- a/srcpkgs/js/patches/js185-gcc6.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---- js/src/jsapi.cpp
-+++ js/src/jsapi.cpp
-@@ -3985,7 +3985,7 @@ JS_Enumerate(JSContext *cx, JSObject *ob
-     AutoIdVector props(cx);
-     JSIdArray *ida;
-     if (!GetPropertyNames(cx, obj, JSITER_OWNONLY, &props) || !VectorToIdArray(cx, props, &ida))
--        return false;
-+        return NULL;
-     for (size_t n = 0; n < size_t(ida->length); ++n)
-         JS_ASSERT(js_CheckForStringIndex(ida->vector[n]) == ida->vector[n]);
-     return ida;
---- js/src/jsfun.cpp
-+++ js/src/jsfun.cpp
-@@ -2051,7 +2051,7 @@ fun_toStringHelper(JSContext *cx, JSObje
- 
-     JSString *str = JS_DecompileFunction(cx, fun, indent);
-     if (!str)
--        return false;
-+        return NULL;
- 
-     if (!indent)
-         cx->compartment->toSourceCache.put(fun, str);
-@@ -2657,7 +2657,7 @@ LookupInterpretedFunctionPrototype(JSCon
-     const Shape *shape = funobj->nativeLookup(id);
-     if (!shape) {
-         if (!ResolveInterpretedFunctionPrototype(cx, funobj))
--            return false;
-+            return NULL;
-         shape = funobj->nativeLookup(id);
-     }
-     JS_ASSERT(!shape->configurable());
---- js/src/jsiter.cpp
-+++ js/src/jsiter.cpp
-@@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN f
-          */
-         JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0);
-         if (!obj)
--            return false;
-+            return NULL;
-         obj->init(cx, &js_IteratorClass, NULL, NULL, NULL, false);
-         obj->setMap(cx->compartment->emptyEnumeratorShape);
-         return obj;
---- js/src/jsparse.cpp
-+++ js/src/jsparse.cpp
-@@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, Fun
-     if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) {
-         JS_ASSERT(pn->pn_cookie.isFree());
-         if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom))
--            return false;
-+            return NULL;
-     }
- 
-     pn->pn_blockid = outertc->blockid();
---- js/src/jsstr.cpp
-+++ js/src/jsstr.cpp
-@@ -1734,7 +1734,7 @@ class RegExpGuard
-         if (flat) {
-             patstr = flattenPattern(cx, fm.patstr);
-             if (!patstr)
--                return false;
-+                return NULL;
-         } else {
-             patstr = fm.patstr;
-         }
-@@ -3400,7 +3400,7 @@ js_InitStringClass(JSContext *cx, JSObje
-                                  UndefinedValue(), NULL, NULL,
-                                  JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0,
-                                  NULL)) {
--        return JS_FALSE;
-+        return NULL;
-     }
- 
-     return proto;
---- js/src/jstypedarray.cpp
-+++ js/src/jstypedarray.cpp
-@@ -1334,7 +1334,7 @@ class TypedArrayTemplate
-         if (size != 0 && count >= INT32_MAX / size) {
-             JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                  JSMSG_NEED_DIET, "size and count");
--            return false;
-+            return NULL;
-         }
- 
-         int32 bytelen = size * count;
-@@ -1668,7 +1668,7 @@ TypedArrayConstruct(JSContext *cx, jsint
- 
-       default:
-         JS_NOT_REACHED("shouldn't have gotten here");
--        return false;
-+        return NULL;
-     }
- }
- 
---- js/src/jsxml.cpp
-+++ js/src/jsxml.cpp
-@@ -282,7 +282,7 @@ NewXMLNamespace(JSContext *cx, JSLinearS
- 
-     obj = NewBuiltinClassInstanceXML(cx, &js_NamespaceClass);
-     if (!obj)
--        return JS_FALSE;
-+        return NULL;
-     JS_ASSERT(JSVAL_IS_VOID(obj->getNamePrefixVal()));
-     JS_ASSERT(JSVAL_IS_VOID(obj->getNameURIVal()));
-     JS_ASSERT(JSVAL_IS_VOID(obj->getNamespaceDeclared()));
-@@ -431,7 +431,7 @@ ConvertQNameToString(JSContext *cx, JSOb
-         size_t length = str->length();
-         jschar *chars = (jschar *) cx->malloc((length + 2) * sizeof(jschar));
-         if (!chars)
--            return JS_FALSE;
-+            return NULL;
-         *chars = '@';
-         const jschar *strChars = str->getChars(cx);
-         if (!strChars) {
---- js/src/methodjit/InvokeHelpers.cpp
-+++ js/src/methodjit/InvokeHelpers.cpp
-@@ -728,7 +728,7 @@ AtSafePoint(JSContext *cx)
- {
-     JSStackFrame *fp = cx->fp();
-     if (fp->hasImacropc())
--        return false;
-+        return NULL;
- 
-     JSScript *script = fp->script();
-     return script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs->pc);
---- js/src/nanojit/NativeX64.cpp
-+++ js/src/nanojit/NativeX64.cpp
-@@ -1899,7 +1899,7 @@ namespace nanojit
-          }
-     }
- 
--    static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0};
-+    static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {int64_t(0x8000000000000000LL),0};
- 
-     void Assembler::asm_fneg(LIns *ins) {
-         Register rr, ra;
diff --git a/srcpkgs/js/template b/srcpkgs/js/template
deleted file mode 100644
index a7230dc0122a..000000000000
--- a/srcpkgs/js/template
+++ /dev/null
@@ -1,57 +0,0 @@
-# Template file for 'js'
-pkgname=js
-version=1.8.5
-revision=11
-archs="x86_64* i686* aarch64* arm*"
-build_wrksrc="js/src"
-build_style=gnu-configure
-hostmakedepends="zip python perl nspr-devel"
-makedepends="nspr-devel"
-short_desc="Spidermonkey JavaScript interpreter and library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MPL-1.1, GPL-2.0-only, LGPL-2.1-only"
-homepage="https://developer.mozilla.org/en/docs/SpiderMonkey"
-distfiles="${MOZILLA_SITE}/js/js185-1.0.0.tar.gz"
-checksum=5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687
-
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
-		# ./assembler/jit/ExecutableAllocator.h:395:6: error: #error "The cacheFlush support is missing on this platform."
-		broken="https://build.voidlinux.org/builders/aarch64_builder/builds/2509/steps/shell_3/logs/stdio"
-		;;
-esac
-
-do_configure() {
-	local _args
-
-	if [ "$CROSS_BUILD" ]; then
-		export HOST_CC=cc
-		export HOST_CXX=g++
-		export HOST_CFLAGS="-Os -DFORCE_LITTLE_ENDIAN -fPIE"
-		export HOST_CXXFLAGS="-Os -DFORCE_LITTLE_ENDIAN -fPIE"
-
-		case "$XBPS_MACHINE" in
-			armv6l*) _args+=" --with-cpu-arch=armv6";;
-			armv7l*) _args+=" --with-cpu-arch=armv7";;
-		esac
-		_args+=" --target=$XBPS_CROSS_TRIPLET"
-	fi
-
-	sed -e "s,-mfpu=neon -mfloat-abi=softfp,,g" -i configure
-	sed -e "s,-march=armv7-a -marm -mfloat-abi=softfp,${CFLAGS},g" -i configure
-	sed -e "s,-march=armv7 -marm -msoftfp,${CFLAGS},g" -i configure
-
-	./configure --prefix=/usr --with-system-nspr --enable-threadsafe ${_args}
-}
-
-js-devel_package() {
-	depends="nspr-devel js>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-	}
-}
diff --git a/srcpkgs/js/update b/srcpkgs/js/update
deleted file mode 100644
index c54d0609c552..000000000000
--- a/srcpkgs/js/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="1.60"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4e053cd1e5fc..3eb0307347da 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -133,6 +133,7 @@ replaces="
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
  isl16<=0.16_2
+ js<=1.8.5_11
  kadu<=4.3_6
  keepassx<=0.4.4_2
  libapp<=20140527_2

From 13ce3a0bea6372fad65a885bd7991b8d97246c6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 18:48:05 -0300
Subject: [PATCH 0599/3482] mozjs68: remove package.

---
 common/shlibs                                 |  1 -
 srcpkgs/mozjs68-devel                         |  1 -
 .../001-silence-sandbox-violations.patch      | 27 -------
 srcpkgs/mozjs68/patches/002-fix-soname.patch  | 22 ------
 .../mozjs68/patches/003-fix-wasm-arm.patch    | 16 ----
 .../mozjs68/patches/004-fix-musl-build.patch  | 17 -----
 .../005-spidermonkey-checks-disable.patch     | 12 ---
 .../006-mozjs68.pc-honor-sysroot.patch        | 10 ---
 ...sed-LLVM-and-Rust-build-dependencies.patch | 74 -------------------
 .../mozjs68/patches/008-fix-mips32-inl.patch  | 53 -------------
 .../patches/009-fix-mips-sgidefs_h.patch      | 11 ---
 srcpkgs/mozjs68/template                      | 71 ------------------
 srcpkgs/mozjs68/update                        |  1 -
 srcpkgs/removed-packages/template             |  1 +
 14 files changed, 1 insertion(+), 316 deletions(-)
 delete mode 120000 srcpkgs/mozjs68-devel
 delete mode 100644 srcpkgs/mozjs68/patches/001-silence-sandbox-violations.patch
 delete mode 100644 srcpkgs/mozjs68/patches/002-fix-soname.patch
 delete mode 100644 srcpkgs/mozjs68/patches/003-fix-wasm-arm.patch
 delete mode 100644 srcpkgs/mozjs68/patches/004-fix-musl-build.patch
 delete mode 100644 srcpkgs/mozjs68/patches/005-spidermonkey-checks-disable.patch
 delete mode 100644 srcpkgs/mozjs68/patches/006-mozjs68.pc-honor-sysroot.patch
 delete mode 100644 srcpkgs/mozjs68/patches/007-Remove-unused-LLVM-and-Rust-build-dependencies.patch
 delete mode 100644 srcpkgs/mozjs68/patches/008-fix-mips32-inl.patch
 delete mode 100644 srcpkgs/mozjs68/patches/009-fix-mips-sgidefs_h.patch
 delete mode 100644 srcpkgs/mozjs68/template
 delete mode 100644 srcpkgs/mozjs68/update

diff --git a/common/shlibs b/common/shlibs
index 80f722f7f4ec..f73bd5d4ed40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3520,7 +3520,6 @@ libmysqlpp.so.3 mysql++-3.2.5_1
 libKF5Syndication.so.5 syndication-5.50.0_1
 liblqr-1.so.0 liblqr-0.4.2_1
 libmozjs-60.so.0 mozjs60-60.0.2_1
-libmozjs-68.so.0 mozjs68-68.8.0_1
 libmozjs-78.so.0 mozjs78-78.1.0_1
 libebur128.so.1 libebur128-1.2.4_1
 libgtksourceview-4.so.0 gtksourceview4-4.0.2_1
diff --git a/srcpkgs/mozjs68-devel b/srcpkgs/mozjs68-devel
deleted file mode 120000
index 0843c595e783..000000000000
--- a/srcpkgs/mozjs68-devel
+++ /dev/null
@@ -1 +0,0 @@
-mozjs68
\ No newline at end of file
diff --git a/srcpkgs/mozjs68/patches/001-silence-sandbox-violations.patch b/srcpkgs/mozjs68/patches/001-silence-sandbox-violations.patch
deleted file mode 100644
index 51208e9438b6..000000000000
--- a/srcpkgs/mozjs68/patches/001-silence-sandbox-violations.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-"Carried over from mozjs60"
-Upstream: no
-From 9ad10569e11a2fb96377188f895bc66abcc9511d Mon Sep 17 00:00:00 2001
-From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Date: Wed, 5 Sep 2018 15:05:24 +0200
-Subject: [PATCH] silence sandbox violations
-
-Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
----
- python/mozbuild/mozbuild/frontend/emitter.py | 5 -----
- 1 file changed, 5 deletions(-)
-
---- a/python/mozbuild/mozbuild/frontend/emitter.py
-+++ b/python/mozbuild/mozbuild/frontend/emitter.py
-@@ -1195,11 +1195,6 @@
-                     raise SandboxValidationError('Path specified in LOCAL_INCLUDES '
-                         'is a filename, but a directory is required: %s '
-                         '(resolved to %s)' % (local_include, full_path), context)
--            if (full_path == context.config.topsrcdir or
--                    full_path == context.config.topobjdir):
--                raise SandboxValidationError('Path specified in LOCAL_INCLUDES '
--                    '(%s) resolves to the topsrcdir or topobjdir (%s), which is '
--                    'not allowed' % (local_include, full_path), context)
-             include_obj = LocalInclude(context, local_include)
-             local_includes.append(include_obj.path.full_path)
-             yield include_obj
-
diff --git a/srcpkgs/mozjs68/patches/002-fix-soname.patch b/srcpkgs/mozjs68/patches/002-fix-soname.patch
deleted file mode 100644
index 26cd1847929a..000000000000
--- a/srcpkgs/mozjs68/patches/002-fix-soname.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-"Carried over from mozjs60"
---- a/js/src/build/Makefile.in
-+++ b/js/src/build/Makefile.in
-@@ -78,6 +78,8 @@
- endif
- ifneq (,$(SHARED_LIBRARY))
- 	$(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir)
-+	mv -f $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).0
-+	ln -s $(SHARED_LIBRARY).0 $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
- ifeq ($(OS_ARCH),Darwin)
- 	install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
- endif
---- a/js/src/build/moz.build
-+++ b/js/src/build/moz.build
-@@ -25,6 +25,7 @@
- if CONFIG['JS_SHARED_LIBRARY']:
-     GeckoSharedLibrary('js', linkage=None)
-     SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
-+    LDFLAGS += ['-Wl,-soname,lib{}.so.0'.format(SHARED_LIBRARY_NAME)]
- 
-     # Ensure symbol versions of shared library on Linux do not conflict
-     # with those in libxul.
diff --git a/srcpkgs/mozjs68/patches/003-fix-wasm-arm.patch b/srcpkgs/mozjs68/patches/003-fix-wasm-arm.patch
deleted file mode 100644
index 891a7652056a..000000000000
--- a/srcpkgs/mozjs68/patches/003-fix-wasm-arm.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-"Taken from firefox-esr"
---- a/js/src/wasm/WasmSignalHandlers.cpp
-+++ b/js/src/wasm/WasmSignalHandlers.cpp
-@@ -243,9 +243,9 @@
- // If you run into compile problems on a tier-3 platform, you can disable the
- // emulation here.
- 
--#if defined(__linux__) && defined(__arm__)
--#  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
--#endif
-+// #if defined(__linux__) && defined(__arm__)
-+// #  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
-+// #endif
- 
- #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
- #  include <sys/user.h>
diff --git a/srcpkgs/mozjs68/patches/004-fix-musl-build.patch b/srcpkgs/mozjs68/patches/004-fix-musl-build.patch
deleted file mode 100644
index f629fa2ac355..000000000000
--- a/srcpkgs/mozjs68/patches/004-fix-musl-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-"Carried over from mozjs60"
-Upstream: No
-Reason: mozjs68 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD:
-https://github.com/void-linux/void-packages/issues/2598
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -1272,6 +1272,9 @@
-     *-android*|*-linuxandroid*)
-       :
-       ;;
-+    *-musl*)
-+      :
-+      ;;
-     *)
-       AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
-       ;;
diff --git a/srcpkgs/mozjs68/patches/005-spidermonkey-checks-disable.patch b/srcpkgs/mozjs68/patches/005-spidermonkey-checks-disable.patch
deleted file mode 100644
index f6eababd1f2f..000000000000
--- a/srcpkgs/mozjs68/patches/005-spidermonkey-checks-disable.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Source:Fedora
-Reason: Checks failed(Todo: Figure out why)
-+++ a/config/run_spidermonkey_checks.py
-+++ b/config/run_spidermonkey_checks.py
-@@ -11,5 +11,5 @@
-     for script in scripts:
-         retcode = subprocess.call(
-             [sys.executable, script], cwd=buildconfig.topsrcdir)
--        if retcode != 0:
--            raise Exception(script + " failed")
-+        #if retcode != 0:
-+        #    raise Exception(script + " failed")
diff --git a/srcpkgs/mozjs68/patches/006-mozjs68.pc-honor-sysroot.patch b/srcpkgs/mozjs68/patches/006-mozjs68.pc-honor-sysroot.patch
deleted file mode 100644
index 71214b8eccf9..000000000000
--- a/srcpkgs/mozjs68/patches/006-mozjs68.pc-honor-sysroot.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-"Carried over from mozjs60"
-Reason: Fix the '-include' directive, otherwise it tries to use the host's header
---- a/js/src/build/js.pc.in
-+++ b/js/src/build/js.pc.in
-@@ -11,4 +11,4 @@
- # Use -isystem for includes rather than -I, to mark them as "system headers"
- # that don't generate warning diagnostics. For justification, see
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1539036
--Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -isystem ${includedir}/@JS_LIBRARY_NAME@
-+Cflags: -include ${pc_sysrootdir}${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -isystem ${includedir}/@JS_LIBRARY_NAME@
diff --git a/srcpkgs/mozjs68/patches/007-Remove-unused-LLVM-and-Rust-build-dependencies.patch b/srcpkgs/mozjs68/patches/007-Remove-unused-LLVM-and-Rust-build-dependencies.patch
deleted file mode 100644
index b1c7782adbf1..000000000000
--- a/srcpkgs/mozjs68/patches/007-Remove-unused-LLVM-and-Rust-build-dependencies.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Source: openSUSE
-Upstream: No
-Description: Remove unused LLVM and Rust build dependencies
- Since the Javascript engine is normally part of Firefox, its build
- system has dependencies on the LLVM and Rust toolchains. This limits
- the number of architectures which mozjs68 can be built on.
- .
- It turns out, however, that neither LLVM nor Rust are used when mozjs68
- is being built and these build dependencies are therefore not necessary.
- .
- This patch removes them and allows mozjs68 to be built on any architecture.
- .
-Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959144
-Forwarded: no
-Last-Update: 2020-04-30
-
-Index: js/moz.configure
-===================================================================
---- a/js/moz.configure
-+++ a/js/moz.configure
-@@ -18,11 +18,6 @@ def building_js(build_project):
- option(env='JS_STANDALONE', default=building_js,
-        help='Reserved for internal use')
- 
--include('../build/moz.configure/rust.configure',
--        when='--enable-compile-environment')
--include('../build/moz.configure/bindgen.configure',
--        when='--enable-compile-environment')
--
- @depends('JS_STANDALONE')
- def js_standalone(value):
-     if value:
-Index: moz.configure
-===================================================================
---- a/moz.configure
-+++ b/moz.configure
-@@ -598,36 +598,6 @@ set_config('MAKENSISU_FLAGS', nsis_flags
- 
- check_prog('7Z', ('7z', '7za'), allow_missing=True, when=target_is_windows)
- 
--
--@depends(host_c_compiler, c_compiler, bindgen_config_paths)
--def llvm_objdump(host_c_compiler, c_compiler, bindgen_config_paths):
--    clang = None
--    for compiler in (host_c_compiler, c_compiler):
--        if compiler and compiler.type == 'clang':
--            clang = compiler.compiler
--            break
--        elif compiler and compiler.type == 'clang-cl':
--            clang = os.path.join(os.path.dirname(compiler.compiler), 'clang')
--            break
--
--    if not clang and bindgen_config_paths:
--        clang = bindgen_config_paths.clang_path
--    llvm_objdump = 'llvm-objdump'
--    if clang:
--        out = check_cmd_output(clang, '--print-prog-name=llvm-objdump',
--                               onerror=lambda: None)
--        if out:
--            llvm_objdump = out.rstrip()
--    return (llvm_objdump,)
--
--
--llvm_objdump = check_prog('LLVM_OBJDUMP', llvm_objdump, what='llvm-objdump',
--                          when='--enable-compile-environment',
--                          paths=toolchain_search_path)
--
--add_old_configure_assignment('LLVM_OBJDUMP', llvm_objdump)
--
--
- # Please do not add configure checks from here on.
- 
- # Fallthrough to autoconf-based configure
diff --git a/srcpkgs/mozjs68/patches/008-fix-mips32-inl.patch b/srcpkgs/mozjs68/patches/008-fix-mips32-inl.patch
deleted file mode 100644
index 9c964e352994..000000000000
--- a/srcpkgs/mozjs68/patches/008-fix-mips32-inl.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: qiaopengcheng <qiaopengcheng-hf@loongson.cn>
-Date: Sun, 2 Jun 2019 07:28:24 +0900
-Subject: Bug 1556197 - amend Bug-1544631 for fixing mips32.
-
----
- js/src/jit/mips32/MacroAssembler-mips32-inl.h | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/js/src/jit/mips32/MacroAssembler-mips32-inl.h b/js/src/jit/mips32/MacroAssembler-mips32-inl.h
-index 1f7f4d1cf31..06d8773e92a 100644
---- a/js/src/jit/mips32/MacroAssembler-mips32-inl.h
-+++ b/js/src/jit/mips32/MacroAssembler-mips32-inl.h
-@@ -69,6 +69,15 @@
- }
- 
- // ===============================================================
-+// Load instructions
-+
-+void MacroAssembler::load32SignExtendToPtr(const Address& src, Register dest) {
-+  loadPtr(src, dest);
-+}
-+
-+// ===============================================================
-+
-+// ===============================================================
- // Logical instructions
- 
- void MacroAssembler::andPtr(Register src, Register dest) { ma_and(dest, src); }
-@@ -820,19 +820,21 @@ void MacroAssembler::branchTestSymbol(Condition cond, const ValueOperand& value,
- 
- void MacroAssembler::branchTestBigInt(Condition cond, Register tag,
-                                       Label* label) {
--  branchTestBigIntImpl(cond, tag, label);
-+  MOZ_ASSERT(cond == Equal || cond == NotEqual);
-+  ma_b(tag, ImmTag(JSVAL_TAG_BIGINT), label, cond);
- }
- 
- void MacroAssembler::branchTestBigInt(Condition cond, const BaseIndex& address,
-                                       Label* label) {
-   SecondScratchRegisterScope scratch2(*this);
--  splitTag(value, scratch2);
-+  computeEffectiveAddress(address, scratch2);
-   branchTestBigInt(cond, scratch2, label);
- }
- 
- void MacroAssembler::branchTestBigInt(Condition cond, const ValueOperand& value,
-                                       Label* label) {
--  branchTestBigInt(cond, value.typeReg(), label);
-+  SecondScratchRegisterScope scratch2(*this);
-+  branchTestBigInt(cond, scratch2, label);
- }
- 
- void MacroAssembler::branchTestBigIntTruthy(bool b, const ValueOperand& value,
diff --git a/srcpkgs/mozjs68/patches/009-fix-mips-sgidefs_h.patch b/srcpkgs/mozjs68/patches/009-fix-mips-sgidefs_h.patch
deleted file mode 100644
index abb140233a05..000000000000
--- a/srcpkgs/mozjs68/patches/009-fix-mips-sgidefs_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mfbt/RandomNum.cpp	2020-04-29 23:49:40.000000000 +0200
-+++ b/mfbt/RandomNum.cpp	2020-08-04 19:29:36.127471301 +0200
-@@ -52,7 +52,7 @@
- #  elif defined(__s390__)
- #    define GETRANDOM_NR 349
- #  elif defined(__mips__)
--#    include <sgidefs.h>
-+#    include <asm/sgidefs.h>
- #    if _MIPS_SIM == _MIPS_SIM_ABI32
- #      define GETRANDOM_NR 4353
- #    elif _MIPS_SIM == _MIPS_SIM_ABI64
diff --git a/srcpkgs/mozjs68/template b/srcpkgs/mozjs68/template
deleted file mode 100644
index 80345a9ea9e4..000000000000
--- a/srcpkgs/mozjs68/template
+++ /dev/null
@@ -1,71 +0,0 @@
-# Template file for 'mozjs68'
-pkgname=mozjs68
-version=68.11.0
-revision=1
-wrksrc="firefox-${version}"
-build_wrksrc=js/src
-build_style=gnu-configure
-hostmakedepends="perl python pkg-config automake autoconf213 autoconf-archive
- which python3"
-makedepends="icu-devel libffi-devel nspr-devel python-devel readline-devel zlib-devel
- python3-devel"
-depends="nspr>=4.19"
-short_desc="Mozilla JavaScript interpreter and library (68.x series)"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MPL-2.0"
-homepage="https://www.mozilla.org/js/"
-distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=91c1f7caaf1ba785b74799865227456bf784ba614d17cf5f0f41a5f25d6d2160
-patch_args="-Np1"
-CXXFLAGS="-Wno-class-memaccess"
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	LDFLAGS+=" -latomic"
-fi
-
-do_configure() {
-	local _args
-
-	if [ "$CROSS_BUILD" ]; then
-		export HOST_CC=cc
-		export TARGET_CC="${CC}"
-		export HOST_CFLAGS="-Os"
-		export HOST_CXXFLAGS="-Os"
-		_args+=" --target=$XBPS_CROSS_TRIPLET --enable-linker=bfd"
-	fi
-
-	autoconf-2.13 old-configure.in > old-configure
-
-	touch ${wrksrc}/js/src/configure
-	touch ${wrksrc}/js/src/old-configure
-	SHELL=/bin/bash PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-		--disable-jemalloc --disable-optimize --enable-ctypes \
-		--enable-readline --enable-shared-js --enable-system-ffi \
-		--enable-tests --with-intl-api --with-system-icu --with-system-nspr \
-		--enable-unaligned-private-values  --enable-hardening \
-		--enable-release --with-system-zlib --target=${XBPS_TRIPLET} \
-		--host=${XBPS_TRIPLET} \
-		${_args}
-}
-
-do_check() {
-	dist/bin/jsapi-tests --format=none --exclude-random basic
-}
-
-post_install() {
-	# Remove unneeded static library
-	rm -f "${DESTDIR}"/usr/lib/*.ajs
-}
-
-mozjs68-devel_package() {
-	depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/js68-config
-		vmove usr/include
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-	}
-}
diff --git a/srcpkgs/mozjs68/update b/srcpkgs/mozjs68/update
deleted file mode 100644
index 1947e19217f0..000000000000
--- a/srcpkgs/mozjs68/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname='mozjs'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3eb0307347da..f156d66493cd 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -149,6 +149,7 @@ replaces="
  mirrorbits<=0.5.1_1
  mongroup<=0.4.1_2
  mozjs52<=52.9.0_7
+ mozjs68<=68.11.0_1
  phonon-backend-gstreamer<=4.9.0_2
  phonon-backend-vlc<=0.9.1_3
  polkit-qt<=0.112.0_5

From 02246c384dc4b3424a2b5bf054cf44904cb6a3e3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 27 Jan 2021 01:11:52 +0100
Subject: [PATCH 0600/3482] sfeed: update to 0.9.21.

---
 srcpkgs/sfeed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index bc9b448eedbb..2ee3dd1dad06 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.20
+version=0.9.21
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=2451457a7745ea8519316315a8597331302e00778a9ff7bec58dfb241674d991
+checksum=bafe85bf38726a82bd30d56067de162708cdfc4cecd184069e2b94b20d55f14f
 
 post_install() {
 	vlicense LICENSE

From d5ff3533021bcc6841ee47cd8e714d02d71b21e8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 27 Jan 2021 19:42:53 +0100
Subject: [PATCH 0601/3482] removed-packages: add gccgo/popcorn for ppc32 and
 bump

---
 srcpkgs/removed-packages/template | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f156d66493cd..d8b7edf40b22 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=14
+revision=15
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -197,3 +197,16 @@ replaces="
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	replaces+=" timidity<=2.15.0_1"
 fi
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*)
+		replaces+="
+		 PopCorn<=0.4_5
+		 libgo<=10.2.1pre1_1
+		 libgo-devel<=10.2.1pre1_1
+		 gcc-go<=10.2.1pre1_1
+		 gcc-go-tools<=10.2.1pre1_1
+		"
+		;;
+esac

From c9f3bfc141fe09072d0339417f808faacd3a70f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:29 -0300
Subject: [PATCH 0602/3482] fuse-zip: remove CXXFLAGS workaround.

No longer necessary.

Also fix distfile location, for some reason the 0.7.1 tarball had been
removed from downloads.
---
 srcpkgs/fuse-zip/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template
index db224196e5c7..80f9de31cbda 100644
--- a/srcpkgs/fuse-zip/template
+++ b/srcpkgs/fuse-zip/template
@@ -2,6 +2,7 @@
 pkgname=fuse-zip
 version=0.7.1
 revision=1
+wrksrc=agalanin-fuse-zip-0865d60054d9
 build_style=gnu-makefile
 make_build_args="all doc"
 make_install_args="prefix=/usr"
@@ -11,9 +12,9 @@ short_desc="FUSE file system for ZIP archives"
 maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-3.0-or-later"
 homepage="https://bitbucket.org/agalanin/fuse-zip"
-distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz"
-checksum=7dac61c3f27f9041545ab1a22bb772ea282ed2dea25a0220dcecfa6801b5b121
+distfiles="${homepage}/get/${version}.tar.gz"
+checksum=771302586ca734bf845effcea999c38f4c2e984e29605912eb3470fbeea0b195
 
-pre_build() {
-	vsed -i '/^CXXFLAGS=/d' Makefile lib/Makefile
+do_check() {
+	: requires some tcl modules
 }

From 9499c446f6792f3d0da1f902bedf7e22ab7bc0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:48 -0300
Subject: [PATCH 0603/3482] splix: remove unnecessary build_style.

Also xlint.
---
 srcpkgs/splix/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/splix/template b/srcpkgs/splix/template
index 60315c5d7b60..366aab114bce 100644
--- a/srcpkgs/splix/template
+++ b/srcpkgs/splix/template
@@ -1,20 +1,19 @@
-# Template file for 'splix-svn'
+# Template file for 'splix'
 pkgname=splix
 version=2.0.0+svn315
 revision=3
 wrksrc="$pkgname-$version.orig"
-build_style=gnu-makefile
 makedepends="cups-devel mit-krb5-devel jbigkit-devel"
 short_desc="CUPS driver for SPL printers (Samsung and several Xerox printers)"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://splix.ap2c.org"
 distfiles="${DEBIAN_SITE}/main/s/$pkgname/${pkgname}_$version.orig.tar.gz"
 checksum="578a81bd5b1b97756a539c3bb6339fd109d54419887a73e705941da8aa7fac52"
-CXXFLAGS=" -fno-strict-aliasing"
+CXXFLAGS="-fno-strict-aliasing"
 
 do_build() {
-	sed -i rules.mk \
+	vsed -i rules.mk \
 		-e's;$(CXX) -o;$(CXX) $(LDFLAGS) -o;'
 	make CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
 		CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" STRIP="true" drv

From 33a28eea16e280648817b59bd9f78de396802b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 Jan 2021 16:04:35 -0300
Subject: [PATCH 0604/3482] mozjs78: fix homepage and don't append to *FLAGS in
 top level.

---
 srcpkgs/mozjs78/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 38e6aded7c7e..ebfb51801916 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -14,13 +14,13 @@ depends="nspr>=4.19"
 short_desc="Mozilla JavaScript interpreter and library (78.x series)"
 maintainer="q66 <daniel@octaforge.org>"
 license="MPL-2.0"
-homepage="https://www.mozilla.org/js/"
+homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
 checksum=965ccfcbb8c0aa97639911997c54be0fcf896fd388b03138952089af675ea918
 patch_args="-Np1"
 
-CXXFLAGS+=" -Wno-class-memaccess"
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
+CXXFLAGS="-Wno-class-memaccess"
+LDFLAGS="-Wl,-z,stack-size=1048576"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 93b975858dd185653b5bd5f0b91076bac3c5316b Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Tue, 26 Jan 2021 16:19:39 +0100
Subject: [PATCH 0605/3482] feh: update to 3.6.3.

---
 srcpkgs/feh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template
index 7ed1d95af54a..7b891fa8f9c1 100644
--- a/srcpkgs/feh/template
+++ b/srcpkgs/feh/template
@@ -1,6 +1,6 @@
 # Template file for 'feh'
 pkgname=feh
-version=3.6.2
+version=3.6.3
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -15,7 +15,7 @@ license="MIT-feh"
 homepage="https://feh.finalrewind.org"
 changelog="https://raw.githubusercontent.com/derf/feh/master/ChangeLog"
 distfiles="${homepage}/feh-${version}.tar.bz2"
-checksum=1649fb79d1a1242938cd64a468fd2666c8b1174421b1050244f39e01d3c7c634
+checksum=437420f37f11614e008d066e2a3bdefcfc78144c8212998b2bacdd5d21ea23b4
 
 pre_build() {
 	vsed -i 's|doc/feh/examples|examples/feh|' config.mk

From 7f861962bc8799a9ef6ac21d2d072a479baae24e Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 27 Jan 2021 13:49:59 -0500
Subject: [PATCH 0606/3482] xbps-src: Improve the showing of variables

---
 xbps-src | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/xbps-src b/xbps-src
index fa677084ce06..77969af84a15 100755
--- a/xbps-src
+++ b/xbps-src
@@ -836,6 +836,7 @@ case "$XBPS_TARGET" in
         read_pkg ignore-problems
         for sub_name in $subpackages; do
             if [ $sub_name = $XBPS_TARGET_PKG ]; then
+                . ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
                 ${sub_name}_package
             fi
         done
@@ -859,6 +860,7 @@ case "$XBPS_TARGET" in
         read_pkg ignore-problems
         for sub_name in $subpackages; do
             if [ $sub_name = $XBPS_TARGET_PKG ]; then
+                . ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
                 ${sub_name}_package
             fi
         done
@@ -886,6 +888,34 @@ case "$XBPS_TARGET" in
                 fi # The trailing space gets stripped before printing anyway
         done
         ;;
+    dbulk-dump)
+        read_pkg
+        for x in pkgname version revision; do
+            printf '%s: %s\n' "$x" "${!x}"
+        done
+        for x in hostmakedepends makedepends depends; do
+            arr=(${!x})
+            if [[ ${#arr} -gt 0 ]]; then
+                printf '%s:\n' "$x"
+                printf ' %s\n' "${arr[@]}"
+            fi
+        done
+        if [[ $subpackages ]]; then
+            printf 'subpackages:\n'
+            for x in ${subpackages}; do
+                . ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
+                ${x}_package
+                printf ' %s\n' "$x"
+                for x in depends; do
+                    arr=(${!x})
+                    if [[ ${#arr} -gt 0 ]]; then
+                        printf '  %s:\n' "$x"
+                        printf '   %s\n' "${arr[@]}"
+                    fi
+                done
+            done
+        fi
+        ;;
     show-options)
         read_pkg ignore-problems
         show_pkg_build_options

From 6cd2d8bb0712c0d011e7e9cef56802b20d5deede Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 27 Jan 2021 15:46:27 -0500
Subject: [PATCH 0607/3482] rust: rust-std never depended on itself

---
 srcpkgs/rust/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 4d25635d409d..6bb928e14783 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -354,7 +354,6 @@ rust-doc_package() {
 
 rust-std_package() {
 	short_desc+=" - standard library"
-	depends=""
 	pkg_install() {
 		vmove usr/lib/rustlib
 	}

From 43209c888a856ce03ad35ef3e8bc430e2cf0cb20 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 28 Jan 2021 00:31:40 +0100
Subject: [PATCH 0608/3482] tmux: depend on ncurses-base

https://github.com/tmux/tmux/issues/743
---
 srcpkgs/tmux/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template
index 869beb5a4b26..df8e84bb4abb 100644
--- a/srcpkgs/tmux/template
+++ b/srcpkgs/tmux/template
@@ -1,10 +1,11 @@
 # Template file for 'tmux'
 pkgname=tmux
 version=3.1c
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="byacc"
 makedepends="libevent-devel ncurses-devel"
+depends="ncurses-base"
 short_desc="Terminal Multiplexer"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="ISC"

From b19919bed37e6f6853351b42f8de91efc762c835 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 27 Jan 2021 16:55:23 +0100
Subject: [PATCH 0609/3482] nsd: update to 4.3.5.

---
 srcpkgs/nsd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 9b331fbaf93f..98fe1d14f6c6 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,6 +1,6 @@
 # Template file for 'nsd'
 pkgname=nsd
-version=4.3.4
+version=4.3.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://www.nlnetlabs.nl/projects/nsd/"
 changelog="https://github.com/NLnetLabs/nsd/blob/NSD_${version//./_}_REL/doc/ChangeLog"
 distfiles="https://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=3be834a97151a7ba8185e46bc37ff12c2f25f399755ae8a2d0e3711801528b50
+checksum=7da2b43e30b3d7f307722c608f719bfb169f0d985c764a34fa0669dc33484472
 system_accounts="nsd"
 nsd_homedir=/var/db/nsd
 make_dirs="/var/db/nsd 0755 nsd nsd"

From a250c6a060dfd05f5ba85bd1556ccafd7d3f6b56 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 28 Jan 2021 00:59:14 +0100
Subject: [PATCH 0610/3482] gloobus-preview: conditionally depend on unoconv

---
 srcpkgs/gloobus-preview/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gloobus-preview/template b/srcpkgs/gloobus-preview/template
index 05385fea396d..96b57be75226 100644
--- a/srcpkgs/gloobus-preview/template
+++ b/srcpkgs/gloobus-preview/template
@@ -1,7 +1,7 @@
 # Template file for 'gloobus-preview'
 pkgname=gloobus-preview
 version=2015.12.21
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python3 gettext-devel xz"
 makedepends="gettext-devel boost-devel gtk+3-devel gtksourceview-devel
@@ -9,7 +9,7 @@ makedepends="gettext-devel boost-devel gtk+3-devel gtksourceview-devel
  poppler-glib-devel libspectre-devel djvulibre-devel libgxps-devel
  freetype-devel glib-devel libX11-devel libarchive-devel"
 depends="python3-dbus python3-gobject gst-libav gst-plugins-good1
- gst-plugins-bad1 gst-plugins-ugly1 ImageMagick unoconv"
+ gst-plugins-bad1 gst-plugins-ugly1 ImageMagick"
 short_desc="GNOME's extension to preview all kinds of file"
 maintainer="Antonio Malcolm <antonio@antoniomalcolm.com>"
 license="GPL-3.0-only"
@@ -17,6 +17,11 @@ homepage="https://github.com/antonio-malcolm/gloobus-preview"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=c43f1ed00ccc3603042abb78b871665ff6c6a89987d7f854b9b4254b7cf9d86c
 
+if [ -z "$CROSS_BUILD" ]; then
+	# unoconv depends in libreoffice, which is nocross
+	depends+=" unoconv"
+fi
+
 pre_configure() {
 	autoreconf -fi
 }

From 2ec0338af68f0076efc2f86f9f274fd69149fb94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 27 Jan 2021 07:12:47 +0700
Subject: [PATCH 0611/3482] update_check: update GNOME pattern for GNOME 40

---
 common/xbps-src/shutils/update_check.sh  | 9 +++++++--
 srcpkgs/NetworkManager/update            | 1 -
 srcpkgs/adwaita-icon-theme/update        | 1 -
 srcpkgs/clutter/update                   | 2 --
 srcpkgs/glib-networking/update           | 1 -
 srcpkgs/gnome-control-center/update      | 1 -
 srcpkgs/gnome-desktop/update             | 1 -
 srcpkgs/gnome-online-accounts/update     | 2 --
 srcpkgs/gobject-introspection/update     | 2 --
 srcpkgs/gsettings-desktop-schemas/update | 1 -
 srcpkgs/gsound/update                    | 2 --
 srcpkgs/libgweather/update               | 2 --
 srcpkgs/mutter/update                    | 2 --
 srcpkgs/simple-scan/update               | 1 -
 14 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/update
 delete mode 100644 srcpkgs/adwaita-icon-theme/update
 delete mode 100644 srcpkgs/clutter/update
 delete mode 100644 srcpkgs/glib-networking/update
 delete mode 100644 srcpkgs/gnome-control-center/update
 delete mode 100644 srcpkgs/gnome-desktop/update
 delete mode 100644 srcpkgs/gnome-online-accounts/update
 delete mode 100644 srcpkgs/gobject-introspection/update
 delete mode 100644 srcpkgs/gsettings-desktop-schemas/update
 delete mode 100644 srcpkgs/gsound/update
 delete mode 100644 srcpkgs/mutter/update
 delete mode 100644 srcpkgs/simple-scan/update

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index d88fb12e253d..4ce6129a5110 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -22,7 +22,12 @@ update_check() {
     export LC_ALL=C
 
     if [ -z "$site" ]; then
-        printf '%s\n' "$homepage"
+        case "$distfiles" in
+            # only consider versions those exist in ftp.gnome.org
+            *ftp.gnome.org*) ;;
+            *)
+                printf '%s\n' "$homepage" ;;
+        esac
         for i in $distfiles; do
             printf '%s\n' "${i%/*}/"
         done
@@ -126,7 +131,7 @@ update_check() {
                 url="https://bitbucket.org/$pkgurlname/downloads"
                 rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar)';;
             *ftp.gnome.org*)
-                : ${pattern="\Q$pkgname\E-\K[0-9]+\.[0-9]*[02468]\.[0-9.]*[0-9](?=)"}
+                : ${pattern="\Q$pkgname\E-\K([13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"}
                 url="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/cache.json";;
             *kernel.org/pub/linux/kernel/*)
                 rx=linux-'\K'${version%.*}'[\d.]+(?=\.tar\.xz)';;
diff --git a/srcpkgs/NetworkManager/update b/srcpkgs/NetworkManager/update
deleted file mode 100644
index a73db8805ed8..000000000000
--- a/srcpkgs/NetworkManager/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.[0-9]*[13579].*"
diff --git a/srcpkgs/adwaita-icon-theme/update b/srcpkgs/adwaita-icon-theme/update
deleted file mode 100644
index a73db8805ed8..000000000000
--- a/srcpkgs/adwaita-icon-theme/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.[0-9]*[13579].*"
diff --git a/srcpkgs/clutter/update b/srcpkgs/clutter/update
deleted file mode 100644
index 0980963f6dfe..000000000000
--- a/srcpkgs/clutter/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="${GNOME_SITE}/$pkgname/cache.json"
-ignore="1.*[13579].*"
diff --git a/srcpkgs/glib-networking/update b/srcpkgs/glib-networking/update
deleted file mode 100644
index a73db8805ed8..000000000000
--- a/srcpkgs/glib-networking/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.[0-9]*[13579].*"
diff --git a/srcpkgs/gnome-control-center/update b/srcpkgs/gnome-control-center/update
deleted file mode 100644
index a73db8805ed8..000000000000
--- a/srcpkgs/gnome-control-center/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.[0-9]*[13579].*"
diff --git a/srcpkgs/gnome-desktop/update b/srcpkgs/gnome-desktop/update
deleted file mode 100644
index a73db8805ed8..000000000000
--- a/srcpkgs/gnome-desktop/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.[0-9]*[13579].*"
diff --git a/srcpkgs/gnome-online-accounts/update b/srcpkgs/gnome-online-accounts/update
deleted file mode 100644
index a84fbbad8b18..000000000000
--- a/srcpkgs/gnome-online-accounts/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="${GNOME_SITE}/$pkgname/cache.json"
-ignore="3.*[13579].*"
diff --git a/srcpkgs/gobject-introspection/update b/srcpkgs/gobject-introspection/update
deleted file mode 100644
index 0980963f6dfe..000000000000
--- a/srcpkgs/gobject-introspection/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="${GNOME_SITE}/$pkgname/cache.json"
-ignore="1.*[13579].*"
diff --git a/srcpkgs/gsettings-desktop-schemas/update b/srcpkgs/gsettings-desktop-schemas/update
deleted file mode 100644
index a73db8805ed8..000000000000
--- a/srcpkgs/gsettings-desktop-schemas/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.[0-9]*[13579].*"
diff --git a/srcpkgs/gsound/update b/srcpkgs/gsound/update
deleted file mode 100644
index a84fbbad8b18..000000000000
--- a/srcpkgs/gsound/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="${GNOME_SITE}/$pkgname/cache.json"
-ignore="3.*[13579].*"
diff --git a/srcpkgs/libgweather/update b/srcpkgs/libgweather/update
index a84fbbad8b18..e69de29bb2d1 100644
--- a/srcpkgs/libgweather/update
+++ b/srcpkgs/libgweather/update
@@ -1,2 +0,0 @@
-site="${GNOME_SITE}/$pkgname/cache.json"
-ignore="3.*[13579].*"
diff --git a/srcpkgs/mutter/update b/srcpkgs/mutter/update
deleted file mode 100644
index a84fbbad8b18..000000000000
--- a/srcpkgs/mutter/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="${GNOME_SITE}/$pkgname/cache.json"
-ignore="3.*[13579].*"
diff --git a/srcpkgs/simple-scan/update b/srcpkgs/simple-scan/update
deleted file mode 100644
index 92dea937506a..000000000000
--- a/srcpkgs/simple-scan/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[0-9].[0-9][13579]*"

From 50e5ad1c722301397d8ad3c6bdca678bc056f262 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:28 +0100
Subject: [PATCH 0612/3482] shiboken2: update to 5.15.2, testing support,
 remove dummy packages

add SHIBOKEN_CLANG_OPTIONS env variable support to manage crossbuild
---
 common/shlibs                                 |  2 -
 srcpkgs/libshiboken-python3                   |  1 -
 srcpkgs/python3-shiboken                      |  1 -
 ...ng-options-via-environment-variables.patch | 21 +++++
 .../patches/tests-need-python-modules.patch   | 13 +++
 .../patches/tests-python-syntax.patch         | 91 +++++++++++++++++++
 srcpkgs/shiboken2/template                    | 19 +---
 7 files changed, 128 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/libshiboken-python3
 delete mode 120000 srcpkgs/python3-shiboken
 create mode 100644 srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch
 create mode 100644 srcpkgs/shiboken2/patches/tests-need-python-modules.patch
 create mode 100644 srcpkgs/shiboken2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index f73bd5d4ed40..c6f930b953a3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1677,8 +1677,6 @@ libosmoctrl.so.0 libosmocore-0.7.0_1
 libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
-libshiboken-python2.7.so.1.2 libshiboken-python-1.2.2_2
-libshiboken-python3.6.so.1.2 libshiboken-python3-1.2.2_4
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
 libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
 libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
diff --git a/srcpkgs/libshiboken-python3 b/srcpkgs/libshiboken-python3
deleted file mode 120000
index b1fbca61c217..000000000000
--- a/srcpkgs/libshiboken-python3
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/python3-shiboken b/srcpkgs/python3-shiboken
deleted file mode 120000
index b1fbca61c217..000000000000
--- a/srcpkgs/python3-shiboken
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch b/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch
new file mode 100644
index 000000000000..f8724b96bfbb
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch
@@ -0,0 +1,21 @@
+Add ability to pass additional options to clang via environnement variable.
+With help from https://github.com/void-linux/void-packages/pull/26962
+
+--- sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
++++ sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
+@@ -305,6 +305,15 @@
+ QByteArrayList emulatedCompilerOptions()
+ {
+     QByteArrayList result;
++
++    QByteArray shiboken_clang_options = qgetenv("SHIBOKEN_CLANG_OPTIONS");
++    // split to avoid double quoting drived by space inside it
++    if (!shiboken_clang_options.isEmpty()) {
++      for (const QByteArray &item: shiboken_clang_options.split(' ')) {
++        result.append(item);
++      }
++    }
++
+ #if defined(Q_CC_MSVC)
+     HeaderPaths headerPaths;
+     result.append(QByteArrayLiteral("-fms-compatibility-version=19"));
diff --git a/srcpkgs/shiboken2/patches/tests-need-python-modules.patch b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
new file mode 100644
index 000000000000..24054690b09f
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
@@ -0,0 +1,13 @@
+tests need python modules that are not installed yet: so point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1429
+
+--- sources/shiboken2/tests/CMakeLists.txt.ORIG	2020-09-09 14:45:42.000000000 +0200
++++ sources/shiboken2/tests/CMakeLists.txt	2020-11-12 14:16:46.577206385 +0100
+@@ -53,6 +53,6 @@
+     list(FIND test_blacklist ${test_name} expect_fail)
+     add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file})
+-    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR}")
++    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR};PYTHONPATH=${shibokenmodule_BINARY_DIR}:${minimal_BINARY_DIR}:${sample_BINARY_DIR}:${other_BINARY_DIR}:${smart_BINARY_DIR}")
+     set_tests_properties(${test_name} PROPERTIES TIMEOUT ${CTEST_TESTING_TIMEOUT})
+     if (${expect_fail} GREATER -1)
+         set_tests_properties(${test_name} PROPERTIES WILL_FAIL TRUE)
diff --git a/srcpkgs/shiboken2/patches/tests-python-syntax.patch b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
new file mode 100644
index 000000000000..5151c3cc71aa
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
@@ -0,0 +1,91 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+upstream: yes
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index d0072254842e..6a7298d51d33 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,12 +1,11 @@
 # Template file for 'shiboken2'
 pkgname=shiboken2
-version=5.15.0
-revision=3
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/shiboken2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel"
 makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel
  libxslt-devel python3-numpy"
@@ -16,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 
 python_version=3
 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
@@ -50,15 +49,3 @@ python3-shiboken2_package() {
 		vmove ${py3_sitelib}
 	}
 }
-
-python3-shiboken_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}
-
-libshiboken-python3_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}

From 2f7f587547de78523d88081d50d96912ee947304 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:31 +0100
Subject: [PATCH 0613/3482] python3-pyside2: update to 5.15.2, testing support,
 remove dummy packages

---
 common/shlibs                                 |   2 -
 srcpkgs/libpyside-python3                     |   1 -
 srcpkgs/python3-pyenet                        |   1 -
 srcpkgs/python3-pyside                        |   1 -
 srcpkgs/python3-pyside-phonon                 |   1 -
 .../patches/crossbuild-for-shiboken2.patch    |  18 +--
 .../patches/tests-correct-build_dir.patch     |  14 +++
 .../patches/tests-disable-invalid-ones.patch  |  74 ++++++++++++
 ...tests-find-python-modules-from-build.patch |  21 ++++
 .../patches/tests-python-syntax.patch         | 106 ++++++++++++++++++
 srcpkgs/python3-pyside2/template              |  71 ++++++------
 11 files changed, 263 insertions(+), 47 deletions(-)
 delete mode 120000 srcpkgs/libpyside-python3
 delete mode 120000 srcpkgs/python3-pyenet
 delete mode 120000 srcpkgs/python3-pyside
 delete mode 120000 srcpkgs/python3-pyside-phonon
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index c6f930b953a3..48d6076467a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1678,8 +1678,6 @@ libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
-libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
-libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
 libpyside2.so.5.15 libpyside2-python3-5.15.0_1
 libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
 libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
diff --git a/srcpkgs/libpyside-python3 b/srcpkgs/libpyside-python3
deleted file mode 120000
index bb1745350a8d..000000000000
--- a/srcpkgs/libpyside-python3
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyenet b/srcpkgs/python3-pyenet
deleted file mode 120000
index bb1745350a8d..000000000000
--- a/srcpkgs/python3-pyenet
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside b/srcpkgs/python3-pyside
deleted file mode 120000
index bb1745350a8d..000000000000
--- a/srcpkgs/python3-pyside
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside-phonon b/srcpkgs/python3-pyside-phonon
deleted file mode 120000
index bb1745350a8d..000000000000
--- a/srcpkgs/python3-pyside-phonon
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
index 5a071a33d208..daad1fea7026 100644
--- a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
+++ b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
@@ -1,11 +1,11 @@
 --- sources/pyside2/cmake/Macros/PySideModules.cmake.ORIG
 +++ sources/pyside2/cmake/Macros/PySideModules.cmake
-@@ -123,7 +123,7 @@
-                         BYPRODUCTS ${${module_SOURCES}}
-                         COMMAND Shiboken2::shiboken2 ${GENERATOR_EXTRA_FLAGS}
-                         "${pyside2_BINARY_DIR}/${module_NAME}_global.h"
--                        --include-paths=${shiboken_include_dirs}
-+                        --include-paths=${shiboken_include_dirs}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include
-                         ${shiboken_framework_include_dirs_option}
-                         --typesystem-paths=${pyside_binary_dir}${PATH_SEP}${pyside2_SOURCE_DIR}${PATH_SEP}${${module_TYPESYSTEM_PATH}}
-                         --output-directory=${CMAKE_CURRENT_BINARY_DIR}
+@@ -94,7 +94,7 @@
+     # Workaround: Added ${QT_INCLUDE_DIR}/QtCore until
+     # qtdeclarative/8d560d1bf0a747bf62f73fad6b6774095442d9d2 has reached qt5.git
+     string(REPLACE ";" ${PATH_SEP} core_includes "${Qt5Core_INCLUDE_DIRS}")
+-    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes})
++    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include)
+     set(shiboken_framework_include_dirs_option "")
+     if(CMAKE_HOST_APPLE)
+         set(shiboken_framework_include_dirs "${QT_FRAMEWORK_INCLUDE_DIR}")
diff --git a/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
new file mode 100644
index 000000000000..540e4304958a
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
@@ -0,0 +1,14 @@
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/CMakeLists.txt.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/CMakeLists.txt	2020-11-24 11:42:34.629110123 +0100
+@@ -7,8 +7,7 @@
+ 
+     # BUILD_DIR and QT_DIR are used by init_paths.py for setting
+     # the path to the testbinding module
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
++    set(BUILD_DIR "${CMAKE_BINARY_DIR}")
+     set(QT_DIR "${_qt5Core_install_prefix}")
+ 
+     macro(TEST_QT_MODULE var name)
diff --git a/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
new file mode 100644
index 000000000000..ca4894b6fa99
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
@@ -0,0 +1,74 @@
+Disable failing tests. Almost of these are related to OpenGL that is
+unsupported by vnc virtual backend.
+
+Raw testing Status: 98% tests passed, 9 tests failed out of 471
+
+--- sources/pyside2/tests/QtDataVisualization/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtDataVisualization/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(datavisualization_test.py)
+--- sources/pyside2/tests/QtGui/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtGui/CMakeLists.txt
+@@ -20,14 +20,12 @@
+ PYSIDE_TEST(qcolor_test.py)
+ PYSIDE_TEST(qcolor_reduce_test.py)
+ PYSIDE_TEST(qcursor_test.py)
+-PYSIDE_TEST(qdatastream_gui_operators_test.py)
+ PYSIDE_TEST(qdesktopservices_test.py)
+ PYSIDE_TEST(qfontmetrics_test.py)
+ PYSIDE_TEST(qguiapplication_test.py)
+ PYSIDE_TEST(qicon_test.py)
+ PYSIDE_TEST(qitemselection_test.py)
+ PYSIDE_TEST(qmatrix_test.py)
+-PYSIDE_TEST(qopenglbuffer_test.py)
+ PYSIDE_TEST(qpainter_test.py)
+ PYSIDE_TEST(qpdfwriter_test.py)
+ PYSIDE_TEST(qpixelformat_test.py)
+--- sources/pyside2/tests/QtOpenGL/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtOpenGL/CMakeLists.txt
+@@ -1,2 +1 @@
+-PYSIDE_TEST(qglbuffer_test.py)
+ PYSIDE_TEST(qglwidget_test.py)
+--- sources/pyside2/tests/QtScriptTools/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtScriptTools/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(debugger_test.py)
+--- sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(web_engine_custom_scheme.py)
+--- sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(pyside-474-qtwebengineview.py)
+--- sources/pyside2/tests/QtWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWidgets/CMakeLists.txt
+@@ -6,7 +6,6 @@
+ PYSIDE_TEST(application_test.py)
+ PYSIDE_TEST(bug_172.py)
+ PYSIDE_TEST(bug_243.py)
+-PYSIDE_TEST(bug_307.py)
+ PYSIDE_TEST(bug_324.py)
+ PYSIDE_TEST(bug_338.py)
+ PYSIDE_TEST(bug_363.py)
+@@ -131,7 +131,6 @@
+ PYSIDE_TEST(qtoolbox_test.py)
+ PYSIDE_TEST(qvariant_test.py)
+ PYSIDE_TEST(qwidget_setlayout_test.py)
+-PYSIDE_TEST(qwidget_test.py)
+ PYSIDE_TEST(qcolormap_test.py)
+ PYSIDE_TEST(reference_count_test.py)
+ PYSIDE_TEST(signature_test.py)
+--- sources/pyside2/tests/registry/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/registry/CMakeLists.txt
+@@ -37,4 +37,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(existence_test.py)
diff --git a/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
new file mode 100644
index 000000000000..673998bc049d
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
@@ -0,0 +1,21 @@
+tests need python modules that are not installed yet: point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/init_paths.py.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/init_paths.py	2020-11-21 23:36:33.131282473 +0100
+@@ -75,12 +75,12 @@
+ 
+     python_dirs = [os.path.join(src_dir, 'util')]  # Helper module
+ 
+-    pyside_build_dir = os.path.join(get_build_dir(), 'pyside2')
+-    python_dirs.append(pyside_build_dir)   # for PySide2
++    pyside_build_dir = os.path.join(get_build_dir(), 'PySide2')
++    python_dirs.append(get_build_dir())   # for PySide2
+     lib_dirs = [os.path.join(pyside_build_dir, 'libpyside')]
+ 
+     if testbindings_module:
+-        python_dirs.append(os.path.join(pyside_build_dir,
++        python_dirs.append(os.path.join(get_build_dir(),
+                                         'tests', 'pysidetest'))
+         lib_dirs.append(_get_qt_lib_dir())
+ 
diff --git a/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
new file mode 100644
index 000000000000..2c2e13679071
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
@@ -0,0 +1,106 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+upstream: yes
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
+
+Fix python warning about 'is not' usage.
+This diff is DISTINCT from the previous patch
+
+--- sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-24 14:28:06.103093649 +0100
+@@ -73,7 +73,7 @@
+         self.assertTrue(not widget.isVisible())
+         widget.setVisible(True)
+         self.assertTrue(widget.isVisible())
+-        self.assertTrue(widget.winId() is not 0)
++        self.assertTrue(widget.winId() != 0)
+         # skip this test on macOS since no native events are received
+         if sys.platform == 'darwin':
+             return
diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template
index fe69087e4d06..6040ef39243c 100644
--- a/srcpkgs/python3-pyside2/template
+++ b/srcpkgs/python3-pyside2/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-pyside2'
 pkgname=python3-pyside2
-version=5.15.0
-revision=2
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF -DPYTHON_EXECUTABLE=/usr/bin/python"
+configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python"
 hostmakedepends="cmake python3 shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-multimedia-devel qt5-tools-devel qt5-plugin-mysql qt5-plugin-odbc
@@ -18,34 +18,61 @@ makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-serialport-devel
  $(vopt_if webengine 'qt5-webengine-devel')"
 depends="python3-shiboken2"
+checkdepends="python3-distro tzdata pulseaudio qt5-quickcontrols"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
+
+build_options="webengine"
+desc_option_webengine="Build Qt5 WebEngine bindings"
+
+subpackages="libpyside2-python3-devel libpyside2-python3"
 
 # needed by shiboken2 runtime
-export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
+export CLANG_INSTALL_DIR=/usr
 
 if [ ${CROSS_BUILD} ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools qt5-remoteobjects qt5-scxml"
 fi
 
-build_options="webengine"
-desc_option_webengine="Build Qt5 WebEngine bindings"
-
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	build_options_default="webengine"
+	if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
+		build_options_default="webengine"
+	fi
 fi
 
-subpackages="libpyside2-python3-devel libpyside2-python3 libpyside-python3
- python3-pyside python3-pyside-phonon python3-pyenet"
-
 if [ "$build_option_webengine" ]; then
 	subpackages+=" python3-pyside2-webengine"
 fi
 
+pre_build() {
+	if [ ${CROSS_BUILD} ]; then
+
+		# make clang of shiboken aware of crossbuild
+		SHIBOKEN_CLANG_OPTIONS="--target=${XBPS_CROSS_TRIPLET}"
+		SHIBOKEN_CLANG_OPTIONS+=" --sysroot=/usr/${XBPS_CROSS_TRIPLET}"
+
+		# qt5 is built with gcc, so shiboken's clang needs gcc corresponding headers
+		local gcc_ver="$(${XBPS_CROSS_TRIPLET}-gcc -dumpversion)"
+		local inc_root="/usr/${XBPS_CROSS_TRIPLET}/usr/include/c++/${gcc_ver}"
+
+		SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}"
+		SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}/${XBPS_CROSS_TRIPLET}"
+		# uneeded so far
+		SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}/backward"
+
+		export SHIBOKEN_CLANG_OPTIONS
+	fi
+}
+
+pre_check() {
+	# no virtual backend is fine for OpenGL, vnc is fine for Qml tests
+	export QT_QPA_PLATFORM=vnc
+}
+
 python3-pyside2-webengine_package() {
 	depends="python3-pyside2-${version}_${revision}"
 	short_desc+=" - WebEngine component"
@@ -73,23 +100,3 @@ libpyside2-python3_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
-libpyside-python3_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside-phonon_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyenet_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}

From 96821403b0ed61c7c5982d995ca1c525e2c6c069 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:33 +0100
Subject: [PATCH 0614/3482] pyside2-tools: update to 5.15.2, testing support

Closes: #26962 [via git-merge-pr]
---
 .../patches/tests-use-qt5-rcc-and-uic.patch   | 34 +++++++++++++++++++
 srcpkgs/pyside2-tools/template                | 10 ++++--
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch

diff --git a/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
new file mode 100644
index 000000000000..0dc0f0bfb119
--- /dev/null
+++ b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
@@ -0,0 +1,34 @@
+--- sources/pyside2-tools/tests/CMakeLists.txt
++++ sources/pyside2-tools/tests/CMakeLists.txt
+@@ -1,4 +1,11 @@
++
++# Since Qt v5.14, pyside2-uic and pyside2-rcc are directly provided by Qt5Core uic and rcc,
++# with '-g python' option
++
++FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic)
++FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc)
++
+ add_subdirectory(rcc)
+-add_test(QWizard ${SHIBOKEN_PYTHON_INTERPRETER} ${CMAKE_SOURCE_DIR}/pyside2-uic "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
++add_test(QWizard ${PYSIDE2UICBINARY} --generator=python "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
+ set_tests_properties(QWizard PROPERTIES
+                      ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}")
+--- sources/pyside2-tools/tests/rcc/CMakeLists.txt
++++ sources/pyside2-tools/tests/rcc/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ macro(ADD_RCC_TEST name pyfile qrcfile)
+     add_test(${name} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
+-                     ${PYSIDERCC_EXECUTABLE}
++                     ${PYSIDE2RCCBINARY}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${pyfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${qrcfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR})
+--- sources/pyside2-tools/tests/rcc/run_test.sh
++++ sources/pyside2-tools/tests/rcc/run_test.sh
+@@ -8,5 +8,5 @@
+ # $3: qrc file
+ 
+ export PYTHONPATH=$PYTHONPATH:`pwd`
+-$1 -o `basename $3 .qrc`_rc.py $3
++$1 --generator=python -o `basename $3 .qrc`_rc.py $3
+ `pkg-config shiboken2 --variable=python_interpreter` $2
diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template
index 4e9fa743c30f..7b49a46ec818 100644
--- a/srcpkgs/pyside2-tools/template
+++ b/srcpkgs/pyside2-tools/template
@@ -1,23 +1,27 @@
 # Template file for 'pyside2-tools'
 pkgname=pyside2-tools
-version=5.15.0
+version=5.15.2
 revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2-tools"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  libpyside2-python3-devel"
+checkdepends="pkg-config"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 python_version=3
 
 if [ ${CROSS_BUILD} ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
 fi
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}

From e241698557c93760b7ce389c39aa5459bbb478e1 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 27 Jan 2021 19:52:21 +0100
Subject: [PATCH 0615/3482] New package: libopenaptx-0.2.0.

---
 common/shlibs                |  1 +
 srcpkgs/libopenaptx-devel    |  1 +
 srcpkgs/libopenaptx/template | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 120000 srcpkgs/libopenaptx-devel
 create mode 100644 srcpkgs/libopenaptx/template

diff --git a/common/shlibs b/common/shlibs
index 48d6076467a6..1019bbbe54fd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4036,3 +4036,4 @@ libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
 libsixel.so.1 libsixel-1.8.6_1
 libpamtest.so.0 pam_wrapper-1.1.3_1
+libopenaptx.so.0 libopenaptx-0.2.0_1
diff --git a/srcpkgs/libopenaptx-devel b/srcpkgs/libopenaptx-devel
new file mode 120000
index 000000000000..2791f43ede1e
--- /dev/null
+++ b/srcpkgs/libopenaptx-devel
@@ -0,0 +1 @@
+libopenaptx
\ No newline at end of file
diff --git a/srcpkgs/libopenaptx/template b/srcpkgs/libopenaptx/template
new file mode 100644
index 000000000000..0f07b0b1a25d
--- /dev/null
+++ b/srcpkgs/libopenaptx/template
@@ -0,0 +1,21 @@
+# Template file for 'libopenaptx'
+pkgname=libopenaptx
+version=0.2.0
+revision=1
+build_style=gnu-makefile
+short_desc="Open Source implementation of Audio Processing Technology codec (aptX)"
+maintainer="Paper <paper@tilde.institute>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/pali/libopenaptx/"
+distfiles="https://github.com/pali/libopenaptx/releases/download/${version}/libopenaptx-${version}.tar.gz"
+checksum=51a13a34bb188a87ab1deb64a090ab42a4755d7b02c2bdaf3b8136f749b71b84
+
+libopenaptx-devel_package() {
+	depends="libopenaptx>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From ab7a34b6c4504215091eccd9fe881824bf538968 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 27 Jan 2021 19:52:42 +0100
Subject: [PATCH 0616/3482] pipewire: support aac, aptx, add translations

---
 srcpkgs/pipewire/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 79a4d0e28b56..e39d7ab0511f 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,14 +1,16 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.20
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false
  -Dbluez5=true -Dffmpeg=true -Dpipewire-alsa=true -Dpipewire-jack=true
  -Dudevrulesdir=/usr/lib/udev/rules.d"
-hostmakedepends="doxygen graphviz pkg-config xmltoman"
+hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
+# LDAC support can be enabled when ldacbt is packaged
 makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
- sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel"
+ sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel
+ libopenaptx-devel fdk-aac-devel"
 depends="libspa-alsa libspa-audioconvert libspa-audiomixer libspa-control"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="Kridsada Thanabulpong <sirn@ogsite.net>"

From 2a0e447a2e25b136a804be6fea18e9fe51148c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 28 Jan 2021 00:55:08 -0300
Subject: [PATCH 0617/3482] wxWidgets: fix some cross builds.

Same fix as applied to wxWidgets-gtk3 in aecd085a.
---
 srcpkgs/wxWidgets/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template
index bd43970594d7..d02563fa6bde 100644
--- a/srcpkgs/wxWidgets/template
+++ b/srcpkgs/wxWidgets/template
@@ -1,7 +1,7 @@
 # Template file for 'wxWidgets'
 pkgname=wxWidgets
 version=3.0.5.1
-revision=3
+revision=4
 configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack
  --with-libnotify --enable-mediactrl --with-gtk=2 --disable-webview"
 build_style=gnu-configure
@@ -44,10 +44,11 @@ post_install() {
 			${DESTDIR}/usr/lib/wx/config/${_config}
 
 	fi
-	sed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
+	vsed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
 		-e '/^bindir="\/usr/s,/usr,${exec_prefix},' \
 		-e 's/is_cross()  { .* }/is_cross() { false; }/g' \
 		-e '/--\*=\*)/i --host=\*) continue;;' \
+		-e "s/lib${XBPS_WORDSIZE}/lib/g" \
 		${DESTDIR}/usr/lib/wx/config/${_config}
 	ln -sf ../lib/wx/config/${_config} ${PKGDESTDIR}/usr/bin/wx-config-3.0
 	ln -sf wx-config-3.0 ${DESTDIR}/usr/bin/wx-config

From d2cec3d58d3ff397ae3d140f5c29fc935db2cf95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 31 Dec 2020 15:30:06 -0300
Subject: [PATCH 0618/3482] musl: remove repository config file and clean up.

- musl doesn't need kernel-libc-headers in order to be built
- no need to conflict with glibc, since it can't be built for *-musl
targets
- the repository config file will be created in xbps instead, but it
isn't even truly needed, since XBPS "knows" when it was built for musl
---
 srcpkgs/musl/template | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a6a49ff3d055..5ba5425709b0 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,19 +2,17 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=5
+revision=6
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--prefix=/usr --disable-gcc-wrapper"
-makedepends="kernel-libc-headers"
 short_desc="Musl C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="http://www.musl-libc.org/"
 distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
 checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
-conflicts="glibc>=0"
 
 nostrip_files="libc.so"
 shlib_provides="libc.so"
@@ -27,7 +25,7 @@ post_build() {
 do_install() {
 	# Move everything to /usr.
 	vmkdir usr/lib
-	ln -sfr ${DESTDIR}/usr/lib ${DESTDIR}/lib
+	ln -s usr/lib ${DESTDIR}/lib
 	make DESTDIR=${DESTDIR} install
 	rm ${DESTDIR}/lib
 	# provide ldd
@@ -41,9 +39,7 @@ do_install() {
 	vman ${FILESDIR}/getconf.1
 	# Fake ldconfig
 	ln -s true ${DESTDIR}/usr/bin/ldconfig
-	# Create xbps.d(5) arch override file
-	vmkdir usr/share/xbps.d
-	echo "architecture=${XBPS_TARGET_MACHINE}" > ${DESTDIR}/usr/share/xbps.d/musl-arch.conf
+
 	vlicense COPYRIGHT
 }
 
@@ -52,7 +48,7 @@ musl-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.o
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.o"
 	}
 }

From 8cc225713343f24a07de7c2d0cc277c37dd9d3d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 31 Dec 2020 15:33:52 -0300
Subject: [PATCH 0619/3482] xbps: add architecture file for all archs.

This adds an equivalent for the musl-arch.conf file that was previously
contained in the musl package. No need to special case musl, so add it
for all archs.
---
 srcpkgs/xbps/template | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 66deab88d1bd..e43050da90e3 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=2
+revision=3
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -33,21 +33,23 @@ fi
 do_configure() {
 	./configure --prefix=/usr --sysconfdir=/etc ${CHROOT_READY:+--enable-tests}
 }
+
 post_install() {
+	local _repo="repository=https://alpha.de.repo.voidlinux.org" _suffix=
 	case "$XBPS_TARGET_MACHINE" in
 	aarch64*) # XXX different repo location
-		echo "repository=https://alpha.de.repo.voidlinux.org/current/aarch64" > \
-			${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
+		_suffix="/aarch64"
 		;;
 	*-musl) # XXX different repo location
-		echo "repository=https://alpha.de.repo.voidlinux.org/current/musl" > \
-			${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
-		;;
-	*)
-		echo "repository=https://alpha.de.repo.voidlinux.org/current" > \
-			${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
+		_suffix="/musl"
 		;;
 	esac
+
+	echo "${_repo}/current${_suffix}" > \
+		${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
+	echo "architecture=${XBPS_TARGET_MACHINE}" > \
+		${DESTDIR}/usr/share/xbps.d/xbps-arch.conf
+
 	vlicense LICENSE
 	vlicense LICENSE.3RDPARTY
 }
@@ -58,6 +60,7 @@ libxbps_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
+
 libxbps-devel_package() {
 	short_desc+=" - runtime library (development files)"
 	depends="${makedepends} libxbps>=${version}_${revision}"

From c3a41e9a227c37fd998f65d11960d365903a5037 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 17:27:23 +0100
Subject: [PATCH 0620/3482] mc: update to 4.8.26.

Also fix homepage.

Closes: #28175 [via git-merge-pr]
---
 srcpkgs/mc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index 46ddd9d74e77..ebf5141eb482 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -1,6 +1,6 @@
 # Template file for 'mc'
 pkgname=mc
-version=4.8.25
+version=4.8.26
 revision=1
 build_style=gnu-configure
 configure_args="--with-screen=slang --without-x"
@@ -9,10 +9,10 @@ makedepends="e2fsprogs-devel gpm-devel libglib-devel libssh2-devel slang-devel"
 short_desc="User-friendly file manager and visual shell"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-or-later"
-homepage="http://www.ibiblio.org/mc/"
-distfiles="http://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
+homepage="https://midnight-commander.org/"
+distfiles="https://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
 #distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz"
-checksum=ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a
+checksum=c6deadc50595f2d9a22dc6c299a9f28b393e358346ebf6ca444a8469dc166c27
 python_version=2
 
 conf_files="

From b7da10b1a51e725c24122d09399fe9a1d5a710c6 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sun, 24 Jan 2021 19:51:36 +0000
Subject: [PATCH 0621/3482] backupninja: update to 1.2.0.

---
 srcpkgs/backupninja/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/backupninja/template b/srcpkgs/backupninja/template
index a74415a1eb37..02a69d1dca9c 100644
--- a/srcpkgs/backupninja/template
+++ b/srcpkgs/backupninja/template
@@ -1,6 +1,6 @@
 # Template file for 'backupninja'
 pkgname=backupninja
-version=1.1.0
+version=1.2.1
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -9,9 +9,9 @@ depends="dialog"
 short_desc="Lightweight, extensible meta-backup system"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://0xacab.org/riseuplabs/backupninja"
-distfiles="https://0xacab.org/riseuplabs/${pkgname}/-/archive/${pkgname}-${version}/${pkgname}-${pkgname}-${version}.tar.gz"
-checksum=43737a4c1dc0e109087de82ee9817f5d4883fdbcfb86743265c83ff0c7243ad0
+homepage="https://0xacab.org/liberate/backupninja"
+distfiles="https://0xacab.org/liberate/backupninja/-/archive/${pkgname}-${version}/${pkgname}-${pkgname}-${version}.tar.gz"
+checksum=cfd94891c27d1b861bf8fbd9990673f9bc2bce78872976ee1cb4d068f1c4cd6c
 
 conf_files="/etc/backupninja.conf"
 make_dirs="/etc/backup.d 0750 root root"
@@ -19,4 +19,3 @@ make_dirs="/etc/backup.d 0750 root root"
 pre_configure() {
 	./autogen.sh
 }
-

From 22a3f3de658262b6706efaf1d4f01fee029254fe Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 25 Jan 2021 23:51:26 +0200
Subject: [PATCH 0622/3482] os-prober: update to 1.78.

---
 srcpkgs/os-prober/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template
index 6d9042157007..f22ca4e63e9b 100644
--- a/srcpkgs/os-prober/template
+++ b/srcpkgs/os-prober/template
@@ -1,7 +1,7 @@
 # Template file for 'os-prober'
 pkgname=os-prober
-version=1.77
-revision=2
+version=1.78
+revision=1
 build_style=gnu-makefile
 make_dirs="/var/lib/os-prober 0755 root root"
 short_desc="Utility to detect other OSes on a set of drives"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/sid/os-prober"
 distfiles="${DEBIAN_SITE}/main/o/${pkgname}/${pkgname}_${version}.tar.xz"
-checksum=8d8ea4afbe1aeef3c8b73f74a0fb37b06185e21a6abc78f80fc2160009cf705f
+checksum=6e909f511035698145ba01ad63fd53fce6ee24529c76e2698e346bbac49950e9
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) _ARCH="x86";;

From 4cccb3443bd2d8a598e2559945f4a5ef74144956 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 26 Jan 2021 17:34:18 +0300
Subject: [PATCH 0623/3482] grub-btrfs: update to 4.8

---
 srcpkgs/grub-btrfs/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-btrfs/template b/srcpkgs/grub-btrfs/template
index acc3597a8158..fd8efe3b657e 100644
--- a/srcpkgs/grub-btrfs/template
+++ b/srcpkgs/grub-btrfs/template
@@ -1,6 +1,6 @@
 # Template file for 'grub-btrfs'
 pkgname=grub-btrfs
-version=4.6
+version=4.8
 revision=1
 build_style=gnu-makefile
 depends="grub bash"
@@ -9,4 +9,8 @@ maintainer="Anjandev Momi <anjan@momi.ca>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Antynea/grub-btrfs"
 distfiles="https://github.com/Antynea/grub-btrfs/archive/v${version}.tar.gz"
-checksum=6c32be223344a77807e70dfd47846f1986da618b0050c494725222b287240f71
+checksum=78ba3c0e5c998317785d07409c6aaebb269fad1fe97794c95a0842f012676794
+
+post_install() {
+	rm -rf -- "${DESTDIR}"/usr/lib/systemd
+}

From 9be051e34f76db3448d48a3653aa8de8d957d791 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Tue, 26 Jan 2021 16:24:33 +0100
Subject: [PATCH 0624/3482] yq-go: update to 4.4.1.

---
 srcpkgs/yq-go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index d0ce82119de7..e48daf02eae4 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,6 +1,6 @@
 # Template file for 'yq-go'
 pkgname=yq-go
-version=4.4.0
+version=4.4.1
 revision=1
 wrksrc="yq-${version}"
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/mikefarah/yq"
 distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
-checksum=bd87dad46efbe333d0ed2da0b142e429833259d02d6310d97c95704ea0430a83
+checksum=bdd078847a74245e4c09af3dc31cdb482588398f342a8db4c019115a8495ebad
 
 do_check() {
 	go test -v

From e612afe4f36eefcbbca90ed2279d186a6f06ee87 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 26 Jan 2021 19:40:24 +0100
Subject: [PATCH 0625/3482] smenu: update to 0.9.16.

---
 srcpkgs/smenu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/smenu/template b/srcpkgs/smenu/template
index 1d295cb5e85f..4a8316bc9577 100644
--- a/srcpkgs/smenu/template
+++ b/srcpkgs/smenu/template
@@ -1,6 +1,6 @@
 # Template file for 'smenu'
 pkgname=smenu
-version=0.9.15
+version=0.9.16
 revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
@@ -9,6 +9,6 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/p-gen/smenu"
 distfiles="https://github.com/p-gen/smenu/archive/v${version}.tar.gz"
-checksum=f42b24e06b0688176e485fe9873d720b8f0d01880ca7de869fca83163033a337
+checksum=8db8026a8d95f01b9a4b775834432b15cfd248868ef2a2ec1232bd534d26dc09
 
 LDFLAGS="-lncurses"

From 14b777a912523a94971e838d9e9b001205feadd1 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Tue, 26 Jan 2021 18:06:36 -0600
Subject: [PATCH 0626/3482] kubernetes-kind: update to 0.10.0.

---
 srcpkgs/kubernetes-kind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template
index 4b4844a40018..4bc298a46685 100644
--- a/srcpkgs/kubernetes-kind/template
+++ b/srcpkgs/kubernetes-kind/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes-kind'
 pkgname=kubernetes-kind
-version=0.9.0
+version=0.10.0
 revision=1
 wrksrc="kind-${version}"
 build_style=go
@@ -10,4 +10,4 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
 license="Apache-2.0"
 homepage="https://kind.sigs.k8s.io/"
 distfiles="https://github.com/kubernetes-sigs/kind/archive/v${version}.tar.gz"
-checksum=@83a2712ca614629596810a59ff62c8a504a962e7528f97fb5d2842466045d6cd
+checksum=@e5511659e3e1735531d4845405782d869d4fb425b545ea89151fd76208a12a49

From 8c680805b02caf74224e57f9622a181d189fc937 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Wed, 27 Jan 2021 16:24:01 +0100
Subject: [PATCH 0627/3482] pgn-extract: update to 21.02

---
 srcpkgs/pgn-extract/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgn-extract/template b/srcpkgs/pgn-extract/template
index 5e89f985a3c9..425a5b33654f 100644
--- a/srcpkgs/pgn-extract/template
+++ b/srcpkgs/pgn-extract/template
@@ -1,6 +1,6 @@
 # Template file for 'pgn-extract'
 pkgname=pgn-extract
-version=20.06
+version=21.02
 revision=1
 wrksrc="pgn-extract"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.cs.kent.ac.uk/people/staff/djb/pgn-extract/"
 changelog="https://www.cs.kent.ac.uk/people/staff/djb/pgn-extract/changes.html"
 distfiles="https://www.cs.kent.ac.uk/~djb/pgn-extract/pgn-extract-${version/./-}.tgz"
-checksum=24013516be7da92dd329f8bf1755ab022e564236411c0e47718de5957a5c383b
+checksum=311942009042a2b21dfb015caa777bf85f425a3ffe7f43ced50acd6aab99543b
 
 post_extract() {
 	sed -i '/^CC=/d' Makefile

From bb00def195ff616888a2a605c2794ba420600cb0 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 27 Jan 2021 18:21:09 +0100
Subject: [PATCH 0628/3482] chafa: update to 1.6.0.

---
 srcpkgs/chafa/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chafa/template b/srcpkgs/chafa/template
index bc8011c05142..6153df30ecb3 100644
--- a/srcpkgs/chafa/template
+++ b/srcpkgs/chafa/template
@@ -1,7 +1,7 @@
 # Template file for 'chafa'
 pkgname=chafa
-version=1.4.1
-revision=2
+version=1.6.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libglib-devel libmagick-devel libXext-devel libxml2-devel"
@@ -10,7 +10,7 @@ maintainer="Christian Buschau <christian.buschau@mailbox.org>"
 license="LGPL-3.0-or-later"
 homepage="https://hpjansson.org/chafa/"
 distfiles="https://hpjansson.org/chafa/releases/chafa-${version}.tar.xz"
-checksum=46d34034f4c96d120e0639f87a26590427cc29e95fe5489e903a48ec96402ba3
+checksum=0706e101a6e0e806335aeb57445e2f6beffe0be29a761f561979e81691c2c681
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*) ;;

From 12c39d131110268aa582f14daa7d09a7a831d062 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 17:28:09 +0100
Subject: [PATCH 0629/3482] libgpg-error: update to 1.41.

---
 srcpkgs/libgpg-error/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template
index 0b1607940a65..dbccf9aecf65 100644
--- a/srcpkgs/libgpg-error/template
+++ b/srcpkgs/libgpg-error/template
@@ -1,6 +1,6 @@
 # Template file for 'libgpg-error'
 pkgname=libgpg-error
-version=1.39
+version=1.41
 revision=1
 build_style=gnu-configure
 short_desc="Library for error values used by GnuPG component"
@@ -9,7 +9,7 @@ license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://www.gnupg.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2
  https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob_plain;f=src/gen-lock-obj.sh;h=13858cfbf6c5f69f5f5fd64cd6fcc6a6c80eca3b>gen-lock-obj.sh"
-checksum="4a836edcae592094ef1c5a4834908f44986ab2b82e0824a0344b49df8cdb298f
+checksum="64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742
  83892a9ebe3e19e8fd754a7ad02b6c81240e64554aab6490a4ea5aa36ea49a81"
 skip_extraction="gen-lock-obj.sh"
 

From 023908805e55d2ce1c9b2f64c1acbba7186d1f58 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 27 Jan 2021 19:54:05 +0100
Subject: [PATCH 0630/3482] dex: update to 0.9.0.

---
 srcpkgs/dex/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dex/template b/srcpkgs/dex/template
index 1279d5df3663..dcd799f7ed0a 100644
--- a/srcpkgs/dex/template
+++ b/srcpkgs/dex/template
@@ -1,7 +1,7 @@
 # Template file for 'dex'
 pkgname=dex
-version=0.8.0
-revision=3
+version=0.9.0
+revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
 hostmakedepends="python3-Sphinx"
@@ -11,7 +11,7 @@ maintainer="Alain Kalker <a.c.kalker@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jceb/dex"
 distfiles="https://github.com/jceb/dex/archive/v${version}.tar.gz"
-checksum=cca8ade3dcc949d00f358410a9a5c2685b5dbe6501af630826a7049167503d23
+checksum=e49e9891089f2db1959c93c4c7b5fbeb3ffae23aaa3093caafd3dac5a4f03c3e
 
 post_install() {
 	rm ${DESTDIR}/usr/share/doc/${pkgname}/LICENSE

From ac4e9230cf80d3cf8738ce964fd3efe775e0551e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 26 Jan 2021 00:08:20 +0200
Subject: [PATCH 0631/3482] pigz: update to 2.5, xlint fixes.

---
 srcpkgs/pigz/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pigz/template b/srcpkgs/pigz/template
index 3286a4524c10..ada5263a6e6c 100644
--- a/srcpkgs/pigz/template
+++ b/srcpkgs/pigz/template
@@ -1,14 +1,14 @@
 # Template file for 'pigz'
 pkgname=pigz
-version=2.4
+version=2.5
 revision=1
 makedepends="zlib-devel"
-short_desc="A parallel implementation of gzip"
+short_desc="Parallel implementation of gzip"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="Zlib"
 homepage="http://zlib.net/pigz/"
-license="zlib"
 distfiles="http://zlib.net/pigz/pigz-${version}.tar.gz"
-checksum=a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73
+checksum=a006645702caaecace633a89eb5c371482b44a48d04f34e0058e2b85d75d4c36
 
 post_extract() {
 	sed -i '/CC.*-o/{s/$(LDFLAGS)//; s/$/ $(LDFLAGS)/}' Makefile

From 062a4f66166910060ddf7804361e21c268c3b65c Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sat, 23 Jan 2021 14:55:42 +0000
Subject: [PATCH 0632/3482] pianobar: update to 2020.11.28.

---
 srcpkgs/pianobar/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template
index 7fa56729fbcf..652db15ba46b 100644
--- a/srcpkgs/pianobar/template
+++ b/srcpkgs/pianobar/template
@@ -1,18 +1,18 @@
 # Template file for 'pianobar'
 pkgname=pianobar
-version=2020.04.05
-revision=2
+version=2020.11.28
+revision=1
 build_style=gnu-makefile
 make_build_args="V=1"
 hostmakedepends="pkg-config"
 makedepends="faad2-devel ffmpeg-devel gnutls-devel json-c-devel libao-devel
  libcurl-devel"
 short_desc="Free/open-source, console-based client for Pandora radio"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <void@uw.anonaddy.com>"
 license="MIT"
 homepage="https://6xq.net/pianobar/"
 distfiles="https://github.com/PromyLOPh/pianobar/archive/${version}.tar.gz"
-checksum=cb319b56ee4163ac040be1844e04de37f94d8e8b058f3bf9500ed380fe385883
+checksum=f8cdd564e2a12ee0740c54e8bc4028b328e9afb041d9ea40bcb762e08034b9e9
 
 post_install() {
 	vlicense COPYING

From 5063f57fde988c2b714933a47519536ef497db87 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 21 Jan 2021 21:08:13 +0000
Subject: [PATCH 0633/3482] protonvpn-cli: update to 2.2.6.

---
 srcpkgs/protonvpn-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 5935d7b4860e..04425cc36211 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.4
-revision=2
+version=2.2.6
+revision=1
 wrksrc="linux-cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,4 +12,4 @@ maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
 distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
-checksum=d7deff214118ba0b38a6eac697f8148f99b1e50e1404021b45f9f4749ea81fe8
+checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e

From a98ce4d9ec4e99ed9062aedf9f6de28a72f5cb73 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 21 Jan 2021 09:46:56 +0100
Subject: [PATCH 0634/3482] dash: update to 0.5.11.3.

---
 srcpkgs/dash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dash/template b/srcpkgs/dash/template
index c0da5791f56d..427bcb4fe6c3 100644
--- a/srcpkgs/dash/template
+++ b/srcpkgs/dash/template
@@ -1,6 +1,6 @@
 # Template file for 'dash'
 pkgname=dash
-version=0.5.11.2
+version=0.5.11.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://gondor.apana.org.au/~herbert/dash/"
 distfiles="http://gondor.apana.org.au/~herbert/dash/files/$pkgname-$version.tar.gz"
-checksum=00fb7d68b7599cc41ab151051c06c01e9500540183d8aa72116cb9c742bd6d5f
+checksum=62b9f1676ba6a7e8eaec541a39ea037b325253240d1f378c72360baa1cbcbc2a
 register_shell="/usr/bin/sh /usr/bin/dash /bin/sh /bin/dash"
 
 alternatives="

From 25880065032e1970c31dc7196504376181c7e0ba Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur <hervyqa@pm.me>
Date: Fri, 22 Jan 2021 09:39:34 +0700
Subject: [PATCH 0635/3482] dispcalGUI: fix crash, add python-dbus to
 depedencies

Closes #28095
---
 srcpkgs/dispcalGUI/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dispcalGUI/template b/srcpkgs/dispcalGUI/template
index 60dda09a12d9..1bb51316a5d1 100644
--- a/srcpkgs/dispcalGUI/template
+++ b/srcpkgs/dispcalGUI/template
@@ -1,13 +1,13 @@
 # Template file for 'dispcalGUI'
 pkgname=dispcalGUI
 version=3.8.9.3
-revision=3
+revision=4
 _name="DisplayCAL"
 wrksrc="${_name}-${version}"
 build_style=python2-module
 hostmakedepends="python"
 makedepends="python-devel libXxf86vm-devel libXinerama-devel libXrandr-devel"
-depends="python-numpy wxPython argyllcms"
+depends="python-dbus python-numpy wxPython argyllcms"
 short_desc="Display Calibration and Characterization"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-or-later"

From eada35004caf5473e5a85f3fe7534e7f980987a4 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 16:50:57 +0100
Subject: [PATCH 0636/3482] haproxy: update to 2.3.4.

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b977a92ab523..6bd82107a256 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.3.2
+version=2.3.4
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=99cb73bb791a2cd18898d0595e14fdc820a6cbd622c762f4ed83f2884d038fd5
+checksum=60148cdfedd6b19c401dbcd75ccd76a53c20bc76c49032ba32af98a0a5c495ed
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"

From 44b41280c7f8742355821fe890cf25105793bd02 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sun, 24 Jan 2021 17:05:56 +0000
Subject: [PATCH 0637/3482] OTPClient: update to 2.4.1.

---
 srcpkgs/OTPClient/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index a881dbe502bc..67c6e9cb88c9 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,14 +1,14 @@
 # Template file for 'OTPClient'
 pkgname=OTPClient
-version=2.3.2
+version=2.4.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
  libzip-devel libcotp-devel libzbar-devel jansson-devel"
 short_desc="Highly secure and easy to use GTK+ OTP client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/paolostivanin/OTPClient"
 distfiles="https://github.com/paolostivanin/OTPClient/archive/v${version}.tar.gz"
-checksum=329161b2c266624f23b56d32254e2205d8916772c5632141be1d81db4136231f
+checksum=e505f4ebba92342f4029c1d49167bc346cbb2295e2379cb6b7b232f837011520

From 04f16ff56b37367c39080151efc9b57b22fdc713 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Sat, 23 Jan 2021 13:54:00 -0800
Subject: [PATCH 0638/3482] allegro5: update to 5.2.6.0.

Bump version, and add opus/opusfile as makedepends to activate the opus allegro code.
---
 srcpkgs/allegro5/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/allegro5/template b/srcpkgs/allegro5/template
index 467514aef26b..f55a7eb6c144 100644
--- a/srcpkgs/allegro5/template
+++ b/srcpkgs/allegro5/template
@@ -1,7 +1,7 @@
 # Template file for 'allegro5'
 pkgname=allegro5
-version=5.2.5.0
-revision=2
+version=5.2.6.0
+revision=1
 wrksrc="allegro-${version}"
 build_style=cmake
 configure_args="-DWANT_DOCS=1 -DWANT_PHYSFS=1"
@@ -9,14 +9,14 @@ hostmakedepends="pkg-config"
 makedepends="zlib-devel alsa-lib-devel jack-devel libXpm-devel libXxf86vm-devel
  libXxf86dga-devel libXcursor-devel libvorbis-devel libpng-devel glu-devel
  libjpeg-turbo-devel libtheora-devel freetype-devel libflac-devel physfs-devel
- libopenal-devel gtk+-devel"
+ libopenal-devel gtk+-devel opus-devel opusfile-devel"
 depends="virtual?libGL"
 short_desc="Portable library mainly aimed at video game and multimedia programming"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="Allegro License (MIT alike)"
 homepage="https://liballeg.org/"
 distfiles="https://github.com/liballeg/allegro5/releases/download/${version}/allegro-${version}.tar.gz"
-checksum=59968da34a0353913868b8299aaff9520d19a3b0960c6406be8323a6ac9bb719
+checksum=5de8189ec051e1865f359654f86ec68e2a12a94edd00ad06d1106caa5ff27763
 
 post_install() {
 	vlicense LICENSE.txt

From 228fc32b27e8ea9c0bdbe11c94496551941b0a51 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sat, 23 Jan 2021 20:37:21 +0000
Subject: [PATCH 0639/3482] hidapi: update to 0.10.1.

---
 srcpkgs/hidapi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hidapi/template b/srcpkgs/hidapi/template
index 932975d77727..b86222c77de1 100644
--- a/srcpkgs/hidapi/template
+++ b/srcpkgs/hidapi/template
@@ -1,17 +1,17 @@
 # Template file for 'hidapi'
 pkgname=hidapi
-version=0.9.0
+version=0.10.1
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="eudev-libudev-devel libusb-devel"
 short_desc="Simple library for communicating with USB and Bluetooth HID devices"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <void@uw.anonaddy.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/libusb/hidapi"
 distfiles="https://github.com/libusb/hidapi/archive/hidapi-${version}.tar.gz"
-checksum=630ee1834bdd5c5761ab079fd04f463a89585df8fcae51a7bfe4229b1e02a652
+checksum=f71dd8a1f46979c17ee521bc2117573872bbf040f8a4750e492271fc141f2644
 
 pre_configure() {
 	./bootstrap

From 917c38ffab195fb2dfb806bc94e4cfe2ae3cf302 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 27 Jan 2021 17:11:07 +0200
Subject: [PATCH 0640/3482] xreader: update to 2.8.3.

---
 srcpkgs/xreader/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 025cdcb852ea..4f5118e53044 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,6 +1,6 @@
 # Template file for 'xreader'
 pkgname=xreader
-version=2.6.4
+version=2.8.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,11 +15,17 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/xreader"
 distfiles="https://github.com/linuxmint/xreader/archive/${version}.tar.gz"
-checksum=7e2f833669345a396448f475213637f31dff6c45a57b25badb1c13e28a289b10
+checksum=48d624e3844d614ea5c6a4c97220e31411800dee8a55f394add0871b0573b3cb
 
 build_options="gir"
 build_options_default="gir"
 
+do_check() {
+	# XX dogtail is needed for testing (not in repo)
+	# XX tests need xorg running
+	:
+}
+
 libxreader_package() {
 	short_desc+=" - shared library"
 	pkg_install() {

From 53fa464e33d18597c768050fa4b13a6b8712147b Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 26 Dec 2020 18:50:34 +1100
Subject: [PATCH 0641/3482] lxd-lts: update to 4.0.4.

---
 srcpkgs/lxd-lts/template | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/lxd-lts/template b/srcpkgs/lxd-lts/template
index 12a119181f2b..42e8a958093f 100644
--- a/srcpkgs/lxd-lts/template
+++ b/srcpkgs/lxd-lts/template
@@ -1,6 +1,6 @@
 # Template file for 'lxd-lts'
 pkgname=lxd-lts
-version=4.0.2
+version=4.0.4
 revision=1
 wrksrc="lxd-$version"
 build_style=go
@@ -16,14 +16,11 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://linuxcontainers.org/lxd"
 distfiles="https://linuxcontainers.org/downloads/lxd/${wrksrc}.tar.gz"
-checksum=8b712588e383c4326c27cfec5dd2c9fd4c9a4597f82549f55b1909e799f55e13
+checksum=372a666b84c7cbcb7ccbffbf4aa04a05b2fe22e5e0aafa022b700bbf211557f6
 conflicts="lxd"
 provides="lxd-${version}_${revision}"
 system_groups="lxd"
 
-_libdir="/usr/lib/sqlite-replication"
-LDFLAGS="-L${XBPS_CROSS_BASE}${_libdir} -Wl,-R${_libdir}"
-
 do_configure() {
 	# the LXD tarball packages up the required dependencies
 	ln -s "$wrksrc/_dist" "$GOPATH"

From faf9b636005f0f2a24fc24c981ec5c8469f4e96e Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 26 Dec 2020 18:59:08 +1100
Subject: [PATCH 0642/3482] sqlite-replication: remove.

No longer required now that dqlite uses mainline sqlite.
---
 srcpkgs/sqlite-replication-bin      |  1 -
 srcpkgs/sqlite-replication-devel    |  1 -
 srcpkgs/sqlite-replication/template | 67 -----------------------------
 3 files changed, 69 deletions(-)
 delete mode 120000 srcpkgs/sqlite-replication-bin
 delete mode 120000 srcpkgs/sqlite-replication-devel
 delete mode 100644 srcpkgs/sqlite-replication/template

diff --git a/srcpkgs/sqlite-replication-bin b/srcpkgs/sqlite-replication-bin
deleted file mode 120000
index 33558ee2d694..000000000000
--- a/srcpkgs/sqlite-replication-bin
+++ /dev/null
@@ -1 +0,0 @@
-sqlite-replication
\ No newline at end of file
diff --git a/srcpkgs/sqlite-replication-devel b/srcpkgs/sqlite-replication-devel
deleted file mode 120000
index 33558ee2d694..000000000000
--- a/srcpkgs/sqlite-replication-devel
+++ /dev/null
@@ -1 +0,0 @@
-sqlite-replication
\ No newline at end of file
diff --git a/srcpkgs/sqlite-replication/template b/srcpkgs/sqlite-replication/template
deleted file mode 100644
index c0b40e5909a3..000000000000
--- a/srcpkgs/sqlite-replication/template
+++ /dev/null
@@ -1,67 +0,0 @@
-# Template file for 'sqlite-replication'
-pkgname=sqlite-replication
-version=3.32.3
-revision=2
-wrksrc="sqlite-version-${version}-replication4"
-build_style=gnu-configure
-configure_args="--enable-replication --enable-threadsafe --enable-fts5
- --enable-dynamic-extensions"
-hostmakedepends="tcl"
-makedepends="libedit-devel"
-short_desc="Replication Enabled SQL Database Engine in a C Library"
-maintainer="Cameron Nemo <cnemo@tutanota.com>"
-license="Public Domain"
-homepage="https://github.com/canonical/sqlite"
-distfiles="${homepage}/archive/version-${version}+replication4.tar.gz"
-checksum=8caab8703e8b7314e93dfcd6aa09ff306e416fb398bf421f194368ced821d4e6
-shlib_provides="libsqlite3.so.0"
-
-CFLAGS+="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
- -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \
- -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 \
- -DSQLITE_ENABLE_FTS3_TOKENIZER=1 -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE=1"
-# explicitly enable fdatasync
-CFLAGS+=" -DHAVE_FDATASYNC"
-disable_parallel_build=yes
-
-# explicitly set byte order to avoid bad autodetection macros
-case "$XBPS_TARGET_ENDIAN" in
-    le) CFLAGS+=" -DSHA3_BYTEORDER=1234 -DSQLITE_BYTEORDER=1234";;
-    be) CFLAGS+=" -DSHA3_BYTEORDER=4321 -DSQLITE_BYTEORDER=4321";;
-esac
-
-pre_configure() {
-	sed -i -e 's/ -ltinfo//g' configure
-}
-
-do_configure() {
-	./configure ${configure_args} \
-		--libdir=/usr/lib${XBPS_TARGET_WORDSIZE}/sqlite-replication
-}
-
-post_install() {
-	local libdir="usr/lib${XBPS_TARGET_WORDSIZE}"
-	vmkdir "${libdir}/pkgconfig"
-	mv "${DESTDIR}/${libdir}"{/sqlite-replication,}/pkgconfig/sqlite3.pc
-	# Alpine just deletes the binary, but someone may want it for debugging
-	mv "$DESTDIR"/usr/bin/sqlite3{,.sqlite-replication}
-}
-
-sqlite-replication-devel_package() {
-	depends="sqlite-replication>=${version}_${revision}"
-	conflicts="sqlite-devel>=0"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/sqlite-replication/*.a"
-		vmove "usr/lib/sqlite-replication/*.so"
-	}
-}
-
-sqlite-replication-bin_package() {
-	short_desc+=" - cli tool"
-	pkg_install() {
-		vmove usr/bin
-	}
-}

From 50864d3c1a26b187c7c9a971a19c4e191a6939ae Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 23 Jan 2021 08:40:57 +1100
Subject: [PATCH 0643/3482] removed-packages: add sqlite-replication.

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d8b7edf40b22..30b4ac8b2bd6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=15
+revision=16
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -175,6 +175,7 @@ replaces="
  skypetab-ng<=20150201_3
  soulseekqt<=20160117_2
  spacefm-ng<=1.0.6_3
+ sqlite-replication<=3.32.3_2
  ttyload-git<=20141117_4
  tuxc<=1.1_3
  urlmatch-git<=20141116_2

From 541932f993ad9c064994148f9f1fe0ad045f71aa Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 28 Jan 2021 12:10:26 +0100
Subject: [PATCH 0644/3482] ghdl: add llvm backend and enable for all archs

---
 srcpkgs/ghdl-llvm                          |   1 +
 srcpkgs/ghdl-mcode                         |   1 +
 srcpkgs/ghdl/files/ghdl                    |  21 +++
 srcpkgs/ghdl/patches/curdir.patch          |  11 ++
 srcpkgs/ghdl/patches/install-paths.patch   | 164 +++++++++++++++++++++
 srcpkgs/ghdl/patches/llvm11.patch          |  10 ++
 srcpkgs/ghdl/patches/musl.patch            |   4 +-
 srcpkgs/ghdl/patches/respect-ldflags.patch |  34 +++++
 srcpkgs/ghdl/template                      | 128 +++++++++++++++-
 9 files changed, 369 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/ghdl-llvm
 create mode 120000 srcpkgs/ghdl-mcode
 create mode 100755 srcpkgs/ghdl/files/ghdl
 create mode 100644 srcpkgs/ghdl/patches/curdir.patch
 create mode 100644 srcpkgs/ghdl/patches/install-paths.patch
 create mode 100644 srcpkgs/ghdl/patches/llvm11.patch
 create mode 100644 srcpkgs/ghdl/patches/respect-ldflags.patch

diff --git a/srcpkgs/ghdl-llvm b/srcpkgs/ghdl-llvm
new file mode 120000
index 000000000000..397362bd8e2a
--- /dev/null
+++ b/srcpkgs/ghdl-llvm
@@ -0,0 +1 @@
+ghdl
\ No newline at end of file
diff --git a/srcpkgs/ghdl-mcode b/srcpkgs/ghdl-mcode
new file mode 120000
index 000000000000..397362bd8e2a
--- /dev/null
+++ b/srcpkgs/ghdl-mcode
@@ -0,0 +1 @@
+ghdl
\ No newline at end of file
diff --git a/srcpkgs/ghdl/files/ghdl b/srcpkgs/ghdl/files/ghdl
new file mode 100755
index 000000000000..4a48ef91251a
--- /dev/null
+++ b/srcpkgs/ghdl/files/ghdl
@@ -0,0 +1,21 @@
+#!/bin/sh
+# Source: Debian
+set -e
+
+backend="$GHDL_BACKEND"
+bindir=$(dirname $0)
+
+if [ ! -x "${bindir}/ghdl-$backend" ]; then
+	if [ -x ${bindir}/ghdl-mcode ]; then
+		backend=mcode
+	elif [ -x ${bindir}/ghdl-gcc ]; then
+		backend=gcc
+	elif [ -x ${bindir}/ghdl-llvm ]; then
+		backend=llvm
+	else
+		echo >&2 "Error: No installed ghdl backend found. Terminating!"
+		exit 2
+	fi
+fi
+
+exec "${bindir}/ghdl-$backend" "$@"
diff --git a/srcpkgs/ghdl/patches/curdir.patch b/srcpkgs/ghdl/patches/curdir.patch
new file mode 100644
index 000000000000..12e7648e7d45
--- /dev/null
+++ b/srcpkgs/ghdl/patches/curdir.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -44,7 +44,7 @@
+ 
+ INSTALL_PROGRAM=install -m 755
+ INSTALL_DATA=install -m 644
+-PWD?=$(shell pwd)
++PWD=$(CURDIR)
+ DESTDIR=
+ bindir=$(prefix)/bin
+ libdir=$(prefix)/lib
diff --git a/srcpkgs/ghdl/patches/install-paths.patch b/srcpkgs/ghdl/patches/install-paths.patch
new file mode 100644
index 000000000000..f23b2f151025
--- /dev/null
+++ b/srcpkgs/ghdl/patches/install-paths.patch
@@ -0,0 +1,164 @@
+This is needed so that llvm and mcode backends can coexist.
+Taken and adapted from Debian (simplified).
+
+Description: Patch installation paths for Debian packaging
+Author: Andreas Bombe <aeb@debian.org>
+Last-Update: 2020-03-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/Makefile.in b/Makefile.in
+index 9a6b1731..3aba6532 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -26,6 +26,7 @@ prefix=@prefix@
+ backend=@backend@
+ libdirsuffix=@libdirsuffix@
+ libdirreverse=@libdirreverse@
++incdirsuffix=@incdirsuffix@
+ EXEEXT=@EXEEXT@
+ SOEXT=@SOEXT@
+ PIC_FLAGS=@PIC_FLAGS@
+@@ -48,8 +49,8 @@ INSTALL_DATA=install -m 644
+ PWD=$(CURDIR)
+ DESTDIR=
+ bindir=$(prefix)/bin
+-libdir=$(prefix)/lib
+-incdir=$(prefix)/include
++libdir=$(prefix)/$(libdirsuffix)
++incdir=$(prefix)/$(incdirsuffix)
+ MKDIR=mkdir
+ LN=ln -s
+ CP=cp
+@@ -192,7 +193,7 @@ libs.vhdl.mcode: ghdl_mcode$(EXEEXT)
+ 	$(MAKE) -f $(srcdir)/libraries/Makefile.inc $(LIBVHDL_FLAGS_TO_PASS) GHDL=$(PWD)/ghdl_mcode$(EXEEXT) GHDL_FLAGS="" VHDL_COPY_OBJS=no vhdl.libs.all
+ 
+ install.mcode.program: install.dirs ghdl_mcode$(EXEEXT)
+-	$(INSTALL_PROGRAM) ghdl_mcode$(EXEEXT) $(DESTDIR)$(bindir)/ghdl$(EXEEXT)
++	$(INSTALL_PROGRAM) ghdl_mcode$(EXEEXT) $(DESTDIR)$(bindir)/ghdl-mcode$(EXEEXT)
+ 
+ uninstall.mcode.program:
+ 	$(RM) $(DESTDIR)$(bindir)/ghdl$(EXEEXT)
+@@ -355,8 +356,8 @@ oread-llvm$(EXEEXT): force
+ 	 LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)"
+ 
+ install.llvm.program: install.dirs ghdl1-llvm$(EXEEXT) ghdl_llvm$(EXEEXT)
+-	$(INSTALL_PROGRAM) ghdl_llvm$(EXEEXT) $(DESTDIR)$(bindir)/ghdl$(EXEEXT)
+-	$(INSTALL_PROGRAM) ghdl1-llvm$(EXEEXT) $(DESTDIR)$(bindir)/ghdl1-llvm$(EXEEXT)
++	$(INSTALL_PROGRAM) ghdl_llvm$(EXEEXT) $(DESTDIR)$(bindir)/ghdl-llvm$(EXEEXT)
++	$(INSTALL_PROGRAM) ghdl1-llvm$(EXEEXT) $(DESTDIR)$(libdir)/ghdl1-llvm$(EXEEXT)
+ 
+ uninstall.llvm.program:
+ 	$(RM) $(DESTDIR)$(bindir)/ghdl1-llvm$(EXEEXT)
+diff --git a/configure b/configure
+index ce052534..22e1335a 100755
+--- a/configure
++++ b/configure
+@@ -34,6 +34,7 @@ MAKE=${MAKE:-make}
+ LDFLAGS=
+ prefix=/usr/local
+ libdirsuffix=lib/ghdl
++incdirsuffix=include
+ libdirreverse=../..
+ gcc_src_dir=
+ llvm_config=
+@@ -54,7 +55,7 @@ PIC_FLAGS=-fPIC
+ show_help=no
+ progname=$0
+ 
+-subst_vars="CC CXX GNATMAKE MAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pic enable_werror enable_checks enable_openieee enable_libghdl libghdl_version ghdl_version"
++subst_vars="CC CXX GNATMAKE MAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse incdirsuffix gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pic enable_werror enable_checks enable_openieee enable_libghdl libghdl_version ghdl_version"
+ 
+ # Find srcdir
+ srcdir=`dirname $progname`
+@@ -93,6 +94,8 @@ for opt do
+       ;;
+     --prefix=*)             prefix="$optarg";;
+     --srcdir=*)             srcdir="$optarg";;
++    --libdir=*)             libdirsuffix="$optarg";;
++    --incdir=*)             incdirsuffix="$optarg";;
+     --with-gcc=*)           gcc_src_dir="$optarg";     backend=gcc;;
+     --with-llvm=*)
+       echo "--with-llvm is deprecated, use --with-llvm-config"
+@@ -128,6 +131,8 @@ Usage: configure [options]
+ Options [defaults in brackets]:
+   --prefix=PREFIX             install in PREFIX [$prefix]
+   --srcdir=SRCDIR             source code path [$srcdir]
++  --libdir=LIBDIR             lib dir path relative to PREFIX [$libdirsuffix]
++  --incdir=INCDIR             C include dir path relative to PREFIX [$incdirsuffix]
+   --with-gcc=DIR              use gcc backend from DIR
+   --with-llvm-config[=LLVM-CONFIG]  use llvm backend [llvm-config]
+   --with-backtrace-lib=LIB.a  link with libbacktrace LIB.a to display a
+@@ -405,10 +410,11 @@ echo "Generate default_paths.ads"
+ sed -e "s%@COMPILER_GCC@%ghdl1-gcc$EXEEXT%" \
+     -e "s%@COMPILER_DEBUG@%ghdl1-debug$EXEEXT%" \
+     -e "s%@COMPILER_MCODE@%ghdl1-mcode$EXEEXT%" \
+-    -e "s%@COMPILER_LLVM@%ghdl1-llvm$EXEEXT%" \
++    -e "s%@COMPILER_LLVM@%lib/ghdl/llvm/ghdl1-llvm$EXEEXT%" \
+     -e "s%@POST_PROCESSOR@%oread-$backend%" \
+     -e "s%@INSTALL_PREFIX@%$prefix%" \
+     -e "s%@LIB_PREFIX@%$libdirsuffix%" \
++    -e "s%@INC_PREFIX@%$incdirsuffix%" \
+     -e "s%@SOEXT@%$SOEXT%" \
+     -e "s%@default_pic@%$default_pic%" \
+     < $srcdir/src/ghdldrv/default_paths.ads.in > default_paths.ads
+diff --git a/dist/gcc/Make-lang.in b/dist/gcc/Make-lang.in
+index cca1e4df..37d95d20 100644
+--- a/dist/gcc/Make-lang.in
++++ b/dist/gcc/Make-lang.in
+@@ -104,7 +104,9 @@ vhdl/default_paths.ads: Makefile
+ 	echo "   Compiler_Llvm  : constant String := \"\";" >> tmp-dpaths.ads
+ 	echo "   Post_Processor : constant String := \"\";" >> tmp-dpaths.ads
+ 	echo "   Lib_Prefix     : constant String :=">> tmp-dpaths.ads
+-	echo "     \"lib/ghdl\";" >> tmp-dpaths.ads
++	echo "     \"lib/ghdl/gcc\";" >> tmp-dpaths.ads
++	echo "   Inc_Prefix     : constant String :=" >> tmp-dpaths.ads
++	echo "     \"lib/ghdl/include\";" >> tmp-dpaths.ads
+ 	echo "   Shared_Library_Extension : constant String :=">> tmp-dpaths.ads
+ 	echo "     \"$(VHDL_SOEXT)\";" >> tmp-dpaths.ads
+ 	echo "   Default_Pie : constant Boolean := False;" >> tmp-dpaths.ads
+@@ -159,8 +161,8 @@ vhdl.install-plugin:
+ # Install the driver program as ghdl.
+ vhdl.install-common: ghdl$(exeext) ghdl1$(exeext)
+ 	-mkdir $(DESTDIR)$(bindir)
+-	-$(RM) $(DESTDIR)$(bindir)/ghdl$(exeext)
+-	$(INSTALL_PROGRAM) ghdl$(exeext) $(DESTDIR)$(bindir)/ghdl$(exeext)
++	-$(RM) $(DESTDIR)$(bindir)/ghdl-gcc$(exeext)
++	$(INSTALL_PROGRAM) ghdl$(exeext) $(DESTDIR)$(bindir)/ghdl-gcc$(exeext)
+ 	-mkdir $(DESTDIR)$(libdir)
+ 	-mkdir $(DESTDIR)$(libdir)/ghdl
+ 	$(INSTALL_DATA) ../libbacktrace/.libs/libbacktrace.a $(DESTDIR)$(libdir)/ghdl
+diff --git a/src/ghdldrv/default_paths.ads.in b/src/ghdldrv/default_paths.ads.in
+index ae321011..228c0696 100644
+--- a/src/ghdldrv/default_paths.ads.in
++++ b/src/ghdldrv/default_paths.ads.in
+@@ -25,6 +25,8 @@ package Default_Paths is
+      "@INSTALL_PREFIX@";
+    Lib_Prefix : constant String :=
+      "@LIB_PREFIX@";
++   Inc_Prefix : constant String :=
++     "@INC_PREFIX@";
+ 
+    Compiler_Gcc : constant String :=
+      "@COMPILER_GCC@";
+diff --git a/src/ghdldrv/ghdlvpi.adb b/src/ghdldrv/ghdlvpi.adb
+index 295b7300..487eb0e6 100644
+--- a/src/ghdldrv/ghdlvpi.adb
++++ b/src/ghdldrv/ghdlvpi.adb
+@@ -39,7 +39,7 @@ package body Ghdlvpi is
+       --  Compute install path
+       Ghdllocal.Set_Exec_Prefix_From_Program_Name;
+ 
+-      return Ghdllocal.Exec_Prefix.all & Directory_Separator & "include";
++      return Ghdllocal.Exec_Prefix.all & Directory_Separator & Inc_Prefix;
+    end Get_Vpi_Include_Dir;
+ 
+    --  Return the lib directory.
+@@ -50,7 +50,7 @@ package body Ghdlvpi is
+          Ghdllocal.Set_Exec_Prefix_From_Program_Name;
+       end if;
+ 
+-      return Ghdllocal.Exec_Prefix.all & Directory_Separator & "lib";
++      return Ghdllocal.Exec_Prefix.all & Directory_Separator & Lib_Prefix;
+    end Get_Vpi_Lib_Dir;
+ 
+    --  Return the lib directory, but unixify the path (for a unix shell in
diff --git a/srcpkgs/ghdl/patches/llvm11.patch b/srcpkgs/ghdl/patches/llvm11.patch
new file mode 100644
index 000000000000..b2637d01bffe
--- /dev/null
+++ b/srcpkgs/ghdl/patches/llvm11.patch
@@ -0,0 +1,10 @@
+--- a/configure
++++ b/configure
+@@ -279,6 +279,7 @@ if test $backend = llvm; then
+        check_version 7.0 $llvm_version ||
+        check_version 8.0 $llvm_version ||
+        check_version 9.0 $llvm_version ||
++       check_version 11.0 $llvm_version ||
+        false; then
+     echo "Debugging is not enabled with llvm $llvm_version"
+     llvm_be=llvm4-nodebug
diff --git a/srcpkgs/ghdl/patches/musl.patch b/srcpkgs/ghdl/patches/musl.patch
index f9c721fff979..298fba36ecd1 100644
--- a/srcpkgs/ghdl/patches/musl.patch
+++ b/srcpkgs/ghdl/patches/musl.patch
@@ -1,5 +1,5 @@
---- src/grt/config/jumps.c	2019-03-03 09:38:19.000000000 +0100
-+++ -	2019-04-29 12:58:54.717203690 +0200
+--- a/src/grt/config/jumps.c
++++ b/src/grt/config/jumps.c
 @@ -29,7 +29,7 @@
  #include <signal.h>
  #include <fcntl.h>
diff --git a/srcpkgs/ghdl/patches/respect-ldflags.patch b/srcpkgs/ghdl/patches/respect-ldflags.patch
new file mode 100644
index 000000000000..61b27c4558aa
--- /dev/null
+++ b/srcpkgs/ghdl/patches/respect-ldflags.patch
@@ -0,0 +1,34 @@
+Partially adapted from Debian. Do not ignore LDFLAGS we set.
+We do not want the -g part, as that is handled by xbps-src.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -99,13 +99,14 @@
+ #target=x86_64-apple-darwin
+ #target=i386-pc-mingw32
+ 
++SHLIB_FLAGS=$(LDFLAGS)
+ ifeq ($(SOEXT),.so)
+-SHLIB_FLAGS=-Wl,-soname,$@
++SHLIB_FLAGS+=-Wl,-soname,$@
+ else ifeq ($(SOEXT),.dll)
+-SHLIB_FLAGS=
++SHLIB_FLAGS+=
+ else ifeq ($(SOEXT),.dylib)
+ # Allow the use of -rpath in executable
+-SHLIB_FLAGS=-Wl,-install_name,@rpath/$@
++SHLIB_FLAGS+=-Wl,-install_name,@rpath/$@
+ endif
+ 
+ # Flags for libraries
+--- a/configure
++++ b/configure
+@@ -16,7 +16,7 @@
+ CFLAGS=${CFLAGS:--g}
+ GNATMAKE=${GNATMAKE:-gnatmake}
+ MAKE=${MAKE:-make}
+-LDFLAGS=
++LDFLAGS=${LDFLAGS}
+ prefix=/usr/local
+ libdirsuffix=lib/ghdl
+ incdirsuffix=include
diff --git a/srcpkgs/ghdl/template b/srcpkgs/ghdl/template
index 9e4baf3b68a5..3f77c821fa94 100644
--- a/srcpkgs/ghdl/template
+++ b/srcpkgs/ghdl/template
@@ -1,15 +1,137 @@
 # Template file for 'ghdl'
+#
+# We could also package the gcc backend, but that requires an entire gcc
+# source tree being available and looks rather complicated, so for now
+# only mcode (on x86) and llvm (everywhere) is done
+#
 pkgname=ghdl
 reverts="20181129_1"
 version=0.37
 revision=2
-archs="i686* x86_64*"
 build_style=configure
-configure_args="--prefix=/usr"
+configure_args="--prefix=/usr --srcdir=.. --incdir=lib/ghdl/include"
 makedepends="zlib-devel"
-short_desc="VHDL 2008/93/87 simulator - mcode backend"
+short_desc="VHDL 2008/93/87 simulator"
 maintainer="m3tav3rse <mtvrs@tuta.io>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ghdl/ghdl"
 distfiles="https://github.com/ghdl/ghdl/archive/v${version}.tar.gz"
 checksum=3008616201cc3b0b596872e4ad59d8bc36e6ee3ff798bdce066828fbdad041e4
+nocross=yes
+patch_args="-Np1"
+
+build_options="llvm mcode"
+build_options_default="llvm"
+
+desc_option_llvm="Build the portable LLVM backend"
+desc_option_mcode="Build the x86-only mcode backend"
+
+if [ "$build_option_mcode" ]; then
+	depends=" ghdl-mcode>=${version}_${revision}"
+elif [ "$build_option_llvm" ]; then
+	depends=" ghdl-llvm>=${version}_${revision}"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		build_options_default+=" mcode"
+		;;
+	*)
+		if [ "$build_option_mcode" ]; then
+			broken="mcode backend only available on x86"
+		fi
+esac
+
+if [ "$build_option_mcode" ]; then
+	subpackages+=" ghdl-mcode"
+fi
+
+if [ "$build_option_llvm" ]; then
+	subpackages+=" ghdl-llvm"
+	makedepends+=" llvm11"
+fi
+
+do_configure() {
+	if [ "$build_option_mcode" ]; then
+		mkdir -p build_mcode
+		cd build_mcode
+		../configure --libdir=lib/ghdl/mcode \
+			${configure_args}
+		cd ..
+	fi
+	if [ "$build_option_llvm" ]; then
+		mkdir -p build_llvm
+		cd build_llvm
+		../configure --libdir=lib/ghdl/llvm --with-llvm-config \
+			${configure_args}
+		cd ..
+	fi
+}
+
+do_build() {
+	if [ "$build_option_mcode" ]; then
+		make -C build_mcode ${makejobs}
+	fi
+	if [ "$build_option_llvm" ]; then
+		make -C build_llvm ${makejobs}
+	fi
+}
+
+do_install() {
+	# must be first; make install uses it
+	vbin ${FILESDIR}/ghdl
+	# install whatever backends we have
+	if [ "$build_option_mcode" ]; then
+		make -C build_mcode DESTDIR=${DESTDIR} install
+		rm -rf ${DESTDIR}/usr/lib/ghdl/src
+		mv ${DESTDIR}/usr/lib/ghdl/mcode/src ${DESTDIR}/usr/lib/ghdl
+		ln -s ../src ${DESTDIR}/usr/lib/ghdl/mcode/src
+	fi
+	if [ "$build_option_llvm" ]; then
+		make -C build_llvm DESTDIR=${DESTDIR} install
+		rm -rf ${DESTDIR}/usr/lib/ghdl/src
+		mv ${DESTDIR}/usr/lib/ghdl/llvm/src ${DESTDIR}/usr/lib/ghdl
+		ln -s ../src ${DESTDIR}/usr/lib/ghdl/llvm/src
+	fi
+	# manpage is not installed by default
+	vman doc/ghdl.1
+}
+
+do_check() {
+	# the testsuite is broken
+	# after a while it fails with this:
+	# ghdl: unknown command '--synth', try --help
+	# this indicates a bug in the testsuite
+	: && return 0
+
+	# the testsuite is big and long even when it runs
+	[ "$XBPS_CHECK_PKGS" != full ] && return 0
+
+	# need a temporary installation for testsuite run so that ghdl1 is found
+	for variant in ${build_options_default}; do
+		cd ${wrksrc}/build_${variant}
+		mkdir -p tmp_inst/usr/bin
+		ln -sf ghdl-${variant} tmp_inst/usr/bin/ghdl
+		make DESTDIR=${wrksrc}/build_${variant}/tmp_inst install
+		cd ../testsuite
+		GHDL="${wrksrc}/build_${variant}/tmp_inst/usr/bin/ghdl" \
+			./testsuite.sh
+		cd ${wrksrc}
+	done
+}
+
+ghdl-mcode_package() {
+	short_desc+=" - mcode backend"
+	pkg_install() {
+		vmove usr/bin/ghdl-mcode
+		vmove usr/lib/ghdl/mcode
+	}
+}
+
+ghdl-llvm_package() {
+	short_desc+=" - LLVM backend"
+	pkg_install() {
+		vmove usr/bin/ghdl-llvm
+		vmove usr/lib/ghdl/llvm
+	}
+}

From b7b7ab7d79a378a73e6ac7e3443ba9ad7967cd54 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 28 Jan 2021 13:19:09 +0100
Subject: [PATCH 0645/3482] ghdl: bump so it actually builds

---
 srcpkgs/ghdl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ghdl/template b/srcpkgs/ghdl/template
index 3f77c821fa94..632ab2a19774 100644
--- a/srcpkgs/ghdl/template
+++ b/srcpkgs/ghdl/template
@@ -7,7 +7,7 @@
 pkgname=ghdl
 reverts="20181129_1"
 version=0.37
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr --srcdir=.. --incdir=lib/ghdl/include"
 makedepends="zlib-devel"

From 3339d98b60453b885b35585c600607a11dd32c46 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 28 Jan 2021 13:31:13 +0100
Subject: [PATCH 0646/3482] xbps: clean up the repo/suffix stuff

---
 srcpkgs/xbps/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index e43050da90e3..cae1b8681e91 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -35,17 +35,13 @@ do_configure() {
 }
 
 post_install() {
-	local _repo="repository=https://alpha.de.repo.voidlinux.org" _suffix=
+	local repo="repository=https://alpha.de.repo.voidlinux.org/current" suffix=
 	case "$XBPS_TARGET_MACHINE" in
-	aarch64*) # XXX different repo location
-		_suffix="/aarch64"
-		;;
-	*-musl) # XXX different repo location
-		_suffix="/musl"
-		;;
+		aarch64*)     suffix="/aarch64";;
+		*-musl)       suffix="/musl";;
 	esac
 
-	echo "${_repo}/current${_suffix}" > \
+	echo "${repo}${suffix}" > \
 		${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
 	echo "architecture=${XBPS_TARGET_MACHINE}" > \
 		${DESTDIR}/usr/share/xbps.d/xbps-arch.conf

From 32bfff9ed1270fb13c249883168988096f1c1c44 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Tue, 26 Jan 2021 09:46:25 +0000
Subject: [PATCH 0647/3482] rooster: update to 2.9.0.

---
 srcpkgs/rooster/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index 76a1738601cb..a44ab4f1b042 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,17 +1,17 @@
 # Template file for 'rooster'
 pkgname=rooster
-version=2.8.6
+version=2.9.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel libssl48"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"
 homepage="https://github.com/conradkdotcom/rooster"
 distfiles="https://github.com/conradkdotcom/rooster/archive/v${version}.tar.gz"
-checksum=b05d2c368ac26d96edd058130bfc7cc7a1960a5bfbc63b6ddfad62d27b08d62f
+checksum=2cb08c90c9604951c810038dffd1dfca1de71bfe1d76b22f951dc3f14c0efab4
 
 pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
+	cargo update --package openssl-sys
 }

From cbd060443cacd41ee7f751cadac200b1aa419c35 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 28 Jan 2021 08:10:28 +0000
Subject: [PATCH 0648/3482] rooster: update to 2.9.0.

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a44ab4f1b042..a8a905fcb761 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -4,7 +4,7 @@ version=2.9.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel libssl48"
+makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"
@@ -13,5 +13,5 @@ distfiles="https://github.com/conradkdotcom/rooster/archive/v${version}.tar.gz"
 checksum=2cb08c90c9604951c810038dffd1dfca1de71bfe1d76b22f951dc3f14c0efab4
 
 pre_build() {
-	cargo update --package openssl-sys
+	cargo update --package openssl-sys --precise 0.9.60
 }

From ff8c6e6eae741efcfa116d720e257044c92e52e3 Mon Sep 17 00:00:00 2001
From: Alex <60660439+AlexDltg@users.noreply.github.com>
Date: Thu, 28 Jan 2021 11:06:46 +0100
Subject: [PATCH 0649/3482] pycharm-community: update to 2020.3.3.

---
 srcpkgs/pycharm-community/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pycharm-community/template b/srcpkgs/pycharm-community/template
index 77f5a358d8a4..a33d229a4666 100644
--- a/srcpkgs/pycharm-community/template
+++ b/srcpkgs/pycharm-community/template
@@ -1,6 +1,6 @@
 # Template file for 'pycharm-community'
 pkgname=pycharm-community
-version=2020.3.2
+version=2020.3.3
 revision=1
 archs="x86_64"
 depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/pycharm/"
 distfiles="https://download-cf.jetbrains.com/python/${pkgname}-${version}.tar.gz"
-checksum=33e19dfaa434f637506b6fa35dcf94c908f9b471aadc9f616eae0c0395327cfc
+checksum=915a8803db2d47dd0c739da61034eb787f7c9e9e512ebcb02ea1a45cddbb055c
 repository=nonfree
 nopie=yes
 python_version=3

From 1663de547a0e551af37c7fa2493139c3f5246072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Thu, 28 Jan 2021 11:43:55 +0100
Subject: [PATCH 0650/3482] intellij-idea-ultimate-edition: update to 2020.3.2.

---
 srcpkgs/intellij-idea-ultimate-edition/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index c8a9ae55c553..826338dbd83a 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2020.3.1
+version=2020.3.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-203.6682.168"
+wrksrc="idea-IU-203.7148.57"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=50352d1ed9690e750f7b96ecceadb7288879afd7444e752f57c49845b0029fcf
+checksum=982666e1554adb745de819bdd5c7418eadd504cb0324dac2245f949b5a104ced
 repository=nonfree
 restricted=yes
 nopie=yes

From 1e6369a3c41c165cf868d438731ceb159f31a3d4 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Thu, 28 Jan 2021 11:20:34 +0300
Subject: [PATCH 0651/3482] topgrade: update to 6.3.1.

---
 srcpkgs/topgrade/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index 4b7bc652506b..41240b72fe2e 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
 # Template file for 'topgrade'
 pkgname=topgrade
-version=6.2.0
+version=6.3.1
 revision=1
 build_style=cargo
 short_desc="Meta upgrade tool for pip, flatpak, your distro and everything else"
@@ -8,4 +8,4 @@ maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/r-darwish/topgrade"
 distfiles="https://github.com/r-darwish/topgrade/archive/v${version}.tar.gz"
-checksum=ee23ba04962509ac188ec601dd67c0f8a7eae7d6532155c0eb848756264dbc21
+checksum=4527a6e0763e8a9f30bddb83c2ad696a5e13c8c5510e2696c54243c83bbc3f15

From 89e1681ef972f15bd0b884c481056932d432ad0f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 28 Jan 2021 15:56:41 +0100
Subject: [PATCH 0652/3482] ffmpeg: fix transparency for yuv->rgb32 with
 altivec

---
 ...070d9b092d3a354a6963c65197054ddf7a75.patch | 41 +++++++++++++++++++
 srcpkgs/ffmpeg/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch

diff --git a/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch b/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch
new file mode 100644
index 000000000000..621aba392fb6
--- /dev/null
+++ b/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch
@@ -0,0 +1,41 @@
+From 2687070d9b092d3a354a6963c65197054ddf7a75 Mon Sep 17 00:00:00 2001
+From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
+Date: Sat, 23 Jan 2021 19:33:13 +0100
+Subject: [PATCH] lsws/ppc/yuv2rgb: Fix transparency converting from
+ yuv->rgb32.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Based on 68363b69 by Reimar Döffinger.
+
+Fixes ticket #9077.
+---
+ libswscale/ppc/yuv2rgb_altivec.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c
+index 58e480dd2c..4f5382e4c1 100644
+--- libswscale/ppc/yuv2rgb_altivec.c
++++ libswscale/ppc/yuv2rgb_altivec.c
+@@ -425,13 +425,13 @@ static int altivec_ ## name(SwsContext *c, const unsigned char **in,          \
+ }
+ 
+ #define out_abgr(a, b, c, ptr)                                          \
+-    vec_mstrgb32(__typeof__(a), ((__typeof__(a)) { 255 }), c, b, a, ptr)
++    vec_mstrgb32(__typeof__(a), ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), c, b, a, ptr)
+ #define out_bgra(a, b, c, ptr)                                          \
+-    vec_mstrgb32(__typeof__(a), c, b, a, ((__typeof__(a)) { 255 }), ptr)
++    vec_mstrgb32(__typeof__(a), c, b, a, ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), ptr)
+ #define out_rgba(a, b, c, ptr)                                          \
+-    vec_mstrgb32(__typeof__(a), a, b, c, ((__typeof__(a)) { 255 }), ptr)
++    vec_mstrgb32(__typeof__(a), a, b, c, ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), ptr)
+ #define out_argb(a, b, c, ptr)                                          \
+-    vec_mstrgb32(__typeof__(a), ((__typeof__(a)) { 255 }), a, b, c, ptr)
++    vec_mstrgb32(__typeof__(a), ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), a, b, c, ptr)
+ #define out_rgb24(a, b, c, ptr) vec_mstrgb24(a, b, c, ptr)
+ #define out_bgr24(a, b, c, ptr) vec_mstbgr24(a, b, c, ptr)
+ 
+-- 
+2.20.1
+
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 4a154e5d4760..9879cb0e3aa6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.1
-revision=4
+revision=5
 short_desc="Decoding, encoding and streaming software"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"

From 3404711bcf78d5d82829ea48ebb6825fa0d6f91c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 14 Jan 2021 08:41:49 -0600
Subject: [PATCH 0653/3482] New package: python3-rich-9.9.0

---
 srcpkgs/python3-rich/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-rich/template

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
new file mode 100644
index 000000000000..347396c6edb0
--- /dev/null
+++ b/srcpkgs/python3-rich/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-rich'
+pkgname=python3-rich
+version=9.9.0
+revision=1
+wrksrc="rich-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Library for rich text and beautiful formatting in the terminal"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/willmcgugan/rich"
+distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
+checksum=0bd8f42c3a03b7ef5e311d5e37f47bea9d268f541981c169072be5869c007957
+
+post_install() {
+	vlicense LICENSE
+}

From 2644f78115afb3884dc3876890577ec699098c03 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 14 Jan 2021 08:42:13 -0600
Subject: [PATCH 0654/3482] ytmdl: update to 2021.01.14.

---
 srcpkgs/ytmdl/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ytmdl/template b/srcpkgs/ytmdl/template
index 57d9724ab23d..75602d5c3a95 100644
--- a/srcpkgs/ytmdl/template
+++ b/srcpkgs/ytmdl/template
@@ -1,6 +1,6 @@
 # Template file for 'ytmdl'
 pkgname=ytmdl
-version=2020.11.20.post1
+version=2021.01.14
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -8,13 +8,17 @@ depends="ffmpeg youtube-dl python3-mutagen python3-requests python3-colorama
  python3-itunespy python3-BeautifulSoup4 python3-downloader-cli
  python3-ffmpeg-python python3-xdg python3-lxml python3-pysocks
  python3-Unidecode python3-urllib3 python3-youtube-search
- python3-pyDes python3-simber"
+ python3-pyDes python3-simber python3-rich python3-musicbrainzngs"
 short_desc="Get songs from youtube in mp3 format with all tags from itunes"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/deepjyoti30/ytmdl"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dd8c4e65b5f67357179f586bb153cd02238cea2512e3fb563709c2cff9ee14b6
+checksum=0783af6edc20a5e5635774a62bff9c20a81ebe4f6a71b939566724b279f6c4a5
+
+do_check() {
+	:
+}
 
 pre_configure() {
 	vsed -e '/install_requires/d' -e '/setup_requires/d' -i setup.py

From b2fbd61c5a47c01b91c79c5d5330fd1ac8169eac Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 12:21:42 -0600
Subject: [PATCH 0655/3482] python3-musicbrainzngs: update to 0.7.1.

---
 srcpkgs/python3-musicbrainzngs/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-musicbrainzngs/template b/srcpkgs/python3-musicbrainzngs/template
index 8de5f65f12d5..cfa6fa5bec4c 100644
--- a/srcpkgs/python3-musicbrainzngs/template
+++ b/srcpkgs/python3-musicbrainzngs/template
@@ -1,18 +1,17 @@
 # Template file for 'python3-musicbrainzngs'
 pkgname=python3-musicbrainzngs
-version=0.6
-revision=7
+version=0.7.1
+revision=1
 wrksrc="musicbrainzngs-${version}"
 build_style="python3-module"
-hostmakedepends="python3-devel"
-makedepends="${hostmakedepends}"
+hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Python3 bindings for the Musicbrainz NGS webservice interface"
 maintainer="Steven R <dev@styez.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/alastair/python-musicbrainz-ngs/"
 distfiles="${PYPI_SITE}/m/musicbrainzngs/musicbrainzngs-${version}.tar.gz"
-checksum=28ef261a421dffde0a25281dab1ab214e1b407eec568cd05a53e73256f56adb5
+checksum=ab1c0100fd0b305852e65f2ed4113c6de12e68afd55186987b8ed97e0f98e627
 
 post_install() {
 	vlicense COPYING

From da201ab885bd7a1b24a0b3bd543dea262ca82805 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 28 Jan 2021 18:49:27 +0100
Subject: [PATCH 0656/3482] ghdl: make sure subpackages do the right thing

---
 srcpkgs/ghdl/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/ghdl/template b/srcpkgs/ghdl/template
index 632ab2a19774..4229ca3d5634 100644
--- a/srcpkgs/ghdl/template
+++ b/srcpkgs/ghdl/template
@@ -42,6 +42,9 @@ case "$XBPS_TARGET_MACHINE" in
 		fi
 esac
 
+# get around xbps-src's broken 2-pass option eval
+unset subpackages
+
 if [ "$build_option_mcode" ]; then
 	subpackages+=" ghdl-mcode"
 fi

From 67b454de75ac552fd4ab13d7f8fd8b15504bf6fa Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 28 Jan 2021 19:13:36 +0100
Subject: [PATCH 0657/3482] dijo: update to 0.2.5.

---
 srcpkgs/dijo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dijo/template b/srcpkgs/dijo/template
index 8352de8ebece..d3eac02d4a26 100644
--- a/srcpkgs/dijo/template
+++ b/srcpkgs/dijo/template
@@ -1,6 +1,6 @@
 # Template file for 'dijo'
 pkgname=dijo
-version=0.2.3
+version=0.2.5
 revision=1
 build_style=cargo
 makedepends="ncurses-devel"
@@ -9,7 +9,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://github.com/NerdyPepper/dijo"
 distfiles="https://github.com/NerdyPepper/dijo/archive/v${version}.tar.gz"
-checksum=691178345abf9b07c751271b6b1a19e4182423294aaffa8b3a0973dc3e5805d3
+checksum=3e32e07e64af9b6c5c20a04c9c893accc8a95973df0ef519a096dd1c268eaef9
 
 post_install() {
 	vlicense LICENSE

From ef2ae9d9694080972eca85d81e19cb33dd721f27 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 27 Jan 2021 21:36:26 +0100
Subject: [PATCH 0658/3482] cbindgen: update to 0.16.0.

---
 srcpkgs/cbindgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index df6c84f43c4f..80c82efce5ea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -1,6 +1,6 @@
 # Template file for 'cbindgen'
 pkgname=cbindgen
-version=0.15.0
+version=0.16.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
@@ -8,4 +8,4 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
-checksum=9e2756a292a3b1182b8f741d6bb9e5a8b8a8dc2eacfb187c7db649966452798d
+checksum=c7b545f27f19da06983d38e149b76c446a13b9df744d22b2a1b3adb79dabf0ab

From cc768bdb24eadc68fd884367d511994f5b7973eb Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 27 Jan 2021 21:36:32 +0100
Subject: [PATCH 0659/3482] firefox: update to 85.0.

---
 srcpkgs/firefox/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 70cd34499359..f671bbee7371 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=84.0.2
-revision=2
+version=85.0
+revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=92bfd518d4f9760c897388a8e06130b171c1c43524d8af181add9daac2be7b37
+checksum=5f03712642f5e77de4581d2ba3ee3e87cfa44c3d2fdd8fe0fb56ea05a57f7b50
 
 lib32disabled=yes
 

From f02989850b267ec0e65ebac1979faa7266fd7c73 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 27 Jan 2021 21:44:14 +0100
Subject: [PATCH 0660/3482] firefox-i18n: update to 85.0.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 9cf33c4b1c4d..6af9409ff63c 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=84.0
+version=85.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="94b0bd6f285775715a97145b6c4e8d6feef3b94682d124f161f98c2f2cbd4670
- c4db135e18be2c300f3f27453e83378d35b1c954e0e3d958ab61936aa977883a
- 5320df230a7d0a680b4daa6d6908548c2957562823a8229c3f19d5e1183343a7
- cc7a85e929c8f3a01516342ab608f9acbf2aaa03bc43fd5612300b430f5fea29
- 7ef0e96819501ce8dc8d3ebbeb8bb832314201f733710ffb81351318a3f22dfc
- 49579dc21ec917694df9509852b8bf919fe0cf38b2a60b0a32460de3c37e97a2
- 93f19f3313008308cd1d4e8eb1f3fbe05210775758a234367713ac3e71e71972
- 47ad3f8ce909feff19ccbcdcf2275dfe697e504b1ca164124a9eec9f1e816836
- 176a3cdfe39084e97b607198200a551cb23789b2cbc43eff460e1221c96e065a
- 1910145457eb8833b62d60ff54d735446b9420129f7a6239b993273fa7b94d79
- d070ce5ad03706d3c281bdae7af2ce680671a958113d244413bb862821187d9e
- 587301ecdb55992a224e54132e07db16b196b60cf3a75fc47052dfedd1582422
- a9413ab019266b0d3d8d27d08521c235b8ef0214d6ce01e147975d020a673f62
- c6cebc4ee4cce3bb4135f8272d11a42c84383f2be2f45246b4cf454bd0977622
- 13778ed0f750e3218b809f11ba8f7a1521ac0c691cda846822aa8f9198b22cca
- 23043540a526e9e36f1afac57840e35059ccfe838079ce0835a56a80a807920e
- e1c15d5e6a33df4752e70befc67cd188cef53947f77ab565a537e1424706495e
- b37e8cb11a39e65478a674ce73afba192b8f67a97cdf01dda07a52efb54e4956
- 37e8201fdb786753f097d36cd8f4b4724863878c6ae9bfa44bf87d8b5d6a63f8
- 09f3d0305d75e02aca6c9522a5dbb96f325e21bcc744e2b66ad75fc66ba9608d
- 53174122dff9e8dcc3469cc559776ff88a75f0f3938abc5913baeca43f2adbbc
- e35827598cea81434db5ad8a6d4ce266d911e4fe47367be6710a0a3576c8cfc4
- 0c994ae57e9442251fe1fe2a04705926fbfbc81dfaf858c75c19ae32ad9a1e07
- 7d5ccd03550887d1d79fa5903f2d08bcc18e858eb91170b3818fccd52fb4b97b
- a69dd7da11e30951459411e67b02b559b03ccb9d254ce436401f0797461ff630
- 08dcbb4f3175c05d20ce2492d22dbe48f4b367fcdc74ae8192babcb9555b4eb4
- f4656e4fe6aa3ce8662600929b799796cf3ebb09eec861e63a0dedd4cc025c5c
- d2b981338c7eb6ee64d6de420f5059787bd9fa2516896fa53d6540a7fd43b377
- addc3c02591e9ed0d75c8c99f79e4495b7ea680243cceed2b5f5c4a829d49e6f
- 2968830fe5788a152c9af519ecda0081bda1e303229b188c3e03b99cb89aa284
- c5979d3270b43f616bc3c78cd0afe085eaaa3f8e24b1557d199bc5cee83c1f69
- c6eead14ee828dde3c237157d6743d5d28ffff74d9c5994fe36dc9dd5489b44f
- ef5da110ff5db1fa41437587e0d4232ab5ba684615e5878196f6fb3db9fabff5
- 9181e08d987bfdd4e1e6a6090b7b21b1ec7c53e96be248050518c5eab34e5f34
- 96f09ef0e7a68873a2d95794e4ee8302654881df85c21c80bdac02bfd1bab335
- 0d582e6e1cf9cdc694a3e85c4f9cf36a0c59e3bf838953c31ca58ed2d66f5735
- e541c76d34270ef558573339cfd14f5c09a3189f884c2a7265c1c88375c79b58
- e0c1e7cb9f75bed76c388705a5679d1d41bff1107214dcfc9ca910a7c6f571a4
- e909d9dd839cc3890bdcec29e3496b299ae69388fac43674510cd9fae6a4e4b8
- 99258abe42d59457b1fba7638259568ccc218106e9d5827b4def893c29b470a8
- 168466645395d8498f3c13eb09cf13314c9b0b9018d0769f3e613c0e9514506e
- 857b392925188807ff5521adeaf0b6a0ff259f99ef09ac3cfec0cc7b1ee32180
- f040bc7b60564d70c25a9296fd4f11e484e9b74808822e85788c06c897bca5b5
- 06134e687b99d7e68bce477cf85c54317dba124dce486352dc5a6a1876e54f67
- a41850d4f690e1580bb7c37d8443c29494f33bc2b5a6d4ffeed22c58ec2ae776
- ef3301a5afdc0f217edcdffc0a959cd7b8a18861f2658d99daa2949a8745ae47
- cdc8e5b18987d6640f782f1dab728f14a80e97d27a680f186b7479c7ed0a76e6
- e1a672a052c72a94dc3ff8816235824aca20b4481bf1c48d60721b49937fe529
- 1a2b88bc6710f07f77f0579d1409d37cb3f7a2d4ec2bdde1f0d4c992d05d9fed
- d4e90b3abfd6ed2ddee7a2cf98bf1492e145a83b4be8711d93e094d56423a54d
- 120560d88a624c7ba0de23bc23fa996e42b0727c3e97cc0a4c9f667246b868b4
- 010ffa6887ef0c9cf03c81922b22ab04b55c2d0c08d93a3fe683f14d442e9b15
- 8d15fd2f21cbec41cca4151242ca2c15d681b96a1ea12f2fe06f4d17c8670e3c
- 6cc51922cee863b11524ed638e1d4a2ed9b2249a76b468791a471051e05e1451
- e0f894c991c0f59133f369b9ec1ad2b68e521705163580025410f09250c26e60
- 488f340d031de8ce7a4a9bb9393390200849f66fb050cbbe7aa6a9c237c1a94e
- 0255c4f216257a7bb6da94dabd8c9528ade8b87313c7ab81be9d6e76d02a230b
- 62486e6f43cd57dd531a03591b95040ee7d98ba1fc74b6c2dc3364090bb50ea0
- 2b1d994675d33c80cda210b2d3fd88bb3051d26b9c551672aad6cfbf56ac2f1e
- 3a7384888b4894f386bf450c39dee9ea423697e4c784d886d8b63fc1826f98e5
- 2dd784fcafb0208279996f0974ed3a89a6ec11faa9dc6865e7e6bb314a93f5b2
- 2beb59d3d2c853dfc77a11d8418b13d297af71b7a83a2daeb7acb0daf5c42d40
- 22f6fdd526430d359c48aa77a1b6e87db15e5cc6f1910f44a19f89e6c9d1f597
- 4fee301a969835ce145fa91dcbee8b0c902e5b3ed4b5890730285c48a577d2f0
- 6312462a704beb7cabfb1dd5e19b4da0221a088484fd39a73197edbb17c3eb6e
- 329cace533171098d65139bd9fc056db9fd1cd5bc74917067296b3d22d493bab
- 612b4e785458592dc5e53bafac4eacea2058d5a9a474b79318b664fd4ff2d2da
- 84e0574c5c0f104a8f18317b26e93b37417aebfb7ff9ef3d53fffa722a241a60
- e3da154704200101eaccefaf982ab663f70fa3c478ca2faa9e32df639309f79d
- 9e25eb5d25ade0dd06d5fc04dbe066783bb517df742bbab64aef845552e6c315
- 0c6b239034e21bf2032fe593a861d5ab1d5d65b1b9e15c165519791cf3d6287f
- 295ffe3f03bd32f0a7db473a4075fa517c435c15e31f1f4362391a898e15cead
- c51f29af4135e6a35c29fb8d253b71ffc512ffd3704bf76c9d9a17f5d40efbd2
- b5329b44f7ca76a6903ebc52e33538fb0c5dd935961c30f517a6d4f4fc97a09e
- 378133f57d3858dd76d8f744e62d2812dd4f9235b408ea8d7b718f289827ccb8
- ca9da8481ca8052142ff4b1cf2545f0cf0f51f26ba2ce3191606ce9c4d7b4396
- dada3b72a10ea9699d4c569d8cdb50c36b7077dd18f1c8d13817539848c2e0b9
- 4185f1351051f33a5728be8e177d359e29d933a01e9db99fe330d364e02df00d
- 304eccf0e97f56d4c92c3f71abca23c4fcdb9891f2501fb8659f0a634250b245
- 6f506d2af8c13b3319c0c5fb859a719350be94ccc3c93e654cad78234ddda072
- d28f7b9412fce3547865019cfe14349da2afe62224d4b99754c433b4eb58f415
- 9b27ee6728cd386510d9a9ec86e426477ec6595cb1440b04d00d61585abc2bce
- 6e3b75e0bc5a8688202eb51990cad69c66e817262c77b4e28b33c488057de1f9
- cd34159677b1870897fb03f1e8f058e95992145f2fb62560f1a93d0783dd6fd0
- 53b1de3ba82b65511cba4999b86d77490e40a332d1d5810627fbc0af8e395e40
- 10fe9582ffbd42de78e436ea0b297aef7459feb825c3d09dceb6d3dcfd8153eb
- dcd03f136f7a32002373ad2e0871003d1882bc34ac73ec6bd5625ae3b6c0f5b1
- a4c3e548edc1f3306c4cd07071c94f20a77074c08a2c6669d6930f197dae2b87
- e11f07bcd00e6a3b72f6af2280867783a92ba3dce1cb8cdf786f35bb8c40fae4
- 5316509e6a7360316d35283d3110298a8ea2aab8bc9b2509c8a0fd46354d0052
- 74beeffbd3db2f292b4e2f975e8ce4ea2d997042e4844d7bbb6d28beee9565c6
- fb383a17e945d55310a78a8f42bb1e28380c3686cd3e8ed6a8adff614f1c5ca4
- 3a9d9a4f25b179b31bfb4b33722df6bfda29b432a004446d293d0b15997c55e6
- 67a035724ca388ef134a5a66360b2bfe928869678028714cb778a7ee5a0cd4f2
- ccbf810ee25e84dea7b9f5181dcfc977c060bc985d900e2234c3e1e80a87e4c6
- 1462ec5fd7720af4bfb3faaa4aef3eec6c28c3d86bb90d4830b9d8dbcbfb27b3"
+checksum="1e3ebceef5e6157c1d79a7a420fad27611da0f4c7f78e2a3e63a9b6cee06bbc8
+ a1004ed9e3755ffdb5376664012d977373e7f46da7b1c268cd3756d5ced2bc57
+ e7cc6da27234dab24edfa6d1dc1d28c6bbf547e0da15253494b180d14b334081
+ b16a3898e25fa7ff559b6c58117ff4da45f342d5e1300cc07992369d2da0cc71
+ 614f975906e5ac26cb11d9679bd6d9ea0275294f33b6d2fc9f138114f1bcb2e6
+ d2610c15a353a92af5b23cf2e04e27e55eb9edb3a3a72d155dc6eea25825edd9
+ 21fd164f9ff33d0541d523f3502f04edcc12be6faf028dad2623ec78efef3811
+ 9950615c19258eddafa63765bc1632d7cad3a4a14a2f5d8e333e1666e5e35e9c
+ ccf4e4a36ad99134f122546a3eb5f6045380e7aca4164fdf1d09946a39d0ce4b
+ 86d6ef20ec182cb46dea1e993229aa3394599c708d218bb8dc96aa4577d3234a
+ 2611baa78b1a46e6d55ca5350527a2da4d8e4e71eee22a1c5b33adfb2e3544e3
+ f7a98ee9f2073133f5b9ec18504a49c512957e4705640893d0f61d39a03ed95a
+ f2e0718027aea24938f05c97061d2c8717bac28bc9d5396afb8d12384b75111e
+ 6f67c36378526a228e89e8638e1d57b7a6c0d81c6c2eca07cb0218151f93c42b
+ e38a55feab1f94ccb20e01dc81964a3c2c52770964d224c544c820b9642a387c
+ 3a753754399c7d5cafe88d546c8ee7c0fe5d05932c75e0322f18d55a047ca018
+ beecf7a11e167b2d7ecfddbd1708eb905518e93cbebb56dcd4fb87883bd6db3e
+ 417a112dcbee84076bb1462e9719a14a13846ad2b783779f44232e936e305187
+ 99ce36f9dd309d25aa45f168f6403edf4ae48a028864a38ce9010cb9b0f19dd1
+ 61d28874ec0d998982e087237a8d41288f30d8375c590c58da98611a67466e3b
+ e2d8748a8f6488bbb39c7f47ba91926c5ae74be20198792a87a43749efd8d7c5
+ 859f942ba799d238efb190ef27d64230c67b6052bc180a0ce3eb1f82c266197f
+ a58a015c60b3481b9456c091c54361c4dca6405d7fd901306e54c66184ce977f
+ 43262ac8204ebcec69eff003307627306e05fb202f1ffaf2ecd3dd66590f8d1b
+ 1919e4e0ae8ff4556df7226405985fdc3a951a9bcdb4cb25fb34ba67b240c83b
+ 04b18d8c7e99e56fac9ebe3512c14816d7b0ed0c5dca364d6321593b32756002
+ 122df58cb44a1d0aeebea86f7ba52432bd838ebf15efb81246d6666c52d4fe11
+ d5e2c2d61cb24eda50f67793cf40f302b41853803e06b6e7e8eeb09b33fb5079
+ bc8d7b16044f6f1a96abe369886575f6a7f60de32a675fcc51e577f070af2065
+ 19f6ad8dbcc607e04865b194a24c2dcc626d9c254f85e1f86f268cb438f28252
+ cdb1a1f475a0a341f3ed5e27fa53c48133c92f8a9d1fa550c4184ffafb9d51cd
+ eaa53a8f97216fe96e4d92fbb937c387481b2017ec3ca508c00066e6b3836803
+ 17d9944779de63759cec174c047cf0046b83f2c3b0cae9d066fe1f552f3de583
+ ff4411a9fab2bbb6a7bd3364d3dc1fe1748ae947cb1248d8cce7ab73c94977fe
+ 31143a33a3c1b4dc5a58d2acb50bfe8bb826fa384bcc7ff26ec5452a7e318c22
+ 4e66e4b7ce1739888cf54e9327f5c77ced6efa67b2dd03db5f5a1962a1cdf375
+ 1965af4bbef784dc22e5721850762e8eacce0939c471a63270cccd9f8903a659
+ cc40f44b0e509cde3c26b2b4e016be9b4e48e995ade40754841e67df69251ceb
+ c706426b8861fa03c406b2e1ce76853c12e5db473d2bb28634a54b7eb733c5af
+ 32dafce8ee2c792e53fffbdfe3153077a33af80ab11e0d2ddd94087969d096a7
+ cab75dc867ce4fff7fe55153bfeb9da2846b5815b54eab6073f54591fbc92ead
+ 41433526cc62d21b6c2c64d6f19fcbf071b04b7dc85a301458082680a508274c
+ 51a0a243354013c2026e13da0141c081ded12e373229948d95a3e32d60ac7988
+ d023425a39c5aa243e63db3ecc44795d83c58176e62da75992e719547a5a4a5d
+ 00d3f2385ad3d7b419f88d28b3ae74d24f67730da8e4df567431291d77e35a27
+ 25bb21d49a4bc83ce73bcc181101e8d9accba10a828c09025aadb0f6266d34b9
+ 2b74deea42c22f8176bd3d4968c2d8727980f2b4d94bba25c0fcc6e2931737e2
+ 948dd6979c874aedd956f764f0a8dd11df51f8c299fd15b91edb1388d3dc2ff4
+ b912d9bccd7770a1df13ccca727bc56534787f9698dafed21ab9a0cc587d6200
+ e167af1d333d88228bc66b9f875dc618d1d41c967ca56ab6aa1a973d27ad26dc
+ 67993e40150a07aa1e74b74b24bdc3900bf42f57e0d6cc9426fb8346d76a4912
+ 3f2c8cba88f756f673ef310040b81723ad6dd184e338d7fc4957fbaaeaa77e8d
+ d3cc0c70843e17ea1e74530099581a8cdcc9255a27bda9a027c062547b5ebb01
+ 34f1a289bdb2ffde7734dd44b0c0574af070beebfe7d8f32bfdd4f49ccaba509
+ a549248502f78559af5891a43011cee4673b10f24cafa3cf0fb3cafbdc7d58c7
+ 931e44906a15a19bf157e0dc7f8917e70dccad6c32d17468c72b50753e251b2f
+ 5d3786da797df6c2e0cfc89370beeba05318f9a1244e9cf2a97d240972da4cee
+ 5759dd18c45d3a2e5678a9d89ea577192eaa7d2eebeacc8d86fd01d01619051b
+ d118ea187615e19d3851249ed04a2df0fcd46b0997a825615aeeaf6aa66985b2
+ b9e649a26e8f6cc2ad8f4ac61e5043c9becc08e383c1005327f2b9e064355859
+ 1c4023f435db4831a07b01b3fb934db4a00e7033d49ff5611285d925ca6f88e7
+ c2ad46026bbb2dd505abdd27c706e5490bf56789a0dc21688b78963f2f6867b3
+ 307b8aa877e07f573213eeb61bda5114ba73606bba70ebc237fb91c7c5749795
+ 40ea4bab889523f1d5e31b11df77a8f15f28e86544ed5ed3ab84eb83da988e95
+ f0483acc0420799927c46c85c2f619ee6a618eb475c7122bd8ef13e88140a744
+ 35b6a0fc2fdf6668864aaa96ef67f451171ed4127a5996086d6ffad452dbf216
+ b8441e6cf11cfd88eb71a17532140641771e4f16b9ac9e652a69c85d32f69d00
+ b5e01938b9759cf35a5a59b6536ce605d8f678e3e2bd50fecb506d474876169a
+ 33129282982bc729920bf7a69901cda39d48a7f7eea9872522eebb9635a2a283
+ caa28beda74a3f02e49740f5623196768e943304cb0ead1ef5f227822f5a9db0
+ 8ed5ec0ed82b648e3a3368c570e02c1107b91c0981fbf30ba1073f7f0f0e7fd8
+ d857483bfa8c99914fa0ebb3e59c7e64a8af2d857915616665f996282db3088b
+ 57ea0c05fbb9d402a89f98df27114cd595715f6903af222eb0cf53cf42ad6b83
+ 7330582179035c4a8414292524459d1c03bac11d9f209215b1a22e10d3690b93
+ 1d376d6d7bab26ba9f96da126a609c9d0983e5f5d4f4cd00474ac920412b0cb6
+ 815cc6e1b25bbcc4fe8bacd0ba07d1cbe6e2232632cdc62b038e86cf95471ed0
+ 3df1938caf420cb804a4fb25c83c025792b0e5498011ed01930d2ed9d94a9dd1
+ 9234bf80ba9100f07a07741673866657c957529fb5d561c279af0b09ff181bd2
+ 3752e8efc2ed8b6cca7db2309e4b6463f0f60702f3735d17134fe0634a1bc283
+ 0f0f125dc6042d63ae0ab00787fdc9cf508335d28fba5bfb5e2f0eb71c875fab
+ 4bf3dca87023e36edb5921ceee8400bd86c0ca4e317a521b4d4bae319e8996e6
+ 2be7d9604b6f6097f8da00732047bdefc6b7c5ff3f3810e4f80e11b0c3f589cf
+ 104d34b529920526708290d119b752182a48abdcf6c8f1b9acde2a82d94001c9
+ 6fb032533842f8c35fbc6a1abdaaf5d4b86bc3c352424ff34988acbd54ff3cac
+ 3eac9e3d081d70661e6966b404db7b0da1e36b744a75ff123409ab431c161795
+ 09fe0e97d966e3ea22bbed30be8c4d23650cb54c5dd2cb1eebb2627ec436fbf0
+ 3bc75dfd85e49ed8a62169a7153e74efd9417d29720f9618d8029da5dda30db4
+ c573b5e8e388bfdbe67f5e5180b85063161b5bd0499f01fcf959d99f1f09b18e
+ 3fdc8d7d0af797bff359ebb3748c51cbfeb8cc0e90647856864e0a36156644c9
+ c90881fa1d30432e9ad20f779e48784721e18c764d03c5276a46b4f0139d186d
+ a5ef72d48637a0b0e1f9c28fa5308d3b7316a38e1841c73415f7f659b8f154c3
+ 8a232fd83b888a783f400fede59c6a3fcca356f94068d9af3c5b7f8a26ddd0b6
+ d301f87e512fb66ac2136d0a11eaae083c36c2a887c7e27fce74a1529854cb30
+ 5c6d4cef98afda2a14248452ba0e91a7b11b0abd220560609e05458d8ef1dbd5
+ f906c118a32e20043da297e745fd15adfc4c00a7603a86e7ddb5bcb642a4e5db
+ 68b5fd0418f3594805b2197f5b1b16449b8e3cbffe8a3b2d2726b56b146a25c1"

From edf96ed4a2845c8c4a015e6e63cad77272a01da0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 28 Jan 2021 19:22:41 +0200
Subject: [PATCH 0661/3482] xarchiver: update to 0.5.4.17.

---
 srcpkgs/xarchiver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template
index 240779473e9b..052082720174 100644
--- a/srcpkgs/xarchiver/template
+++ b/srcpkgs/xarchiver/template
@@ -1,6 +1,6 @@
 # Template file for 'xarchiver'
 pkgname=xarchiver
-version=0.5.4.16
+version=0.5.4.17
 revision=1
 build_style=gnu-configure
 configure_args="--disable-doc --enable-gtk2=no"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ib/xarchiver"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=d31f301d66b77d47e0a40e13e2542d19b30649aff5e7254045baaf4b09cd38b6
+checksum=fec755ffbd50e3575bd2497c755e9fe93265c5735f20de03328485f57d1123e2

From 486ea67f0aa8972899c73d93455a491ebb550f45 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 28 Jan 2021 19:02:26 +0200
Subject: [PATCH 0662/3482] wavpack: update to 5.4.0.

---
 srcpkgs/wavpack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wavpack/template b/srcpkgs/wavpack/template
index 4c6ebca76bdb..b82b264a5065 100644
--- a/srcpkgs/wavpack/template
+++ b/srcpkgs/wavpack/template
@@ -1,6 +1,6 @@
 # Template file for 'wavpack'
 pkgname=wavpack
-version=5.3.0
+version=5.4.0
 revision=1
 build_style=gnu-configure
 short_desc="Hybrid lossless audio compression"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.wavpack.com/"
 distfiles="http://www.wavpack.com/${pkgname}-${version}.tar.bz2"
-checksum=b6f00b3a2185a1d2df6cf8d893ec60fd645d2eb90db7428a617fd27c9e8a6a01
+checksum=0716a6dcf9a72d61005e1b09bbbd61aaf49837cb4e4a351992a6daed16cac034
 
 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in

From 24d0f904e31402a5cc0a3883b12bbaacb1a5c4bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 10:13:39 -0500
Subject: [PATCH 0663/3482] python3-setuptools: update to 52.0.0.

This release drops easy_install, which will cause hard failures when
building python-module or python3-module templates that do not specify
all of their setup_requires dependencies in `hostmakedepends`. This is a
good thing; before, setuptools would fetch setup dependencies on its
own, negatively impacting the reproducibility of package builds.
---
 srcpkgs/python3-setuptools/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index 60a379ef73f6..a694659b68db 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=51.3.3
+version=52.0.0
 revision=1
 wrksrc="setuptools-${version}"
 build_style=python3-module
@@ -14,8 +14,7 @@ license="MIT"
 homepage="https://github.com/pypa/setuptools"
 changelog="https://raw.githubusercontent.com/pypa/setuptools/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.tar.gz"
-checksum=127ec775c4772bfaf2050557b00c4be6e019e52dc2e171a3fb1cd474783a2497
-alternatives="setuptools:easy_install:/usr/bin/easy_install3"
+checksum=fb3a1ee622509550dbf1d419f241296169d7f09cb1eb5b1736f2f10965932b96
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"
 
@@ -31,5 +30,4 @@ do_check() {
 
 post_install() {
 	vlicense LICENSE
-	mv ${PKGDESTDIR}/usr/bin/easy_install ${PKGDESTDIR}/usr/bin/easy_install3
 }

From 0cb6daefa39b9bc53edf843a1078006df21d1e6d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:02:46 -0500
Subject: [PATCH 0664/3482] python3-Flask-User: specify all python3
 hostmakedepends

---
 srcpkgs/python3-Flask-User/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-Flask-User/template b/srcpkgs/python3-Flask-User/template
index ad2fa8483c73..cdd74414e78a 100644
--- a/srcpkgs/python3-Flask-User/template
+++ b/srcpkgs/python3-Flask-User/template
@@ -1,11 +1,12 @@
 # Template file for 'python3-Flask-User'
 pkgname=python3-Flask-User
 version=1.0.2.2
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-Flask python3-Flask-Login python3-Flask-WTF python3-Flask-SQLAlchemy python3-Flask-Mail python3-Flask-Babel"
+hostmakedepends="python3-setuptools python3-Flask-Login"
+depends="python3-Flask python3-Flask-Login python3-Flask-WTF
+ python3-Flask-SQLAlchemy python3-Flask-Mail python3-Flask-Babel"
 short_desc="User session management for Flask (Python3)"
 maintainer="pulux <pulux@pf4sh.de>"
 license="MIT"

From 7573c4042fa8758af3f1829a0cd8ae3cf685da91 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:02:53 -0500
Subject: [PATCH 0665/3482] python3-PGPy: specify all python3 hostmakedepends

---
 srcpkgs/python3-PGPy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-PGPy/template b/srcpkgs/python3-PGPy/template
index cb7069cb13e7..6450ed628736 100644
--- a/srcpkgs/python3-PGPy/template
+++ b/srcpkgs/python3-PGPy/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-PGPy'
 pkgname=python3-PGPy
 version=0.5.3
-revision=1
+revision=2
 wrksrc=PGPy-${version}
 build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-cryptography python3-pyasn1 python3-six"
 short_desc="Pretty Good Privacy for Python"
 maintainer="Anjandev Momi <anjan@momi.ca>"
 license="BSD-3-Clause"

From 98401b9bd88bbd5276ff0745de4a009e190edbed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:08:52 -0500
Subject: [PATCH 0666/3482] python3-aiohttp-sse-client: specify all python3
 hostmakedepends

---
 srcpkgs/python3-aiohttp-sse-client/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-aiohttp-sse-client/template b/srcpkgs/python3-aiohttp-sse-client/template
index ce2167e05632..45ff6693e2a4 100644
--- a/srcpkgs/python3-aiohttp-sse-client/template
+++ b/srcpkgs/python3-aiohttp-sse-client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aiohttp-sse-client'
 pkgname=python3-aiohttp-sse-client
 version=0.2.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,3 +13,8 @@ license="Apache-2.0"
 homepage="https://github.com/rtfol/aiohttp-sse-client"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=7fe8f9af35cf9a97249562e81a35c2f86544ce388928223205021ab00c30edca
+
+post_patch() {
+	# Package does not *need* pytest-runner to build, and Void doesn't have it
+	vsed -e "/setup_requirements/s/['\"]pytest-runner['\"],*//" -i setup.py
+}

From 6d4baecc688159a3d52fbd8983534e252820f6c9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:34:07 -0500
Subject: [PATCH 0667/3482] python3-audioread: specify all python3
 hostmakedepends

---
 srcpkgs/python3-audioread/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-audioread/template b/srcpkgs/python3-audioread/template
index 8db13a91ddb9..0fad35d5c50a 100644
--- a/srcpkgs/python3-audioread/template
+++ b/srcpkgs/python3-audioread/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-audioread'
 pkgname=python3-audioread
 version=2.1.8
-revision=4
+revision=5
 wrksrc="audioread-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,11 @@ homepage="https://github.com/sampsyo/audioread/"
 distfiles="${PYPI_SITE}/a/audioread/audioread-${version}.tar.gz"
 checksum=073904fabc842881e07bd3e4a5776623535562f70b1655b635d22886168dd168
 
+post_patch() {
+	# Build doesn't actually require pytest-runner and Void doesn't offer it
+	vsed -e '/pytest-runner/d' -i setup.py
+}
+
 post_install() {
 	sed -n '2,13p' decode.py > LICENSE
 	vlicense LICENSE

From 9fa15e4a96b6ca55567b409b0b78dcff8def290b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:47:47 -0500
Subject: [PATCH 0668/3482] python-dateutil: specify all python3
 hostmakedepends

---
 srcpkgs/python-dateutil/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python-dateutil/template b/srcpkgs/python-dateutil/template
index bfeef65df2bb..a2dd2430d4de 100644
--- a/srcpkgs/python-dateutil/template
+++ b/srcpkgs/python-dateutil/template
@@ -1,10 +1,9 @@
 # Template file for 'python-dateutil'
 pkgname=python-dateutil
 version=2.8.1
-revision=1
+revision=2
 build_style=python-module
-pycompile_module="dateutil"
-hostmakedepends="python-setuptools python3-setuptools"
+hostmakedepends="python-setuptools python3-setuptools_scm"
 depends="python-six tzdata"
 short_desc="Extensions to the standard Python2 datetime module"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
@@ -23,7 +22,6 @@ post_install() {
 
 python3-dateutil_package() {
 	depends="python3-six tzdata"
-	pycompile_module="dateutil"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*

From d6ff6e59f1183d6b3c489d67f3d8b5983c5c3b38 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:52:21 -0500
Subject: [PATCH 0669/3482] python3-ffmpeg-python: specify all python3
 hostmakedepends

---
 srcpkgs/python3-ffmpeg-python/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ffmpeg-python/template b/srcpkgs/python3-ffmpeg-python/template
index a23624b27b93..171400f6f4df 100644
--- a/srcpkgs/python3-ffmpeg-python/template
+++ b/srcpkgs/python3-ffmpeg-python/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ffmpeg-python'
 pkgname=python3-ffmpeg-python
 version=0.2.0
-revision=2
+revision=3
 wrksrc="ffmpeg-python-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,3 +13,8 @@ license="Apache-2.0"
 homepage="https://github.com/kkroening/ffmpeg-python"
 distfiles="https://github.com/kkroening/ffmpeg-python/archive/${version}.tar.gz"
 checksum="01b6b7640f00585a404194a358358bdf7f4050cedcd99f41416ac8b27222c9f1"
+
+post_patch() {
+	# Build doesn't *need* pytest-runner and Void doesn't provide it
+	vsed -e '/pytest-runner/d' -i setup.py
+}

From 5f500c3e73ac50d063137eb084447b0935905157 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:37:38 -0500
Subject: [PATCH 0670/3482] python3-gitchangelog: specify all python3
 hostmakedepends

---
 .../patches/setup.cfg.patch                   | 25 +++++++++++++++++++
 .../patches/setup.py.patch                    | 25 +++++++++++++++++++
 srcpkgs/python3-gitchangelog/template         |  5 ++--
 3 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/python3-gitchangelog/patches/setup.cfg.patch
 create mode 100644 srcpkgs/python3-gitchangelog/patches/setup.py.patch

diff --git a/srcpkgs/python3-gitchangelog/patches/setup.cfg.patch b/srcpkgs/python3-gitchangelog/patches/setup.cfg.patch
new file mode 100644
index 000000000000..efc271d01e0a
--- /dev/null
+++ b/srcpkgs/python3-gitchangelog/patches/setup.cfg.patch
@@ -0,0 +1,25 @@
+Make sure that setuptools_scm actually installs the module and entrypoint.
+
+--- setup.cfg	2021-01-28 10:10:54.291152917 -0500
++++ setup.cfg	2021-01-28 10:13:12.191007896 -0500
+@@ -61,3 +61,20 @@
+ tag_date = 0
+ tag_svn_revision = 0
+
++[options]
++packages = 
++	gitchangelog
++package_dir =
++	=src
++setup_requires =
++	setuptools
++	setuptools-scm
++
++[options.entry_points]
++console_scripts = 
++	gitchangelog = gitchangelog.gitchangelog:main
++
++[options.package_data]
++gitchangelog =
++	gitchangelog.rc.*
++	templates/**/*
diff --git a/srcpkgs/python3-gitchangelog/patches/setup.py.patch b/srcpkgs/python3-gitchangelog/patches/setup.py.patch
new file mode 100644
index 000000000000..c9f5b7ced26a
--- /dev/null
+++ b/srcpkgs/python3-gitchangelog/patches/setup.py.patch
@@ -0,0 +1,25 @@
+The d2to1 package is defunct and not offered by Void; roughly equivalent
+functionality is provided by setuptools_scm, which is provided by Void. Drop
+the special d2to1 setup call to allow setuptools_scm to work properly.
+
+--- setup.py	2021-01-28 10:00:20.165871918 -0500
++++ setup.py	2021-01-28 10:01:07.760817952 -0500
+@@ -58,17 +58,4 @@
+ ## Normal d2to1 setup
+ ##
+ 
+-setup(
+-    setup_requires=['d2to1'],
+-    extras_require={
+-        'Mustache': ["pystache", ],
+-        'Mako': ["mako", ],
+-        'test': [
+-            "nose",
+-            "minimock",
+-            "mako",
+-            "pystache",
+-        ],
+-    },
+-    d2to1=True
+-)
++setup(use_scm_version=True)
diff --git a/srcpkgs/python3-gitchangelog/template b/srcpkgs/python3-gitchangelog/template
index c62eecee9a43..348dc2c83b6d 100644
--- a/srcpkgs/python3-gitchangelog/template
+++ b/srcpkgs/python3-gitchangelog/template
@@ -1,11 +1,10 @@
 # Template file for 'python3-gitchangelog'
 pkgname=python3-gitchangelog
 version=3.0.4
-revision=3
+revision=4
 wrksrc="gitchangelog-${version}"
 build_style=python3-module
-pycompile_module="gitchangelog"
-hostmakedepends="python3-setuptools git"
+hostmakedepends="python3-setuptools_scm"
 depends="python3-pystache python3-Mako"
 short_desc="Creates a changelog from git log history"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 728475ca2b302a8ac842343469954b8f8d57f184 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:23:11 -0500
Subject: [PATCH 0671/3482] python3-changelogs: update to 0.15.0.

---
 srcpkgs/python3-changelogs/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-changelogs/template b/srcpkgs/python3-changelogs/template
index b86a11862afc..6893d6f8d974 100644
--- a/srcpkgs/python3-changelogs/template
+++ b/srcpkgs/python3-changelogs/template
@@ -1,20 +1,19 @@
 # Template file for 'python3-changelogs'
 pkgname=python3-changelogs
-version=0.14.0
-revision=3
+version=0.15.0
+revision=1
 wrksrc="changelogs-${version}"
 build_style=python3-module
-pycompile_module="changelogs"
 hostmakedepends="python3-setuptools"
-depends="python3-requests python3-lxml python3-packaging python3-validators
- python3-gitchangelog"
+depends="python3-requests python3-lxml python3-packaging
+ python3-validators python3-gitchangelog"
 short_desc="Changelog finder and parser for vendors like PyPi and npm"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/pyupio/changelogs"
 changelog="https://raw.githubusercontent.com/pyupio/changelogs/master/HISTORY.rst"
 distfiles="https://github.com/pyupio/changelogs/archive/${version}.tar.gz"
-checksum=90f5e631e580f928b732e3941a5ce26520ba53879bd95daab57018e01dbfabc7
+checksum=d2c14fd7c0847effe2f8eaebf33d77c7872c60f246aa592ca6906a1b32c02b9c
 
 post_install() {
 	vlicense LICENSE

From fbbaa6d13d225c503d5c13232088b6752c250c43 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:41:55 -0500
Subject: [PATCH 0672/3482] python3-guessit: specify all python3
 hostmakedepends

---
 srcpkgs/python3-guessit/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-guessit/template b/srcpkgs/python3-guessit/template
index ededabb16e43..8945e95b0416 100644
--- a/srcpkgs/python3-guessit/template
+++ b/srcpkgs/python3-guessit/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-guessit'
 pkgname=python3-guessit
 version=3.1.1
-revision=2
+revision=3
 wrksrc="guessit-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,3 +12,8 @@ license="LGPL-3.0-only"
 homepage="https://guessit.readthedocs.io/en/latest/"
 distfiles="${PYPI_SITE}/g/guessit/guessit-${version}.tar.gz"
 checksum=71c68c6d4e9d639eba6534a838468115ad20f4c5a688eae3079f0c08d605a3b0
+
+post_patch() {
+	# Package does not *need* pytest-runner to build, and Void doesn't have it
+	vsed -e "/setup_requires/s/['\"]pytest-runner['\"],*//" -i setup.py
+}

From 3e5ea23a758bf25b6f29046de9361efba53b5202 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:43:25 -0500
Subject: [PATCH 0673/3482] python3-humanize: specify all python3
 hostmakedepends

---
 srcpkgs/python3-humanize/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-humanize/template b/srcpkgs/python3-humanize/template
index 16c3f2b99e5c..c87482c4cdd6 100644
--- a/srcpkgs/python3-humanize/template
+++ b/srcpkgs/python3-humanize/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-humanize'
 pkgname=python3-humanize
 version=2.0.0
-revision=2
+revision=3
 wrksrc="humanize-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 checkdepends="python3-pytest python3-freezegun"
 short_desc="Python humanize utilities"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From cb444488a1fbdde5b5e7b8f877fb9fd7a341af7e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:48:44 -0500
Subject: [PATCH 0674/3482] python3-irc: specify all python3 hostmakedepends

---
 srcpkgs/python3-irc/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-irc/template b/srcpkgs/python3-irc/template
index f35356ccbe7d..2acc061017f0 100644
--- a/srcpkgs/python3-irc/template
+++ b/srcpkgs/python3-irc/template
@@ -1,11 +1,10 @@
 # Template file for 'python3-irc'
 pkgname=python3-irc
 version=17.1
-revision=3
+revision=4
 wrksrc="irc-${version}"
 build_style=python3-module
-pycompile_module="irc"
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3-six"
 short_desc="Full-featured Python IRC library for Python3"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 39f2a1216af55aacd5f072f9d53449e681eae654 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:52:17 -0500
Subject: [PATCH 0675/3482] python3-jaraco.classes: specify all python3
 hostmakedepends

---
 srcpkgs/python3-jaraco.classes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jaraco.classes/template b/srcpkgs/python3-jaraco.classes/template
index a7dd48bd5cde..162a4a994134 100644
--- a/srcpkgs/python3-jaraco.classes/template
+++ b/srcpkgs/python3-jaraco.classes/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-jaraco.classes'
 pkgname=python3-jaraco.classes
 version=3.1.0
-revision=2
+revision=3
 wrksrc="jaraco.classes-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3-jaraco python3-more-itertools"
 short_desc="Utility functions for Python class constructs (Python3)"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"

From 863d986ab8feb91fc5d77e225663671827ac38dd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:52:17 -0500
Subject: [PATCH 0676/3482] python3-jaraco.collections: specify all python3
 hostmakedepends

---
 srcpkgs/python3-jaraco.collections/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jaraco.collections/template b/srcpkgs/python3-jaraco.collections/template
index 68ee5f3c353a..41e658e921e9 100644
--- a/srcpkgs/python3-jaraco.collections/template
+++ b/srcpkgs/python3-jaraco.collections/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-jaraco.collections'
 pkgname=python3-jaraco.collections
 version=3.0.0
-revision=2
+revision=3
 wrksrc="jaraco.collections-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3-jaraco.classes python3-jaraco.text python3-six"
 short_desc="Collection of objects similar to stdlib by jaraco (Python3)"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"

From eab758cfc19ea0b739b5b105b55e086b03b6536e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:52:17 -0500
Subject: [PATCH 0677/3482] python3-jaraco.text: specify all python3
 hostmakedepends

---
 srcpkgs/python3-jaraco.text/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jaraco.text/template b/srcpkgs/python3-jaraco.text/template
index ffe2f5bb1abb..c8e03b56e644 100644
--- a/srcpkgs/python3-jaraco.text/template
+++ b/srcpkgs/python3-jaraco.text/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-jaraco.text'
 pkgname=python3-jaraco.text
 version=3.2.0
-revision=2
+revision=3
 wrksrc="jaraco.text-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3-jaraco.functools python3-six"
 short_desc="Module for text manipulation (Python3)"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"

From a4a5905ad94c435b224600aaec0d521619b8a5ba Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:52:17 -0500
Subject: [PATCH 0678/3482] python3-jaraco.functools: specify all python3
 hostmakedepends

---
 srcpkgs/python3-jaraco.functools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jaraco.functools/template b/srcpkgs/python3-jaraco.functools/template
index bedec81e1300..d6ad6cfafa89 100644
--- a/srcpkgs/python3-jaraco.functools/template
+++ b/srcpkgs/python3-jaraco.functools/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-jaraco.functools'
 pkgname=python3-jaraco.functools
 version=3.0.1
-revision=2
+revision=3
 wrksrc="jaraco.functools-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm python3-toml python3-more-itertools"
 depends="python3-more-itertools python3-jaraco"
 checkdepends="${depends} python3-pytest python3-jaraco.classes"
 short_desc="Functools like those found in stdlib (Python3)"

From 8a3232d117688fc8dc73fd15f9439733ceb86df8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:56:50 -0500
Subject: [PATCH 0679/3482] python3-keyring: specify all python3
 hostmakedepends

---
 srcpkgs/python3-keyring/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template
index 34b73a550488..89783fc3036a 100644
--- a/srcpkgs/python3-keyring/template
+++ b/srcpkgs/python3-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-keyring'
 pkgname=python3-keyring
 version=21.2.1
-revision=2
+revision=3
 wrksrc="keyring-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm python3-toml"
 depends="python3-setuptools python3-SecretStorage python3-entrypoints"
 short_desc="Python interface to the system keyring service"
 maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"

From 8eb2f8d3fe2fd2ed6867d65f542b1337b86fdb63 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:56:50 -0500
Subject: [PATCH 0680/3482] python3-keyrings-alt: specify all python3
 hostmakedepends

---
 srcpkgs/python3-keyrings-alt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-keyrings-alt/template b/srcpkgs/python3-keyrings-alt/template
index 8ef8354489fb..24e1d8a79d9a 100644
--- a/srcpkgs/python3-keyrings-alt/template
+++ b/srcpkgs/python3-keyrings-alt/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-keyrings-alt'
 pkgname=python3-keyrings-alt
 version=4.0.2
-revision=1
+revision=2
 wrksrc="keyrings.alt-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm python3-toml"
 depends="python3-keyring"
 checkdepends="${depends} python3-pytest"
 short_desc="Alternate keyring backend implementations"

From 85df3745e593e93da48f69346a80dbc3fc5969b8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:56:50 -0500
Subject: [PATCH 0681/3482] python3-keyutils: specify all python3
 hostmakedepends

---
 srcpkgs/python3-keyutils/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-keyutils/template b/srcpkgs/python3-keyutils/template
index dae38bbae85f..6a71cbb6b4e4 100644
--- a/srcpkgs/python3-keyutils/template
+++ b/srcpkgs/python3-keyutils/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-keyutils'
 pkgname=python3-keyutils
 version=0.6
-revision=4
+revision=5
 wrksrc=python-keyutils-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,3 +12,8 @@ license="Apache-2.0"
 homepage="https://github.com/sassoftware/python-keyutils"
 distfiles="https://github.com/sassoftware/python-keyutils/archive/${version}.tar.gz"
 checksum=f69e6cadc50525dcb117714e440ee6579b0e5b7f12910b2bb2e910b236a2b18b
+
+post_patch() {
+	# Package does not *need* pytest-runner to build, and Void doesn't have it
+	vsed -e "/setup_requires/s/['\"]pytest-runner['\"],*//" -i setup.py
+}

From 78b961dd907bc8fd12e6a3b7f4d9fb55ca0022ae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:02:10 -0500
Subject: [PATCH 0682/3482] python3-marisa-trie: specify all python3
 hostmakedepends

---
 srcpkgs/python3-marisa-trie/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-marisa-trie/template b/srcpkgs/python3-marisa-trie/template
index 288e5650df18..9b4d15dbffa0 100644
--- a/srcpkgs/python3-marisa-trie/template
+++ b/srcpkgs/python3-marisa-trie/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-marisa-trie'
 pkgname=python3-marisa-trie
 version=0.7.5
-revision=5
+revision=6
 wrksrc="marisa-trie-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"
@@ -14,6 +14,11 @@ changelog="https://raw.githubusercontent.com/pytries/marisa-trie/master/CHANGES.
 distfiles="${PYPI_SITE}/m/marisa-trie/marisa-trie-${version}.tar.gz"
 checksum=c73bc25d868e8c4ea7aa7f1e19892db07bba2463351269b05340ccfa06eb2baf
 
+post_patch() {
+	# Package does not *need* pytest-runner to build, and Void doesn't have it
+	vsed -e "/setup_requires/s/['\"]pytest-runner['\"],*//" -i setup.py
+}
+
 pre_build() {
 	rm -f src/marisa_trie.cpp
 	cython src/*.pyx src/*.pxd --cplus

From f63c486f3044f733a6c34eafe6f0946c2a52d72f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:09:56 -0500
Subject: [PATCH 0683/3482] python3-pluggy: specify all python3 hostmakedepends

---
 srcpkgs/python3-pluggy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pluggy/template b/srcpkgs/python3-pluggy/template
index c0b4b1c2bc84..1f615db52172 100644
--- a/srcpkgs/python3-pluggy/template
+++ b/srcpkgs/python3-pluggy/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-pluggy'
 pkgname=python3-pluggy
 version=0.13.1
-revision=5
+revision=6
 wrksrc="pluggy-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Minimalist production ready plugin system (Python3)"

From 6f78f581d0faf1116ddb0a81e5a7ab4e92a77103 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:10:14 -0500
Subject: [PATCH 0684/3482] python3-portend: specify all python3
 hostmakedepends

---
 srcpkgs/python3-portend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-portend/template b/srcpkgs/python3-portend/template
index b3b889ce16a7..27b2642a28e2 100644
--- a/srcpkgs/python3-portend/template
+++ b/srcpkgs/python3-portend/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-portend'
 pkgname=python3-portend
 version=2.7.0
-revision=1
+revision=2
 wrksrc="portend-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
+hostmakedepends="python3-setuptools_scm python3-toml"
 depends="python3-tempora python3-jaraco.functools"
 short_desc="TCP port monitoring utilities (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8a3b605ac95c9cb53c8e65c8c765bf4191469e3e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:10:26 -0500
Subject: [PATCH 0685/3482] python3-pylast: specify all python3 hostmakedepends

---
 srcpkgs/python3-pylast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pylast/template b/srcpkgs/python3-pylast/template
index 2f37811d5ab0..bc82ff5514d8 100644
--- a/srcpkgs/python3-pylast/template
+++ b/srcpkgs/python3-pylast/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-pylast'
 pkgname=python3-pylast
 version=4.1.0
-revision=1
+revision=2
 wrksrc="pylast-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3"
 short_desc="Python3 interface to last.fm and libre.fm"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"

From 317978612468d0d26a4df1e194a8cd06e3bd841f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:10:34 -0500
Subject: [PATCH 0686/3482] python3-pysol_cards: specify all python3
 hostmakedepends

---
 srcpkgs/python3-pysol_cards/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index f97857216d99..9e992b779564 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
 version=0.10.1
-revision=2
+revision=3
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
 checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
  python3-cryptography python3-dogpile.cache python3-future python3-jmespath

From 3d63f5f83716c903f81e8742479fff4168cec496 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:10:44 -0500
Subject: [PATCH 0687/3482] python3-pytest-qt: specify all python3
 hostmakedepends

---
 srcpkgs/python3-pytest-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pytest-qt/template b/srcpkgs/python3-pytest-qt/template
index ab870da8e06a..0325ffe5611f 100644
--- a/srcpkgs/python3-pytest-qt/template
+++ b/srcpkgs/python3-pytest-qt/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-pytest-qt'
 pkgname=python3-pytest-qt
 version=3.3.0
-revision=2
+revision=3
 wrksrc=pytest-qt-${version}
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3-pytest"
 checkdepends="$depends python3-pyside2 python3-PyQt5 python3-pytest-xvfb
  xdpyinfo"

From e299f035b3a2a47ead97084038e4f7d63ab8996e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:11:34 -0500
Subject: [PATCH 0688/3482] python3-rebulk: specify all python3 hostmakedepends

---
 srcpkgs/python3-rebulk/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-rebulk/template b/srcpkgs/python3-rebulk/template
index 42118c4629ae..3d620df0c614 100644
--- a/srcpkgs/python3-rebulk/template
+++ b/srcpkgs/python3-rebulk/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rebulk'
 pkgname=python3-rebulk
 version=2.0.1
-revision=3
+revision=4
 wrksrc="rebulk-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,11 @@ homepage="https://github.com/Toilal/rebulk"
 distfiles="${PYPI_SITE}/r/rebulk/rebulk-${version}.tar.gz"
 checksum=320ded3cc456347d828f95e9aa5f8bab77ac01943cad024c06012069fe19690a
 
+post_patch() {
+	# Package does not *need* pytest-runner to build, and Void doesn't have it
+	vsed -e "/setup_requires/s/['\"]pytest-runner['\"],*//" -i setup.py
+}
+
 post_install() {
 	vlicense LICENSE
 }

From 60469b1f590401e2ecc857bb522076485f5d4bae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:11:44 -0500
Subject: [PATCH 0689/3482] python3-testtools: specify all python3
 hostmakedepends

---
 srcpkgs/python3-testtools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-testtools/template b/srcpkgs/python3-testtools/template
index 43500391a4f1..3fcae7eec932 100644
--- a/srcpkgs/python3-testtools/template
+++ b/srcpkgs/python3-testtools/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-testtools'
 pkgname=python3-testtools
 version=2.4.0
-revision=2
+revision=3
 wrksrc="testtools-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-pbr"
 short_desc="Python3 standard library unit testing framework"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="MIT"

From ba9f15db38f04e5824c0f8f893e2e85cf2064f86 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:11:54 -0500
Subject: [PATCH 0690/3482] python3-treq: specify all python3 hostmakedepends

---
 srcpkgs/python3-treq/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-treq/template b/srcpkgs/python3-treq/template
index 21a11977189c..977b97fb6424 100644
--- a/srcpkgs/python3-treq/template
+++ b/srcpkgs/python3-treq/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-treq'
 pkgname=python3-treq
 version=20.3.0
-revision=2
+revision=3
 wrksrc="treq-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-incremental python3-requests>=2.1.0 python3-six
+hostmakedepends="python3-setuptools python3-incremental"
+depends="python3-incremental python3-requests python3-six
  python3-Twisted python3-attrs"
 short_desc="Requests-like API built on top of twisted.web's Agent"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9caf6f65c1349b46631a3670acbfccc61fdda2a3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:12:07 -0500
Subject: [PATCH 0691/3482] python3-zope.security: specify all python3
 hostmakedepends

---
 srcpkgs/python3-zope.security/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zope.security/template b/srcpkgs/python3-zope.security/template
index 5cc8e5c95dc3..73a82360ce0f 100644
--- a/srcpkgs/python3-zope.security/template
+++ b/srcpkgs/python3-zope.security/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-zope.security'
 pkgname=python3-zope.security
 version=5.1.1
-revision=2
+revision=3
 wrksrc="zope.security-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-distutils-extra"
+hostmakedepends="python3-setuptools python3-zope.proxy"
 makedepends="python3-devel"
 depends="python3-zope.component python3-zope.configuration python3-zope.testing
  python3-zope.testrunner python3-zope.location"

From fc203ee55097c5e0e4f3f37db1184eee81a0bd59 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:14:44 -0500
Subject: [PATCH 0692/3482] python3-numexpr: fix checksum

---
 srcpkgs/python3-numexpr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-numexpr/template b/srcpkgs/python3-numexpr/template
index 31984949e5e7..16f21540547d 100644
--- a/srcpkgs/python3-numexpr/template
+++ b/srcpkgs/python3-numexpr/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-numexpr'
 pkgname=python3-numexpr
 version=2.7.2
-revision=1
+revision=2
 wrksrc="numexpr-${version}"
 build_style=python3-module
 build_helper=numpy
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/pydata/numexpr"
 distfiles="https://github.com/pydata/numexpr/archive/v${version}.tar.gz"
-checksum=c939f806c179e9fcb80100f3cd32a748d14a6101c29fb102cc77844549c88291
+checksum=7d1b3790103221feda07f4a93a4fa5c6654f46865197a677ca6f27eb5cb4e5ef
 
 post_install() {
 	vlicense LICENSE.txt

From f9d958ab6d36e6748dfb790504a6619a9026a63a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:39:08 -0500
Subject: [PATCH 0693/3482] nagstamon: fix checksum

---
 srcpkgs/nagstamon/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nagstamon/template b/srcpkgs/nagstamon/template
index bf07c6d1bceb..a3e92bfa761d 100644
--- a/srcpkgs/nagstamon/template
+++ b/srcpkgs/nagstamon/template
@@ -1,10 +1,9 @@
 # Template file for 'nagstamon'
 pkgname=nagstamon
 version=3.4.1
-revision=1
+revision=2
 wrksrc=Nagstamon
 build_style=python3-module
-pycompile_module="Nagstamon"
 hostmakedepends="python3-setuptools python3-keyring python3-psutil"
 depends="python3-BeautifulSoup4 python3-dbus python3-keyring python3-lxml
  python3-psutil python3-PyQt5-multimedia python3-PyQt5-svg python3-requests"
@@ -13,7 +12,7 @@ maintainer="Laszlo Dvornik <laulicus@zoho.com>"
 license="GPL-2.0-or-later"
 homepage="https://nagstamon.ifw-dresden.de"
 distfiles="https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz"
-checksum=2d26cf4d64a6e27fe55f1c5e5f042af511bcb09876ae16a456aee5800a98adea
+checksum=7a9611f40b08269bba4100ab2598ee089c7d0ebc6c4e9d7132689342f71150ec
 
 post_patch() {
 	# This relies on /etc/os-release, which doesn't exist without

From ae9314c39a43cd24f40ca6217d4efc66a720ef5d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:20 -0500
Subject: [PATCH 0694/3482] duplicity: specify all python3 hostmakedepends

---
 srcpkgs/duplicity/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template
index fa066c267506..85bfe1316380 100644
--- a/srcpkgs/duplicity/template
+++ b/srcpkgs/duplicity/template
@@ -1,9 +1,9 @@
 # Template file for 'duplicity'
 pkgname=duplicity
 version=0.8.18
-revision=1
+revision=2
 build_style=python3-module
-hostmakedepends="gettext python3-setuptools"
+hostmakedepends="gettext python3-setuptools_scm"
 makedepends="python3-devel librsync-devel"
 depends="python3-fasteners gnupg python3-future python3-urllib3"
 short_desc="Encrypted bandwidth-efficient backup using the rsync algorithm"

From d6dd5af03d3b7921908d312ff2ba560e58246162 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:20 -0500
Subject: [PATCH 0695/3482] fava: specify all python3 hostmakedepends

---
 srcpkgs/fava/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fava/template b/srcpkgs/fava/template
index a5463088647a..0478e0115011 100644
--- a/srcpkgs/fava/template
+++ b/srcpkgs/fava/template
@@ -1,9 +1,9 @@
 # Template file for 'fava'
 pkgname=fava
 version=1.17
-revision=1
+revision=2
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3-Babel python3-Cheroot python3-Flask-Babel python3-Flask
  python3-Jinja2 beancount python3-click python3-markdown2 python3-ply
  python3-simplejson python3-Werkzeug python3-aiohttp"

From a6e24824d36b29c2b76ff52c079fa0e5a8f59bb5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:20 -0500
Subject: [PATCH 0696/3482] khard: specify all python3 hostmakedepends

---
 srcpkgs/khard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khard/template b/srcpkgs/khard/template
index da57783e4e6e..cdbaa5b0b6f1 100644
--- a/srcpkgs/khard/template
+++ b/srcpkgs/khard/template
@@ -1,9 +1,9 @@
 # Template file for 'khard'
 pkgname=khard
 version=0.17.0
-revision=2
+revision=3
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3-setuptools python3-atomicwrites python3-configobj
  python3-vobject python3-Unidecode python3-ruamel.yaml"
 short_desc="Command-line addressbook built around CardDAV"

From e0462d674fedf50f4f599cf07defb5997b4770b1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:20 -0500
Subject: [PATCH 0697/3482] protontricks: specify all python3 hostmakedepends

---
 srcpkgs/protontricks/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index d53364f804a9..306a6c7e2d67 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,10 +1,9 @@
 # Template file for 'protontricks'
 pkgname=protontricks
 version=1.4.3
-revision=1
+revision=2
 build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3-vdf winetricks"
 short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"

From dbf0ed3be096624423b15f6113c369f52387bce8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:20 -0500
Subject: [PATCH 0698/3482] python-b2sdk: specify all python3 hostmakedepends

---
 srcpkgs/python-b2sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index d394714962d3..838d3c2fb897 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -2,10 +2,10 @@
 # keep python-b2sdk name to revert this package
 pkgname=python-b2sdk
 version=1.3.0
-revision=1
+revision=2
 wrksrc="b2sdk-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3-logfury python3-Arrow python3-requests python3-six"
 checkdepends="python3-pytest $depends python3-dateutil python3-nose
  python3-mock python3-tqdm python3-pyflakes"

From faf8c2956138c9e7cd5aba6372534b45ae3f07d7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:21 -0500
Subject: [PATCH 0699/3482] rdiff-backup: specify all python3 hostmakedepends

---
 srcpkgs/rdiff-backup/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rdiff-backup/template b/srcpkgs/rdiff-backup/template
index 752c58e6cbc3..a237dd4ce4c0 100644
--- a/srcpkgs/rdiff-backup/template
+++ b/srcpkgs/rdiff-backup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdiff-backup'
 pkgname=rdiff-backup
 version=2.0.5
-revision=2
+revision=3
 build_style=python3-module
-hostmakedepends="python3 python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 makedepends="python3-devel librsync-devel"
-depends="python3 python3-pyxattr"
+depends="python3-pyxattr"
 short_desc="Local/remote mirroring and incremental backups"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From a1d67ab1f61be65f4ebcce986d5470b747a8e485 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:21 -0500
Subject: [PATCH 0700/3482] terminator: specify all python3 hostmakedepends

---
 srcpkgs/terminator/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/terminator/template b/srcpkgs/terminator/template
index db55cc6c38c2..c29cbc4a756e 100644
--- a/srcpkgs/terminator/template
+++ b/srcpkgs/terminator/template
@@ -1,7 +1,7 @@
 # Template file for 'terminator'
 pkgname=terminator
 version=2.0.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="intltool python3-setuptools"
 depends="desktop-file-utils gsettings-desktop-schemas libkeybinder3 libnotify
@@ -13,3 +13,8 @@ homepage="https://gnome-terminator.org"
 changelog="https://raw.githubusercontent.com/gnome-terminator/terminator/master/CHANGELOG.md"
 distfiles="https://github.com/gnome-terminator/terminator/releases/download/v$version/terminator-$version.tar.gz"
 checksum=e6a21ea18c48b9dcb8fac3b48fd90bc49768de13c2a749047c46a6e0f14abb24
+
+post_patch() {
+	# Package does not *need* pytest-runner to build, and Void doesn't have it
+	vsed -e '/pytest-runner/d' -i setup.py
+}

From 960a3510c73de306a68557fb86e1990daae6f88b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:21 -0500
Subject: [PATCH 0701/3482] todoman: specify all python3 hostmakedepends

---
 srcpkgs/todoman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/todoman/template b/srcpkgs/todoman/template
index 4eecfc758b25..1236479016a2 100644
--- a/srcpkgs/todoman/template
+++ b/srcpkgs/todoman/template
@@ -1,9 +1,9 @@
 # Template file for 'todoman'
 pkgname=todoman
 version=3.8.0
-revision=2
+revision=3
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3-icalendar python3-urwid python3-xdg python3-parsedatetime
  python3-atomicwrites python3-click-repl python3-configobj python3-click-log
  python3-dateutil python3-tabulate python3-humanize"

From 0f483b8870aa5d73a0049664a801b56377e5962d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:21 -0500
Subject: [PATCH 0702/3482] whipper: specify all python3 hostmakedepends

Closes: #28261.
---
 srcpkgs/whipper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/whipper/template b/srcpkgs/whipper/template
index 03e5b89030b5..8826ee845ab9 100644
--- a/srcpkgs/whipper/template
+++ b/srcpkgs/whipper/template
@@ -1,9 +1,9 @@
 # Template file for 'whipper'
 pkgname=whipper
 version=0.9.0
-revision=2
+revision=3
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 makedepends="libsndfile-devel python3-devel"
 depends="libcdio-paranoia cdrdao python3-gobject python3-musicbrainzngs
  python3-mutagen python3-requests python3-pycdio python3-discid

From 042227987611b64e2999970553ea90a1c95b0f27 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 28 Jan 2021 22:20:42 +0100
Subject: [PATCH 0703/3482] opendoas: update to 6.8.1.

This fixes CVE-2019-25016.
---
 srcpkgs/opendoas/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opendoas/template b/srcpkgs/opendoas/template
index fb68b70ddebd..e70c2509cbfe 100644
--- a/srcpkgs/opendoas/template
+++ b/srcpkgs/opendoas/template
@@ -1,7 +1,7 @@
 # Template file for 'opendoas'
 pkgname=opendoas
-version=6.8
-revision=2
+version=6.8.1
+revision=1
 wrksrc="OpenDoas-$version"
 build_style=configure
 configure_args="--prefix=/usr $(vopt_with 'pam') $(vopt_with 'timestamp')"
@@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, BSD-3-Clause"
 homepage="https://github.com/Duncaen/OpenDoas"
 distfiles="https://github.com/Duncaen/OpenDoas/archive/v${version}.tar.gz"
-checksum=c53edc59a576cfe8ec8737230e7d0398842a5a8c925e25065463ab632a7eaba9
+checksum=c9070ae745d0f1bbe68ef0783a3958cd011b409959f65fd100e6b42b8ad6b162
 
 build_options="pam timestamp"
 build_options_default="pam timestamp"

From 11191aff4fa9a29bb9e43620b66b269acf262010 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 28 Jan 2021 22:25:01 +0100
Subject: [PATCH 0704/3482] umurmur: update to 0.2.19.

---
 srcpkgs/umurmur/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index eac7c2754658..276bdd8302c3 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,6 +1,6 @@
 # Template file for 'umurmur'
 pkgname=umurmur
-version=0.2.18
+version=0.2.19
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
@@ -11,8 +11,9 @@ short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"
 homepage="http://umurmur.net/"
+changelog="https://github.com/umurmur/umurmur/raw/master/ChangeLog"
 distfiles="https://github.com/umurmur/umurmur/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=f72c2fe802c8ab2c8dc66eb5da1fbe0c3ee73aef16abf06bba94cc69e595354f
+checksum=338053160bc48e48850061cdfc19cf1b2bb66e56877c04cd6de7831b468646b6
 
 system_accounts="umurmur"
 umurmur_homedir="/var/lib/umurmur"

From 11ed5fef8b2a3ad87653318510cc2ecc4f5a854d Mon Sep 17 00:00:00 2001
From: "Kira L. Patton" <roundduckkira@protonmail.com>
Date: Mon, 25 Jan 2021 13:33:01 -0500
Subject: [PATCH 0705/3482] PikoPixel.app: update to 1.0.b10, and fix and clean
 up package code

---
 srcpkgs/PikoPixel.app/template | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/PikoPixel.app/template b/srcpkgs/PikoPixel.app/template
index 33eda021519d..755801587377 100644
--- a/srcpkgs/PikoPixel.app/template
+++ b/srcpkgs/PikoPixel.app/template
@@ -1,6 +1,6 @@
 # Template file for 'PikoPixel.app'
 pkgname=PikoPixel.app
-version=1.0.b9e
+version=1.0.b10
 revision=1
 wrksrc="PikoPixel.Sources.${version%.*}-${version##*.}"
 build_wrksrc=PikoPixel
@@ -8,21 +8,17 @@ build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="gnustep-make gcc-objc tar which"
 makedepends="gnustep-base-devel gnustep-gui-devel"
-depends="gnustep-base gnustep-gui gnustep-back"
+depends="gnustep-back"
 short_desc="GNUstep application for drawing/editing pixel-art"
-maintainer="Kira Patton <roundduckman@protonmail.com>"
+maintainer="Kira L. Patton <roundduckkira@protonmail.com>"
 license="AGPL-3.0-only"
 homepage="http://twilightedge.com/mac/pikopixel/"
 distfiles="http://twilightedge.com/downloads/PikoPixel.Sources.${version%.*}-${version##*.}.tar.gz"
-checksum=96977fc51343d294c7d7e76d8f1ac7aa82ae9da1d7d082dee6cee8035959afbe
+checksum=e754a89b4a3de5e034c96468d3bc37a0909ea7c06905546ee85658a5dfb547ac
 
-pre_build() {
-	source /usr/share/GNUstep/Makefiles/GNUstep.sh
-}
-
-pre_install() {
-	source /usr/share/GNUstep/Makefiles/GNUstep.sh
-}
+if [ -e /usr/share/GNUstep/Makefiles/GNUstep.sh ]; then
+	. /usr/share/GNUstep/Makefiles/GNUstep.sh
+fi
 
 post_install() {
 	vinstall PikoPixel.app/Resources/PikoPixel.desktop 0755 /usr/share/applications/

From 52e3993be6cdaa160afb41db011873fbe8c5afa9 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 26 Jan 2021 21:04:54 +0300
Subject: [PATCH 0706/3482] inotify-tools: update to 3.20.11.0

---
 srcpkgs/inotify-tools/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/inotify-tools/template b/srcpkgs/inotify-tools/template
index 36f30d23e40c..c27984b3543a 100644
--- a/srcpkgs/inotify-tools/template
+++ b/srcpkgs/inotify-tools/template
@@ -1,19 +1,18 @@
 # Template file for 'inotify-tools'
 pkgname=inotify-tools
-version=3.20.2.2
-revision=2
+version=3.20.11.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 short_desc="Provides a simple interface to inotify"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/rvoicilas/inotify-tools"
-distfiles="https://github.com/rvoicilas/${pkgname}/archive/${version}.tar.gz"
-checksum=770fb1d94ace659f975d7494e3ab8b421a6aab930b9c37c7c290ab5280abb7b8
+homepage="https://github.com/inotify-tools/inotify-tools"
+distfiles="https://github.com/inotify-tools/inotify-tools/archive/${version}.tar.gz"
+checksum=58a3cde89e4a5111a87ac16b56b06a8f885460fca0aea51b69c856ce30a37a14
 
 pre_configure() {
-	touch README
-	autoreconf -i
+	autoreconf -fi
 }
 
 libinotify-tools_package() {

From cda3326c86134f9aeed8558da1486386461e5c53 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 29 Jan 2021 01:45:20 +0100
Subject: [PATCH 0707/3482] squashfs-tools-ng: update to 1.0.4.

---
 srcpkgs/squashfs-tools-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/squashfs-tools-ng/template b/srcpkgs/squashfs-tools-ng/template
index ca514c409aa1..8494e2598e78 100644
--- a/srcpkgs/squashfs-tools-ng/template
+++ b/srcpkgs/squashfs-tools-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'squashfs-tools-ng'
 pkgname=squashfs-tools-ng
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://infraroot.at/projects/squashfs-tools-ng/index.html"
 changelog="https://git.infraroot.at/squashfs-tools-ng.git/plain/CHANGELOG.md"
 distfiles="https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"
-checksum=b1e4b7206e4629ba47e74fea897eb50f938e095d51cae79e77226da008045143
+checksum=e2809efdc51156196db7af591fd9ffc44297624b369619f214794c1b34bffb13
 
 squashfs-tools-ng-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From bd4dc4b22524ca2ec611f02fec53ff3563606f5e Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 27 Jan 2021 18:08:11 +0100
Subject: [PATCH 0708/3482] ncmpc: update to 0.43.

---
 srcpkgs/ncmpc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index ba407ca3ccb5..191fdd33f14e 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,6 +1,6 @@
 # Template file for 'ncmpc'
 pkgname=ncmpc
-version=0.42
+version=0.43
 revision=1
 build_style=meson
 configure_args="-Dlirc=disabled"
@@ -10,9 +10,9 @@ short_desc="Ncurses-based mpd client"
 maintainer="Getty Ritter <gettyritter@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/clients/ncmpc/"
-changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/ncmpc/v${version}/NEWS"
+changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/ncmpc/master/NEWS"
 distfiles="https://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz"
-checksum=a5f7471d766a71c222374efa4aa17ef6ee0e42ad48d15528edd935d1f0f6cd4d
+checksum=7abf3c83d3a77c18681a8ce90126c8cb1e1884ebde5be2a735293a4f535ed382
 
 post_install() {
 	vmkdir usr/share/examples/ncmpc

From 0ad2a0d1533bd8d809d88b242ed1c31ef280dbb6 Mon Sep 17 00:00:00 2001
From: George Matsumura <gmmatsumura01@bvsd.org>
Date: Wed, 8 Jul 2020 21:16:47 -0600
Subject: [PATCH 0709/3482] sylpheed: patch to use SNI

Prior to this patch, sylpheed built against newer versions of LibreSSL could
not connect to IMAP server such as gmail's because it did not use SNI. This
patch from OpenBSD is a simple fix to implement it.

This patch is also necessary with OpenSSL.

Also xlint template.

Closes: #23487 [via git-merge-pr]
---
 srcpkgs/sylpheed/patches/libsylph_ssl_c.patch | 20 +++++++++++++++++++
 srcpkgs/sylpheed/template                     |  8 ++++----
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/sylpheed/patches/libsylph_ssl_c.patch

diff --git a/srcpkgs/sylpheed/patches/libsylph_ssl_c.patch b/srcpkgs/sylpheed/patches/libsylph_ssl_c.patch
new file mode 100644
index 000000000000..4ab0f7b56901
--- /dev/null
+++ b/srcpkgs/sylpheed/patches/libsylph_ssl_c.patch
@@ -0,0 +1,20 @@
+See https://sylpheed.sraoss.jp/redmine/issues/306
+
+Patch is necessary both on LibreSSL and OpenSSL
+
+--- libsylph/ssl.c.orig
++++ libsylph/ssl.c
+@@ -258,6 +258,13 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinf
+ 		return FALSE;
+ 	}
+ 
++#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
++	if (!SSL_set_tlsext_host_name(sockinfo->ssl, sockinfo->hostname)) {
++		g_warning("Error setting servername extension\n");
++		return FALSE;
++	}
++#endif
++
+ 	SSL_set_fd(sockinfo->ssl, sockinfo->sock);
+ 	while ((ret = SSL_connect(sockinfo->ssl)) != 1) {
+ 		err = SSL_get_error(sockinfo->ssl, ret);
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index be188c4e2dbe..1e01726ef405 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,18 +1,18 @@
-# Template build file for 'sylpheed'.
+# Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=5
-lib32disabled=yes
+revision=6
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
 makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2, LGPL-2.1"
+license=" GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://sylpheed.sraoss.jp"
 distfiles="http://sylpheed.sraoss.jp/sylpheed/v${version%.*}/$pkgname-$version.tar.bz2"
 checksum=eb23e6bda2c02095dfb0130668cf7c75d1f256904e3a7337815b4da5cb72eb04
+lib32disabled=yes
 
 pre_configure() {
 	aclocal -I ac

From aa4073baea6dbacaea6c626d00a0fea02d3acf8b Mon Sep 17 00:00:00 2001
From: Fabio Krapohl <fabio.u.krapohl@fau.de>
Date: Tue, 30 Jun 2020 00:22:26 +0200
Subject: [PATCH 0710/3482] nxt: update to 1.12.2.

Closes: #23312 [via git-merge-pr]
---
 srcpkgs/nxt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nxt/template b/srcpkgs/nxt/template
index eb98ca7e86d0..3eeaae3f30a5 100644
--- a/srcpkgs/nxt/template
+++ b/srcpkgs/nxt/template
@@ -1,16 +1,16 @@
 # Template file for 'nxt'
 pkgname=nxt
-version=1.11.15
+version=1.12.2
 revision=1
 wrksrc="${pkgname}"
 hostmakedepends="unzip"
 depends="virtual?java-runtime"
 short_desc="Client for the NXT cryptocurrency"
-maintainer="Fabio Krapohl <fabio.u.krapohl@fau.de>"
-license="Jelurida Public License 1.1"
+maintainer="Fabio Krapohl <Krapohl.f@gmx.de>"
+license="custom:Jelurida Public License 1.1"
 homepage="https://nxt.org"
 distfiles="https://bitbucket.org/Jelurida/${pkgname}/downloads/${pkgname}-client-${version}.zip"
-checksum=933f7a5ed02b6f4af2d50060e60acda746a2261f733b90f2ab969e951c735dfa
+checksum=83689f6d85e59be44920328d99aa934bb8998f4b5c7ea8088c83ab4503b49a42
 
 do_install() {
 	vbin ${FILESDIR}/bin/${pkgname}

From cc548a81ca68ee800854cdef7401d4c35ba0a1d0 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Wed, 23 Dec 2020 23:42:29 -0700
Subject: [PATCH 0711/3482] weston: update to 9.0.0.

---
 common/shlibs           | 2 +-
 srcpkgs/weston/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 1019bbbe54fd..91a9d7a282e7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3016,7 +3016,7 @@ libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
 libqalculate.so.21 libqalculate-3.0.0_1
-libweston-8.so.0 weston-8.0.0_1
+libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2017.3_1
 librhash.so.0 rhash-1.3.4_1
 libserialport.so.0 libserialport-0.1.1_1
diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index 148671b8ef4d..4eb882a6c22e 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,6 +1,6 @@
 # Template file for 'weston'
 pkgname=weston
-version=8.0.0
+version=9.0.0
 revision=1
 build_style=meson
 configure_args="-Dtest-junit-xml=false -Dbackend-rdp=false -Dsystemd=false
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wayland.freedesktop.org/"
 distfiles="https://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz"
-checksum=7518b49b2eaa1c3091f24671bdcc124fd49fc8f1af51161927afa4329c027848
+checksum=5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe
 system_groups="weston-launch"
 lib32disabled=yes
 
@@ -66,7 +66,7 @@ weston-x11_package() {
 }
 
 weston-xwayland_package() {
-	short_desc+=" - xwayland backend"
+	short_desc+=" - xwayland plugin"
 	pkg_install() {
 		vmove "/usr/lib/libweston-${version%%.*}/xwayland.so"
 	}

From 4f0546de2614ea0a21bddc818e03ef028b464e38 Mon Sep 17 00:00:00 2001
From: rev1e <62853071+rev1e@users.noreply.github.com>
Date: Fri, 1 Jan 2021 22:13:27 +0100
Subject: [PATCH 0712/3482] lemonbar: update to 1.4.

Also fix xlint.

Closes: #27609 [via git-merge-pr]
---
 srcpkgs/lemonbar/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lemonbar/template b/srcpkgs/lemonbar/template
index 35afe81e454b..74bcedf324f9 100644
--- a/srcpkgs/lemonbar/template
+++ b/srcpkgs/lemonbar/template
@@ -1,21 +1,21 @@
 # Template file for 'lemonbar'
 pkgname=lemonbar
-version=1.3
+version=1.4
 revision=1
 wrksrc="bar-${version}"
 build_style=gnu-makefile
 hostmakedepends="perl"
 makedepends="libxcb-devel"
-short_desc="A lightweight xcb based bar"
+short_desc="Lightweight xcb based bar"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/LemonBoy/bar"
 license="MIT"
+homepage="https://github.com/LemonBoy/bar"
 distfiles="https://github.com/LemonBoy/bar/archive/v${version}.tar.gz"
-checksum=eae784c5e375b2d0b12138be1a9902beb4b5eeb807f3512f30f14ba23ddaa37d
+checksum=7bfd36d7a4a950f61ed0d32c7d219678e7787a546d9ef4bc33f02393d60e4939
 
 pre_build() {
-	sed -i 's/^\(CFLAGS *+=\)/override \1/' Makefile
-	sed -i 's/^\(LDFLAGS *+=\)/override \1/' Makefile
+	vsed -i 's/^\(CFLAGS *+=\)/override \1/' Makefile
+	vsed -i 's/^\(LDFLAGS *+=\)/override \1/' Makefile
 }
 post_install() {
 	vlicense LICENSE

From e1ed15d6b9634b6cd6b1a09b2647e153ab1e3426 Mon Sep 17 00:00:00 2001
From: tommyjanna <25873341+tommyjanna@users.noreply.github.com>
Date: Tue, 5 Jan 2021 13:23:16 -0500
Subject: [PATCH 0713/3482] python3-wrapt: update to 1.12.1.

---
 srcpkgs/python3-wrapt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-wrapt/template b/srcpkgs/python3-wrapt/template
index ccb7a685fcbf..b182006befea 100644
--- a/srcpkgs/python3-wrapt/template
+++ b/srcpkgs/python3-wrapt/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-wrapt'
 pkgname=python3-wrapt
-version=1.11.2
+version=1.12.1
 revision=4
 wrksrc="wrapt-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/GrahamDumpleton/wrapt"
 distfiles="${PYPI_SITE}/w/wrapt/wrapt-${version}.tar.gz"
-checksum=565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1
+checksum=b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7
 
 post_install() {
 	vlicense LICENSE

From 42cca14b9718383c754d2845b656f5f39e540665 Mon Sep 17 00:00:00 2001
From: John Sullivan <jsullivan@csumb.edu>
Date: Mon, 21 Sep 2020 21:58:31 -0700
Subject: [PATCH 0714/3482] pinephone-uboot: update to 0.0.20200917.

Fixes random wifi MAC issue, see this issue for more details:
https://gitlab.com/ubports/community-ports/pinephone/-/issues/225

pinephone-uboot: fix usage of makejobs variable
---
 srcpkgs/pinephone-uboot/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/pinephone-uboot/template b/srcpkgs/pinephone-uboot/template
index a92b6bb1d090..2073c910cb5c 100644
--- a/srcpkgs/pinephone-uboot/template
+++ b/srcpkgs/pinephone-uboot/template
@@ -1,6 +1,6 @@
 # Template file for 'pinephone-uboot'
 pkgname=pinephone-uboot
-version=0.0.20200904
+version=0.0.20200917
 revision=1
 archs="aarch64*"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="John Sullivan <jsullivan@csumb.edu>"
 license="GPL-2.0-only, BSD-3-Clause"
 homepage="http://www.denx.de/wiki/U-Boot/WebHome"
 
-_tag_uboot=crust-2020-09-04
+_tag_uboot=crust-2020-09-17
 _commit_armtf=2bdb4611ad6efdb3da2ff0d2de7fee4c43e95aeb
 _commit_crust=e63106c70bc4ddfa3575e4f1f3667de0795252a8
 
@@ -24,7 +24,7 @@ distfiles="https://gitlab.com/pine64-org/u-boot/-/archive/${_tag_uboot}/${_uboot
  https://github.com/ARM-software/arm-trusted-firmware/archive/${_commit_armtf}.tar.gz
  https://github.com/crust-firmware/crust/archive/${_commit_crust}.tar.gz"
 
-checksum="06eb107aced5b41da3cd0cfdcc2ad90b7c51fcbec7aac5c7388e30c58e2536b8
+checksum="395e61790d4877e11c470445dfee834a017a4b5df5f7ee34ebcaa125713150dc
  48291b621a4bc38c7956964407130edd2d02d8b3789fce4193ac1b747a5b37db
  6fc2d68725a78b1ca6e7c6602286fc2aa2ddcdea28e83a85f6b988fcc5a513b8"
 
@@ -68,13 +68,13 @@ do_build() {
 		_hostcc="HOST_COMPILE=${XBPS_CROSS_TRIPLET}-"
 	fi
 
-	make -C $_armtf $_cross PLAT=sun50i_a64 DEBUG=1 -j $makejobs bl31
-	make -C $_crust $_hostcc $_or1k -j $makejobs scp
+	make -C $_armtf $_cross PLAT=sun50i_a64 DEBUG=1 $makejobs bl31
+	make -C $_crust $_hostcc $_or1k $makejobs scp
 
 	export BL31=$wrksrc/$_armtf/build/sun50i_a64/debug/bl31.bin
 	export SCP=$wrksrc/$_crust/build/scp/scp.bin
 
-	make -C $_uboot $_cross -j $makejobs
+	make -C $_uboot $_cross $makejobs
 }
 
 do_install() {

From 8b7be2421d9a986d054f1204a4722d6f54a81ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 00:36:07 -0300
Subject: [PATCH 0715/3482] guile: don't use variable in homepage.

---
 srcpkgs/guile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index 60a5be985841..f9ce43c06709 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -10,7 +10,7 @@ makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
 short_desc="A portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007
 subpackages="libguile guile-devel"

From b2c3bb71a31184d02e339545ecd213c27223e457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 29 Jan 2021 11:03:44 +0100
Subject: [PATCH 0716/3482] 9base: update to 6.0.20190911

The distfile could perhaps be provided by the official Void Linux site.
---
 srcpkgs/9base/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/9base/template b/srcpkgs/9base/template
index 39325c855629..a670631f0f79 100644
--- a/srcpkgs/9base/template
+++ b/srcpkgs/9base/template
@@ -1,8 +1,8 @@
 # Template file for '9base'
 pkgname=9base
-version=6.0.20170806
+version=6.0.20190911
 revision=1
-_githash=09e95a2d6f8dbafc6601147b2f5f150355813be6
+_githash=63916da7bd6d73d9a405ce83fc4ca34845667cce
 wrksrc="9base-${_githash}"
 build_style=gnu-makefile
 # we use byacc instead of internal version
@@ -11,8 +11,9 @@ short_desc="Revived minimalist port of Plan 9 userland to Unix"
 maintainer='Tai Chi Minh Ralph Eastwood <tcmreastwood@gmail.com>'
 license="custom"
 homepage="http://git.suckless.org/9base"
-distfiles="https://distfiles.voidlinux.de/9base-${_githash}.tar.bz2"
-checksum=57640696d65a8acbaca5417f1db1dea5ebbc694e8bed0d4ee8a3229f4800dddd
+# Checked out from http://git.suckless.org/9base/ and created tarball with 'git archive'.
+distfiles="https://distfiles.voidlinux.de/9base-${_githash}.tar.gz"
+checksum=bb8cd1e0060824914839fd090353971862a1025ae4b8ea5d1e99618ddd1b160f
 conflicts="plan9port"
 provides="plan9port-20160418_4"
 

From adb0b91fb54b5b0e9bde1a67ecc88a47f672a7d1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Jan 2021 11:54:38 +0100
Subject: [PATCH 0717/3482] dfu-util: update to 0.10.

---
 srcpkgs/dfu-util/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dfu-util/template b/srcpkgs/dfu-util/template
index 25be1be5711a..635703aefe6b 100644
--- a/srcpkgs/dfu-util/template
+++ b/srcpkgs/dfu-util/template
@@ -1,6 +1,6 @@
 # Template file for 'dfu-util'
 pkgname=dfu-util
-version=0.9
+version=0.10
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Foxlet <foxlet@furcode.co>"
 homepage="http://dfu-util.sourceforge.net/"
 license="GPL-2.0-only"
 distfiles="http://dfu-util.sourceforge.net/releases/dfu-util-${version}.tar.gz"
-checksum=36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833
+checksum=a03dc58dfc79c056819c0544b2a5970537566460102b3d82cfb038c60e619b42

From 175f9813c89552b2349cf28b85f3f6990b32736d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Jan 2021 12:01:19 +0100
Subject: [PATCH 0718/3482] swi-prolog: update to 8.2.4.

---
 srcpkgs/swi-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index 046edd9af1a9..ce5d45085d8b 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,6 +1,6 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
-version=8.2.3
+version=8.2.4
 revision=1
 wrksrc="swipl-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="http://www.swi-prolog.org/"
 changelog="http://www.swi-prolog.org/ChangeLog?branch=stable"
 distfiles="http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz"
-checksum=9403972f9d87f1f4971fbd4a5644b4976b1b18fc174be84506c6b713bd1f9c93
+checksum=f4bcc78437f9080ab089762e9e6afa7071df7f584c14999b92b9a90a4efbd7d8
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 332d12a67a0068c791d2d978c4dd4341bd8a334c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Jan 2021 13:19:57 +0100
Subject: [PATCH 0719/3482] ugrep: update to 3.1.5.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 07acebd43aed..188a499d1652 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.1.4
+version=3.1.5
 revision=1
 build_style=gnu-configure
 configure_args="--disable-avx"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=3de80f56e82ac21fda574334a1e55d3a9027c156d4b1ce1b0e96ea99b25cda32
+checksum=f9efdc95c77e7c2651b614f7dc525db31c8e4809e70af4a9f2e33035859f7278

From ac91a142e8ffea7bfee3f58d50effb7dbf90df9d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Jan 2021 13:23:53 +0100
Subject: [PATCH 0720/3482] xpdf: update to 4.03.

---
 srcpkgs/xpdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xpdf/template b/srcpkgs/xpdf/template
index fa3a213db454..4f3c4f0ac66a 100644
--- a/srcpkgs/xpdf/template
+++ b/srcpkgs/xpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'xpdf'
 pkgname=xpdf
-version=4.02
+version=4.03
 revision=1
 build_style=cmake
 configure_args="-DSYSTEM_XPDFRC=/etc/xpdfrc"
@@ -12,8 +12,8 @@ short_desc="Viewer for Portable Document Format (PDF) files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="http://www.xpdfreader.com/"
-distfiles="https://xpdfreader-dl.s3.amazonaws.com/xpdf-$version.tar.gz"
-checksum=52d51dc943b9614b8da66e8662b3031a3c82dc25bfc792eac6b438aa36d549a4
+distfiles="https://dl.xpdfreader.com/xpdf-${version}.tar.gz"
+checksum=0fe4274374c330feaadcebb7bd7700cb91203e153b26aa95952f02bf130be846
 patch_args="-Np1"
 
 post_extract() {

From b551285dd3eb7714921d44d74d425f092686b3a5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Jan 2021 13:24:31 +0100
Subject: [PATCH 0721/3482] python3-boto3: update to 1.16.62.

---
 srcpkgs/python3-boto3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index d14270addb8f..38121e097cd2 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.16.58
+version=1.16.62
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=dd813463f50c969c367282ad8857ba6acaf15ce35edda383da643d00907cebfb
+checksum=6dcdf024d8b45b865a4895605c4ef8855bbd2bcfcfd3792050a79abe1c633237
 
 post_install() {
 	vlicense LICENSE

From a4566c40ba3d461e4978f5ef8ff4df5ab377d5e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 29 Jan 2021 14:05:02 +0100
Subject: [PATCH 0722/3482] 9base: name server problem fixed

---
 srcpkgs/9base/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/9base/template b/srcpkgs/9base/template
index a670631f0f79..feade2c2eb4f 100644
--- a/srcpkgs/9base/template
+++ b/srcpkgs/9base/template
@@ -1,4 +1,4 @@
-# Template file for '9base'
+# Template file for '9base'.
 pkgname=9base
 version=6.0.20190911
 revision=1

From 7bb37dacac1234ed037507c7fbda0c34794fce25 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 29 Jan 2021 14:20:39 +0100
Subject: [PATCH 0723/3482] xbps: make repo generation less error-prone

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index cae1b8681e91..728179a46fc5 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -35,13 +35,13 @@ do_configure() {
 }
 
 post_install() {
-	local repo="repository=https://alpha.de.repo.voidlinux.org/current" suffix=
+	local repo="https://alpha.de.repo.voidlinux.org/current" suffix=
 	case "$XBPS_TARGET_MACHINE" in
 		aarch64*)     suffix="/aarch64";;
 		*-musl)       suffix="/musl";;
 	esac
 
-	echo "${repo}${suffix}" > \
+	echo "repository=${repo}${suffix}" > \
 		${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
 	echo "architecture=${XBPS_TARGET_MACHINE}" > \
 		${DESTDIR}/usr/share/xbps.d/xbps-arch.conf

From 3f83be08be30ff043448c2782694d2a7fe4e179d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 29 Jan 2021 14:30:23 +0100
Subject: [PATCH 0724/3482] kea: update to 1.9.4

---
 common/shlibs        | 34 +++++++++++++++++-----------------
 srcpkgs/kea/template |  4 ++--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 91a9d7a282e7..75075c2d2599 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2929,26 +2929,26 @@ libkj-http-0.8.0.so capnproto-0.8.0_1
 libkj-async-0.8.0.so capnproto-0.8.0_1
 libkj-test-0.8.0.so capnproto-0.8.0_1
 libkj-0.8.0.so capnproto-0.8.0_1
-libkea-asiodns.so.1 libkea-1.7.0_1
-libkea-asiolink.so.21 libkea-1.9.3_1
-libkea-cc.so.20 libkea-1.9.2_1
-libkea-cfgclient.so.21 libkea-1.9.3_1
+libkea-asiodns.so.12 libkea-1.9.4_1
+libkea-asiolink.so.22 libkea-1.9.4_1
+libkea-cc.so.21 libkea-1.9.4_1
+libkea-cfgclient.so.22 libkea-1.9.4_1
 libkea-cryptolink.so.16 libkea-1.9.2_1
-libkea-database.so.19 libkea-1.9.3_1
-libkea-dhcp++.so.31 libkea-1.9.2_1
-libkea-dhcp_ddns.so.14 libkea-1.9.1_1
-libkea-dhcpsrv.so.41 libkea-1.9.3_1
-libkea-dns++.so.5 libkea-1.8.0_1
-libkea-eval.so.23 libkea-1.9.2_1
+libkea-database.so.20 libkea-1.9.4_1
+libkea-dhcp++.so.32 libkea-1.9.4_1
+libkea-dhcp_ddns.so.15 libkea-1.9.4_1
+libkea-dhcpsrv.so.42 libkea-1.9.4_1
+libkea-dns++.so.16 libkea-1.9.4_1
+libkea-eval.so.24 libkea-1.9.4_1
 libkea-exceptions.so.0 libkea-1.1.0_1
-libkea-hooks.so.29 libkea-1.9.3_1
-libkea-http.so.22 libkea-1.9.3_1
-libkea-log.so.17 libkea-1.9.2_1
-libkea-pgsql.so.17 libkea-1.9.3_1
-libkea-process.so.24 libkea-1.9.3_1
-libkea-stats.so.16 libkea-1.9.0_1
+libkea-hooks.so.30 libkea-1.9.4_1
+libkea-http.so.23 libkea-1.9.4_1
+libkea-log.so.18 libkea-1.9.4_1
+libkea-pgsql.so.18 libkea-1.9.4_1
+libkea-process.so.25 libkea-1.9.4_1
+libkea-stats.so.18 libkea-1.9.4_1
 libkea-util-io.so.0 libkea-1.1.0_1
-libkea-util.so.30 libkea-1.9.3_1
+libkea-util.so.31 libkea-1.9.4_1
 libytnef.so.0 ytnef-1.8_1
 libpisock.so.9 pilot-link-0.12.5_1
 libpisync.so.1 pilot-link-0.12.5_1
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index c1e26d2d467a..78ec7c0f9561 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,6 +1,6 @@
 # Template file for 'kea'
 pkgname=kea
-version=1.9.3
+version=1.9.4
 revision=1
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
@@ -20,7 +20,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-2.0, Apache-2.0"
 homepage="https://kea.isc.org"
 distfiles="http://ftp.isc.org/isc/kea/${version/.P/-P}/kea-${version/.P/-P}.tar.gz"
-checksum=804b846eabf2fd8a577cd91e35c6a86c8e601f602f94be84fe59b61df3c04d9f
+checksum=0f3a28df4db0f3658fd58baa555bc36e82e3a36d9fb5cc71b557132fc695aa3b
 
 build_options="botan mysql pgsql"
 desc_option_botan="With Botan SSL support"

From 96daacb263175689ad1bbfa6a3b9c5b85e2a4c9c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 29 Jan 2021 08:03:43 -0600
Subject: [PATCH 0725/3482] Amass: update to 3.11.2.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 0598c9ff251d..c34b79c131a5 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.11.1
+version=3.11.2
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/..."
@@ -9,4 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=142d18f409acd93e622887181cf84bb9ef4e8bdeb1448158166b252609bbb4c9
+checksum=e1db845ba25e8d0b15476794517536fdcbdc661cf05d718a11a7d09dbbd7347c

From 52d32de1bc0067ea97d321781b7d5b3001f1ecd1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 29 Jan 2021 08:07:32 -0600
Subject: [PATCH 0726/3482] python3-rich: update to 9.10.0.

---
 srcpkgs/python3-rich/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 347396c6edb0..5bc8426f438f 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=9.9.0
+version=9.10.0
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/willmcgugan/rich"
 distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=0bd8f42c3a03b7ef5e311d5e37f47bea9d268f541981c169072be5869c007957
+checksum=e0f2db62a52536ee32f6f584a47536465872cae2b94887cf1f080fb9eaa13eb2
 
 post_install() {
 	vlicense LICENSE

From 23ae791a48c661edbe83e85edce1585d8def6fb9 Mon Sep 17 00:00:00 2001
From: bhagwan <bhagwan@disroot.org>
Date: Wed, 27 Jan 2021 13:59:23 -0800
Subject: [PATCH 0727/3482] broadcom-wl-dkms patch for kernel 5.10

---
 .../broadcom-wl-dkms/patches/linux-5.10.patch | 179 ++++++++++++++++++
 .../broadcom-wl-dkms/patches/linux-5.9.patch  |  36 ----
 srcpkgs/broadcom-wl-dkms/template             |   2 +-
 3 files changed, 180 insertions(+), 37 deletions(-)
 create mode 100644 srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
 delete mode 100644 srcpkgs/broadcom-wl-dkms/patches/linux-5.9.patch

diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
new file mode 100644
index 000000000000..429db60e7309
--- /dev/null
+++ b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
@@ -0,0 +1,179 @@
+diff -u -r src/wl/sys/wl_cfg80211_hybrid.c src/wl/sys/wl_cfg80211_hybrid.c
+--- src/wl/sys/wl_cfg80211_hybrid.c	2021-01-25 08:55:05.625224400 -0800
++++ src/wl/sys/wl_cfg80211_hybrid.c	2021-01-25 08:58:30.000982902 -0800
+@@ -41,6 +41,7 @@
+ #include <wlioctl.h>
+ #include <proto/802.11.h>
+ #include <wl_cfg80211_hybrid.h>
++#include <wl_linux.h>
+ 
+ #define EVENT_TYPE(e) dtoh32((e)->event_type)
+ #define EVENT_FLAGS(e) dtoh16((e)->flags)
+@@ -446,30 +447,8 @@
+ static s32
+ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
+ {
+-	struct ifreq ifr;
+-	struct wl_ioctl ioc;
+-	mm_segment_t fs;
+-	s32 err = 0;
+-
+ 	BUG_ON(len < sizeof(int));
+-
+-	memset(&ioc, 0, sizeof(ioc));
+-	ioc.cmd = cmd;
+-	ioc.buf = arg;
+-	ioc.len = len;
+-	strcpy(ifr.ifr_name, dev->name);
+-	ifr.ifr_data = (caddr_t)&ioc;
+-
+-	fs = get_fs();
+-	set_fs(get_ds());
+-#if defined(WL_USE_NETDEV_OPS)
+-	err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#else
+-	err = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#endif
+-	set_fs(fs);
+-
+-	return err;
++  return wlc_ioctl_internal(dev, cmd, arg, len);
+ }
+ 
+ static s32
+diff -u -r src/wl/sys/wl_iw.c src/wl/sys/wl_iw.c
+--- src/wl/sys/wl_iw.c	2021-01-25 09:00:13.163543809 -0800
++++ src/wl/sys/wl_iw.c	2021-01-25 09:02:04.218646005 -0800
+@@ -37,6 +37,7 @@
+ 
+ #include <wl_dbg.h>
+ #include <wl_iw.h>
++#include <wl_linux.h>
+ 
+ extern bool wl_iw_conn_status_str(uint32 event_type, uint32 status,
+ 	uint32 reason, char* stringBuf, uint buflen);
+@@ -106,29 +107,7 @@
+ 	int len
+ )
+ {
+-	struct ifreq ifr;
+-	wl_ioctl_t ioc;
+-	mm_segment_t fs;
+-	int ret;
+-
+-	memset(&ioc, 0, sizeof(ioc));
+-	ioc.cmd = cmd;
+-	ioc.buf = arg;
+-	ioc.len = len;
+-
+-	strcpy(ifr.ifr_name, dev->name);
+-	ifr.ifr_data = (caddr_t) &ioc;
+-
+-	fs = get_fs();
+-	set_fs(get_ds());
+-#if defined(WL_USE_NETDEV_OPS)
+-	ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#else
+-	ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#endif
+-	set_fs(fs);
+-
+-	return ret;
++  return wlc_ioctl_internal(dev, cmd, arg, len);
+ }
+ 
+ static int
+diff -u -r src/wl/sys/wl_linux.c src/wl/sys/wl_linux.c
+--- src/wl/sys/wl_linux.c	2021-01-25 09:02:08.055475147 -0800
++++ src/wl/sys/wl_linux.c	2021-01-25 09:06:11.894764339 -0800
+@@ -1650,10 +1650,7 @@
+ 		goto done2;
+ 	}
+ 
+- if (segment_eq(get_fs(), KERNEL_DS))
+-		buf = ioc.buf;
+-
+-	else if (ioc.buf) {
++	if (ioc.buf) {
+ 		if (!(buf = (void *) MALLOC(wl->osh, MAX(ioc.len, WLC_IOCTL_MAXLEN)))) {
+ 			bcmerror = BCME_NORESOURCE;
+ 			goto done2;
+@@ -1674,7 +1671,7 @@
+ 	WL_UNLOCK(wl);
+ 
+ done1:
+-	if (ioc.buf && (ioc.buf != buf)) {
++	if (ioc.buf) {
+ 		if (copy_to_user(ioc.buf, buf, ioc.len))
+ 			bcmerror = BCME_BADADDR;
+ 		MFREE(wl->osh, buf, MAX(ioc.len, WLC_IOCTL_MAXLEN));
+@@ -1684,6 +1681,39 @@
+ 	ASSERT(VALID_BCMERROR(bcmerror));
+ 	if (bcmerror != 0)
+ 		wl->pub->bcmerror = bcmerror;
++	return (OSL_ERROR(bcmerror));
++}
++
++int
++wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len)
++{
++	wl_info_t *wl;
++	wl_if_t *wlif;
++	int bcmerror;
++
++	if (!dev)
++		return -ENETDOWN;
++
++	wl = WL_INFO(dev);
++	wlif = WL_DEV_IF(dev);
++	if (wlif == NULL || wl == NULL || wl->dev == NULL)
++		return -ENETDOWN;
++
++	bcmerror = 0;
++
++	WL_TRACE(("wl%d: wlc_ioctl_internal: cmd 0x%x\n", wl->pub->unit, cmd));
++
++	WL_LOCK(wl);
++	if (!capable(CAP_NET_ADMIN)) {
++		bcmerror = BCME_EPERM;
++	} else {
++		bcmerror = wlc_ioctl(wl->wlc, cmd, buf, len, wlif->wlcif);
++	}
++	WL_UNLOCK(wl);
++
++	ASSERT(VALID_BCMERROR(bcmerror));
++	if (bcmerror != 0)
++		wl->pub->bcmerror = bcmerror;
+ 	return (OSL_ERROR(bcmerror));
+ }
+ 
+diff -u -r src/wl/sys/wl_linux.h src/wl/sys/wl_linux.h
+--- src/wl/sys/wl_linux.h	2021-01-25 09:06:15.188672391 -0800
++++ src/wl/sys/wl_linux.h	2021-01-25 09:07:49.457810535 -0800
+@@ -29,6 +29,7 @@
+ #define _wl_linux_h_
+ 
+ #include <wlc_types.h>
++#include <wlc_pub.h>
+ 
+ typedef struct wl_timer {
+ 	struct timer_list 	timer;
+@@ -194,6 +195,7 @@
+ extern int __devinit wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
+ extern void wl_free(wl_info_t *wl);
+ extern int  wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
++extern int wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len);
+ extern struct net_device * wl_netdev_get(wl_info_t *wl);
+ 
+ #endif 
+diff -u -r src/wl/sys/wlc_pub.h src/wl/sys/wlc_pub.h
+--- src/wl/sys/wlc_pub.h	2021-01-25 09:07:54.543645032 -0800
++++ src/wl/sys/wlc_pub.h	2021-01-25 09:08:10.772110464 -0800
+@@ -24,6 +24,7 @@
+ 
+ #include <wlc_types.h>
+ #include <wlc_utils.h>
++#include <siutils.h>
+ #include "proto/802.11.h"
+ #include "proto/bcmevent.h"
+ 
diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-5.9.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-5.9.patch
deleted file mode 100644
index c0af5c181dde..000000000000
--- a/srcpkgs/broadcom-wl-dkms/patches/linux-5.9.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -u -r src/wl/sys/wl_cfg80211_hybrid.c src/wl/sys/wl_cfg80211_hybrid.c
---- src/wl/sys/wl_cfg80211_hybrid.c	2015-09-18 22:47:30.000000000 +0000
-+++ src/wl/sys/wl_cfg80211_hybrid.c	2020-10-12 21:20:05.200372484 +0000
-@@ -450,7 +450,7 @@
- 	ifr.ifr_data = (caddr_t)&ioc;
- 
- 	fs = get_fs();
--	set_fs(get_ds());
-+	set_fs(KERNEL_DS);
- #if defined(WL_USE_NETDEV_OPS)
- 	err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
- #else
-diff -u -r src/wl/sys/wl_iw.c src/wl/sys/wl_iw.c
---- src/wl/sys/wl_iw.c	2015-09-18 22:47:30.000000000 +0000
-+++ src/wl/sys/wl_iw.c	2020-10-12 21:19:51.426836804 +0000
-@@ -117,7 +117,7 @@
- 	ifr.ifr_data = (caddr_t) &ioc;
- 
- 	fs = get_fs();
--	set_fs(get_ds());
-+	set_fs(KERNEL_DS);
- #if defined(WL_USE_NETDEV_OPS)
- 	ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
- #else
-diff -u -r src/wl/sys/wl_linux.c src/wl/sys/wl_linux.c
---- src/wl/sys/wl_linux.c	2020-10-12 21:19:15.256305165 +0000
-+++ src/wl/sys/wl_linux.c	2020-10-12 21:20:38.687530895 +0000
-@@ -1643,7 +1643,7 @@
- 		goto done2;
- 	}
- 
--	if (segment_eq(get_fs(), KERNEL_DS))
-+	if (get_fs().seg == KERNEL_DS.seg)
- 		buf = ioc.buf;
- 
- 	else if (ioc.buf) {
diff --git a/srcpkgs/broadcom-wl-dkms/template b/srcpkgs/broadcom-wl-dkms/template
index 59a0df64183f..55bc9c0e1d36 100644
--- a/srcpkgs/broadcom-wl-dkms/template
+++ b/srcpkgs/broadcom-wl-dkms/template
@@ -2,7 +2,7 @@
 
 pkgname=broadcom-wl-dkms
 version=6.30.223.271
-revision=10
+revision=11
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Proprietary Broadcom license"
 homepage="http://broadcom.com"

From 5433ef33fbd1fe6a043b163b0a5bf2111550943f Mon Sep 17 00:00:00 2001
From: bhagwan <bhagwan@disroot.org>
Date: Wed, 27 Jan 2021 18:08:00 -0800
Subject: [PATCH 0728/3482] added broadcom-wl-dkms linux-5.10 patch source and
 commetary

---
 .../broadcom-wl-dkms/patches/linux-5.10.patch | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
index 429db60e7309..b3b136f55869 100644
--- a/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
+++ b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
@@ -1,3 +1,30 @@
+https://gist.github.com/joanbm/5c640ac074d27fd1d82c74a5b67a1290
+
+From f3d652840f8dd959395065a1cf67ca40b04ec69b Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Tue, 13 Oct 2020 19:35:55 +0200
+Subject: [PATCH] Get rid of get_fs/set_fs calls in Broadcom WL driver.
+
+Tentative patch for broadcom-wl 6.30.223.271 driver for Linux 5.10 (tested -rc1 up to 5.10.1)
+
+Applies on top of all the patches applied to broadcom-wl-dkms 6.30.223.271-23 on Arch Linux.
+
+NB: Some checks in wlc_ioctl_internal are likely superfluous,
+    but I'm not familiar enough with the driver to remove them with confidence.
+
+See also: https://lwn.net/Articles/722267/
+          https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=47058bb54b57962b3958a936ddbc59355e4c5504
+          https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5e6e9852d6f76e01b2e6803c74258afa5b432bc5
+
+Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
+---
+ src/wl/sys/wl_cfg80211_hybrid.c | 25 ++-------------------
+ src/wl/sys/wl_iw.c              | 25 ++-------------------
+ src/wl/sys/wl_linux.c           | 40 ++++++++++++++++++++++++++++-----
+ src/wl/sys/wl_linux.h           |  2 ++
+ src/wl/sys/wlc_pub.h            |  1 +
+ 5 files changed, 42 insertions(+), 51 deletions(-)
+
 diff -u -r src/wl/sys/wl_cfg80211_hybrid.c src/wl/sys/wl_cfg80211_hybrid.c
 --- src/wl/sys/wl_cfg80211_hybrid.c	2021-01-25 08:55:05.625224400 -0800
 +++ src/wl/sys/wl_cfg80211_hybrid.c	2021-01-25 08:58:30.000982902 -0800

From bb664068d0418c19818173f247799d32c5ba27c7 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 16:56:24 +0100
Subject: [PATCH 0729/3482] haveged: update to 1.9.14.

Closes: #28162 [via git-merge-pr]
---
 srcpkgs/haveged/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haveged/template b/srcpkgs/haveged/template
index aa5dd7548c6f..73b736dc6d56 100644
--- a/srcpkgs/haveged/template
+++ b/srcpkgs/haveged/template
@@ -1,6 +1,6 @@
 # Template file for 'haveged'
 pkgname=haveged
-version=1.9.13
+version=1.9.14
 revision=1
 build_style=gnu-configure
 short_desc="Entropy harvesting daemon using CPU timings"
@@ -8,7 +8,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.issihosts.com/haveged"
 distfiles="https://github.com/jirka-h/haveged/archive/v${version}.tar.gz"
-checksum=d17bd22fa1745daca5ac72e014ed3b0fe5720da4c115953124b1bf2a0aa2b04b
+checksum=938cb494bcad7e4f24e61eb50fab4aa0acbc3240c80f3ad5c6cf7e6e922618c3
 
 post_install() {
 	vsv $pkgname

From ce3d544e685eb3bfd2eaa215fa38f7c91ca1eb18 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 29 Jan 2021 16:13:41 +0100
Subject: [PATCH 0730/3482] konsole: switch to ninja to drop cursed hack

this avoids running into the weird automoc race condition
so we can drop that whole path and be done with it
---
 srcpkgs/konsole/template | 42 +++++-----------------------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 900cff279ddb..13c87171b8bc 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -3,9 +3,9 @@ pkgname=konsole
 version=20.12.1
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
+configure_args="-DBUILD_TESTING=OFF -GNinja"
 hostmakedepends="pkg-config extra-cmake-modules kcoreaddons qt5-devel
- gettext qt5-qmake kdoctools kconfig"
+ gettext qt5-qmake kdoctools kconfig ninja"
 makedepends="kinit-devel knewstuff-devel knotifyconfig-devel kparts-devel
  kpty-devel"
 short_desc="KDE's Terminal Emulator"
@@ -15,46 +15,14 @@ homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
 checksum=b690be392462cab5abac74d1e1010c3f991c3d00968b51ed5525040640d769ec
 replaces="konsole5>=0"
+# FIXME: after we switch cmake build-style to ninja, remove this as well as
+# the ninja host-dependency and configure_arg as they will become superfluous
+make_cmd=ninja
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 fi
 
-post_configure() {
-	# there is some really awful race in cmake or something
-	#
-	# careful inspection of a diff between a working platform and a broken
-	# one (seemingly every big endian target) reveals that this dependency
-	# is not added in these specific files and these file only; that results
-	# in build errors like:
-	#
-	# [ 98%] Linking CXX shared library ../bin/libkdeinit5_konsole.so
-	# /usr/bin/ld: ../ProfileModel.cpp.o: undefined reference to `vtable for Konsole::ProfileModel'
-	#
-	# this is obviously a horrible hack, but also debugging this seems pretty
-	# non-trivial to say the least, and honestly i am not in the mood for
-	# debugging this either, it's frustrating enough as it is
-	#
-	# next release we should try if this still fails, and in case it magically
-	# gets fixed, remove this and pretend i've never made this change
-	#
-	# (git will remember, and it will haunt me forever, that is my punishment)
-	#
-	[ -n "$(grep 'konsoleprofile_autogen/mocs_compilation' \
-		build/src/CMakeFiles/kdeinit_konsole.dir/build.make)" ] && return 0
-
-	msg_normal "cursed build system encountered, brace for impact\n"
-
-	vsed -i "s,^kdeinit_konsole_EXTERNAL_OBJECTS =,& $(pwd)/build/src/profile/CMakeFiles/konsoleprofile.dir/konsoleprofile_autogen/mocs_compilation.cpp.o," \
-		build/src/CMakeFiles/kdeinit_konsole.dir/build.make
-
-	echo "bin/libkdeinit5_konsole.so: src/profile/CMakeFiles/konsoleprofile.dir/konsoleprofile_autogen/mocs_compilation.cpp.o" \
-		>> build/src/CMakeFiles/kdeinit_konsole.dir/build.make
-
-	vsed -i "s,ProfileShortcutDelegate.cpp.o,& profile/CMakeFiles/konsoleprofile.dir/konsoleprofile_autogen/mocs_compilation.cpp.o," \
-		build/src/CMakeFiles/kdeinit_konsole.dir/link.txt
-}
-
 konsole5_package() {
 	build_style=meta
 	short_desc+=" (transitional dummy package)"

From d83ce2c7f292e603e695dc6453cade0dbfc65945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 11:54:19 -0300
Subject: [PATCH 0731/3482] thunderbird: update to 78.7.0.

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 90726eef5646..dc3e3a03dc24 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.6.1
+version=78.7.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=870b544d26f5e52c187499d134e49eded2943a4a029269ae86aba6a69c53dcc6
+checksum=77b6da5cab9107cc1650f95be8593f6344bfe04d7e4395a28fde64a4fc301c08
 
 lib32disabled=yes
 

From ed1adfbea7c666355eabcde769bdeaabb6e1f7ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 12:26:53 -0300
Subject: [PATCH 0732/3482] thunderbird-i18n: update to 78.7.0.

---
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3385c87d31d3..3439e2ece221 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.6.1
+version=78.7.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="e219394dff8efa55cff3bcdfeb11512c05429a8a8b1b267a4e25d7b4f25ff8bf
- 70100e330a4357fd41aaace58191faa5d33ffc6160a71375fa50beac13426464
- 232de444679279f96d3aef9122c6ed1f1cd21519f8bade4921ba57cdae1841f5
- 7d72da039551edc420a8d26d4a36a8d2b4f157091acaf0743ea65da6b5fe94b9
- 0c26eee598ac67d9ee621a439c1c74fa3144a85a7a868330bc2896c01c2ec048
- 349c6745d419fa442dd9bb3b8e93a7ca3ee870d50365c52b059f7d17fdab7bf2
- 396b1ba5ce5f688e1ac46d240d5cf9ccb8e7c956c2fc11f92ad0cb8bba8fa02f
- a059986fa9a302f51ed5de605f48750b5d4c56def5843f9024b11dbb54fd0576
- 1b0f2bab89d93a7279114fb288ac3d7593d12d1b42ac8f33c50a4b701bd20907
- aba82ecc6d91d6d47440fbffeb14f6ede17eb89a06566c001de50b5b35f948fb
- 07b9b1837eaa5b4b1b7c45e37c83eb7225627daa088b841e006582cc244d798a
- 581f415d8146dce16ec3ef25b43c323f01a8d90d3aad9ba16801b30df410ad6c
- 2888542aac6163f93776bb43aa18a6636b2aa794ad8e349d95548faaf666569e
- c296a9bd8c6f89ef7c75707d239d218b918f9fc68f1a10262362963cbbe8a010
- 47903e76d08ae2f2cdc51828a65f9b34839930219a2c6e017e729c0d41f9677d
- 3e2a49c7314c050a680e85e40ec57794cdf8fa382c23744247d04db412d1527f
- e3123b6fa35c0b60c90c635bc80da772eecc3c60acf596af4a78ab01d9651863
- f04e7ccb3416f29dadb85caf193a1420c56d52797b28ddb0ed300e33f3de5b43
- 9022ec0a832d35982d8ebe2a847fb8cfd2e8c7def938d2262a671921832cef09
- 1e1a2640a14b9644e6e0e25a8e400c800d9855678a84e70bac35cbcea6e6e2de
- 248a7f831ebc78b21abc80046e1670183d24becc075929212d8f904a9a2bfad1
- 7b1ad4971690b75e41e881038773e9b14e74798888d4797b13a4d6149c6898ec
- 83c2393f2440dac78b601b4e037c86242dbd32dbf20e80ba9eef4aa100975eaf
- 9828b309b689d3dd193824b6d27e9d26ad0e64a6193b3917d80632051f7876e7
- 738653a9e4e5b42eb3aac6b21bd868bfd1d91e9f6df4fb9828dbfa5e3bf83edd
- b43cd7995f75b5c59851fec42864bdece44fe1a5e29125a59b8b4efdedb6e068
- 076f46a1c75cad00b07dec0009859133a0a8edab07a91c9c19f735891ae38368
- f60db3af5aa6f9e54a18792c23d1e37f3eb31d995062eb8e42803442029ad10e
- a0d2f462e3c1203315eeea160e44347a9f09a4e2be02fde958316987d280fce9
- 9c62dcfac247ec9daad9ae1040ce6cfe840f5ae7fc05c03531ef1baca8b9d2ed
- 65438bc89ee12fac5322b17eb460c399e1c79153b8401b3a903b7dcc1c334f74
- cf414370af76d6acc24e79024930ab285544be64fe21be97364616dd2a579e10
- 2127e4879f5e59cc843b9ef2dc4fb06649520685ced51ab0d87e8d703705b17e
- f868867c74a72317ec9df521e88e64308119def7b045119061a4e8be66285d0c
- aee136f1b637c3fe7432b15c1184b8ecf019da291a756a8a1269ecfad675f999
- 23a783b408b8f72fc8ed32fd0c8b62c3aeee458569f6c239554b57897bac7375
- 0d9d01a16595895546b40da1836a798395cd571e2e25d6b6d0b6852c4181efe8
- a6a187d0f22a9c14a293ce0da887f6954218c27cad89bbafbf29bd19b487d1ea
- 59b07afeed57833d55112aca0e4c054fdc7855c2b687a69ed8d3771b2b039d30
- 255759456642abb9b7a97f7ebedcc3c946d816b80db3b8ffdcbabb5420c96b41
- 56d761ca31c963351f6c34b15a82a31f5bf98a905eb1b02339a6e4613e12c7e5
- 19c814481e03422ecf538478806c4e64803c2a7a011eea614e26abe78210162b
- a5324699458b5f767e48cbf763a9a7aa89ffe003b7f7b3a2fa199fd24d063206
- fbd135f039a85e064420f6cb6859fbca3ba6c24e438339e9308253cf8aead81b
- c2f7b0ba8e1919b9452c0c02d3a8338442bfdcb17f2049c4b1e29a0c347fef0a
- 89eb18e56ca896cfa9d4059c7a9798afb539c4f18ead11d39f10d00967013938
- 9ebda35cadfddbc0e460cc0003e745f0e1fff1cff40e7a0fc03b10e5780f8456
- 6ba07d9ad3fa236c014a081697cf7f9f870a5bc9b60b7e03a456de3e3e597acb
- 6943914ef17d0f62de915721c526e4fbd3aa4d63bb8144cf95bd44a86a14bc69
- 4430402ad31bb9799f0b3110abbb2dc412022eb74b06bd5d656c6246f041b40c
- 17914302e797f5362f8e6b7473ba02278003263c63dd20b044eb70a575550050
- 66bb52f540987cb548353cd0f15d34fc6d600bedd9c07df25e3e7770d12bd7de
- 70cc073b366a3dc4c96369ba132308e7fa72f04c8ab3516460c45339d7ffb6b9
- 82a8ebb64d5e5af7d24b79d18650f632e90f9fd8c5d40379964d6f8bf403d336
- 613133513d1287ab13168f6ddf225d5ad9e697ec44f769cee3e9b70ee9b86150"
+checksum="dc139cb06a57b5fd523ca5a5841dbc46e058a88eee9c20d6bd5dfdd814fded42
+ bc6483761476acb595e7d06453059b3efd3974a2cfdbc7cb7eafda2b581d0010
+ 7df83d410595290a7c8d17e65429de7f7441068192b2e81aa00e34514a0a9d59
+ 1abf91853869dc9dd45f7f52d4efe4450404398a4646105749f94e674c69c4c8
+ 7c85abe833857a3d2d17f162ed0b5abf9098e78baa1f224fb65594986c61c47f
+ 0dd8a465ce974fec5c0be168ecff82cfd2de207c4ec40673fe67b57409735fcc
+ 2dfa481d8df8cf51e408c6198ff895e40f55b1a24d781f3a4f16f71b464069d8
+ 8654a0e1417138bd5a09621cfd74d68415886fa3714bed1fd0aa7edff8650938
+ 5cd2c6de1618d6a8be2a298731013da0bd8fca7601fd68f224c97e6820699ea6
+ e8a20ca1d4048db62c26399b29ba4107ee96c112c6f47cf87721dbd46df61d06
+ e6f835f1c5cdbe7f0c428b6f9b5b25eb8452b35300107dd17561f6acff5e665d
+ c8c4c8411fc3f4b9e555baf3dc6bbac60d51d218f095151ed9e29baf749d36d1
+ 3096dec5b02c82515764cdb9fda713dee85651b66a5bbff57ef32dcc812bcda3
+ bb28056a70c0112bc67acf2d8cc2f0719336ad4223d409cbc1d19b0a721d18e4
+ 1ec412d72bd8bd35b9fc417ecce15193955e78d93258ac1521b24fde5730221b
+ c6ca0dec779a05b52343e44df445e379c45532ca83681205be596d17d37ec7ac
+ f2a207215fff83daac000d90fd15d01475e92e2b21e74fada9796e61961b2f97
+ 7fc6cc0140288d1cbb0fe3fc6946803320249a68cd240290c0e5a6db38fa570c
+ c805abef39a262c61fdc394d41401b17f74b4c756abb67eb42ed5977cc66a5fe
+ da6903f1d3c8c4cc3e9d999533b3ef1717a472bd990819a12b8562f029b0435e
+ 4343d8dbc1c0f7c44ff293fef3e08014090a0bc60b3a0cab4b43922c3713a383
+ efa4bdf912c581b84370cbc0b8da6ea452fbf5b77ad3a3a6e8aacd3dbd9edbaa
+ 032010b9fb64344207a18e6500d6a416f76e89b5abad3c9c6c7b0d5ba42af2c5
+ cad754a63527e81f8bca3497cd26747ed0199a9be8e5325b813d6a89a6c4ac2e
+ 8a19a42f0637c00a0d0d47f1dae2732330f7561c231d02504ca831e915405cb6
+ cec085d5c74781feab3a3e7e2d798529acb3daf83b457e643fdba67d140b6792
+ 5d880d49e484c812c33f1e29f0eaefb5f8464115566c989421efe9adfd658293
+ aebb685b45988439be1a24ed85fe0644bf7ec101a7dd5862c20466db284a42b5
+ 9982d440c315995e4942e188413de7634706265947c19eb8c2fe9a21fcf2fc5d
+ 8cead19b18afaf2a3846eab8b87e6b438a4fe0eac0520ffd288613a2e3f0b436
+ 36aa8cd7bf8001b6fe4f2e309fccb96c8b509c98c76d04b433de6e7933c24109
+ 7da7495366920a00b69083f3f0e3ae42c656f1125d812dfd491e3729de3efac1
+ c36c1275fdcf8218364653858c62c31b6d6b35f32305a992000c96686e7b93a9
+ c05086da1d19050d5af120f9b42c7cc7137500f86f8f0fa30091419e640262c9
+ 5621d942d8aac2c1c434cacfbad4bb906408c822b94b29569d3ee824aca520db
+ 74dec8ab24e01863a94a49e4870fa64a0dc7c499879da424fed14d5b5c5ceb66
+ 327eea1f4db3f315e2e02011232d00738ced6bb70da0a654afa2bb650f43bd03
+ 6ff122c21e17fdc2b5b9123a8238c279b9fe19290ea5a1492792f97be012de77
+ 6099fa7ff2717057100a0214c75bdd06a754005dc66ae71c7c308dd57aa01b35
+ 22525b2ac8292c2e66a3e5609a82ad4d6defaaa16acae85223ce54bab9ecbafa
+ 49614bb2693f9ab0899fb411e41b90ef2abac8791a942c181b3b547ca1f9a6ef
+ b074a72df48573d9bbfa9d48fcd034acc012312b527baf6fc515a2a2a00c6c39
+ d715b12462732993d062366ba5742a8c5b8e7f191fc65acf6a70421f088b2ed0
+ 4d2916db09c2ff79a795cb82a7f5e9445c57bfb9b29ba9adc7d258318f0dc621
+ 3c760fd67702920bafe47e1747862a1baebcc8ec9fde2e4b8f2a919222e5aeb9
+ fdddfd5236a43273c031c1ce84b78a9aba5b8a4edffca7ab4ca90ef56ac78797
+ fd96e238020144f026391c4b602faa39b2bc52d8de499447a5daa0aef5307e88
+ 2c391159d9006f0fd2b273c18c2892e910d82dfd31708b64746b27d3b755c458
+ 5a9dbbd62a2d70629b1c06a211b026a59e78ab6bb72ec17aa4b043190e1e8b7e
+ 6a983d0d8ac5bd808183d9ee8fce79e970eb84d59b24973a8890413435c6fd45
+ 9487cfa39c8cdcd0f7d65ab87256eced5337f67dddd1800cb477219b3b13b845
+ 5d751de257ca6f33d3f2dd8c11e794d5726eab35f8c7c686e09bb274aa3b5915
+ 78a04fe243243ceaba73125582e06eda9f1c868724cc7eef10528a9c2eb507ac
+ cc54c95770f1769d268026acd96d84a9828080ba07c0bb43b20c115bc829d23a
+ e3620e77f10074832d5df21474f9bbc7814949b9bb4f941dd420ffe1bb447eda"

From 8a257b256f4c01510a7be487ef356b4f8707d7e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 29 Jan 2021 19:28:13 +0100
Subject: [PATCH 0733/3482] switchboard-plug-printers: fix build

---
 .../patches/fix-signal_subscribe.patch                | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch

diff --git a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch b/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
new file mode 100644
index 000000000000..fa2a534e4f1e
--- /dev/null
+++ b/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
@@ -0,0 +1,11 @@
+--- src/CUPSNotifier.vala	2018-11-28 12:34:33.000000000 +0100
++++ src/CUPSNotifier.vala	2021-01-29 19:26:11.191992396 +0100
+@@ -63,7 +63,7 @@
+         Bus.get_proxy.begin<NotifierDBus> (BusType.SYSTEM, "org.cups.cupsd.Notifier", "/org/cups/cupsd/Notifier", GLib.DBusProxyFlags.NONE, null, (obj, res) => {
+             try {
+                 dbus_notifier = Bus.get_proxy.end (res);
+-                ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, subscription_callback);
++                ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, (GLib.DBusSignalCallback)subscription_callback);
+             } catch (IOError e) {
+                 critical (e.message);
+             }

From 5c920dac747d0b538126bbaa01cf2a5121387c25 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Jan 2021 19:42:11 +0100
Subject: [PATCH 0734/3482] perl-Authen-SASL: fix build and deps.

---
 srcpkgs/perl-Authen-SASL/patches/inc.patch | 10 ++++++++++
 srcpkgs/perl-Authen-SASL/template          |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/perl-Authen-SASL/patches/inc.patch

diff --git a/srcpkgs/perl-Authen-SASL/patches/inc.patch b/srcpkgs/perl-Authen-SASL/patches/inc.patch
new file mode 100644
index 000000000000..8ba0ca2d3aca
--- /dev/null
+++ b/srcpkgs/perl-Authen-SASL/patches/inc.patch
@@ -0,0 +1,10 @@
+--- Makefile.PL.orig
++++ Makefile.PL
+@@ -3,6 +3,7 @@
+ use strict;
+ use warnings;
+ use 5.005;
++use lib ".";
+ use inc::Module::Install;
+ 
+ name		'Authen-SASL';
diff --git a/srcpkgs/perl-Authen-SASL/template b/srcpkgs/perl-Authen-SASL/template
index 8f6fba0b542f..c9aea8eb9587 100644
--- a/srcpkgs/perl-Authen-SASL/template
+++ b/srcpkgs/perl-Authen-SASL/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Authen-SASL'
 pkgname=perl-Authen-SASL
 version=2.16
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="$hostmakedepends"
+makedepends="$hostmakedepends perl-Digest-HMAC"
 depends="$makedepends"
 short_desc="Authen::SASL -- SASL authentication framework"
 maintainer="Orphaned <orphan@voidlinux.org>"

From da1666f1670ce74d921c5619ad047007bb596665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 00:36:42 -0300
Subject: [PATCH 0735/3482] tzdata: update to 2021a.

---
 srcpkgs/tzdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 0f324ff3fc89..25f79d0a1926 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -1,6 +1,6 @@
 # Template file for 'tzdata'
 pkgname=tzdata
-version=2020d
+version=2021a
 revision=1
 wrksrc=tzdata
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public Domain"
 homepage="http://www.iana.org/time-zones"
 distfiles="http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"
-checksum=8d813957de363387696f05af8a8889afa282ab5016a764c701a20758d39cbaf3
+checksum=39e7d2ba08c68cbaefc8de3227aab0dec2521be8042cf56855f7dc3a9fb14e08
 
 do_install() {
 	local timezones="africa antarctica asia australasia europe northamerica \

From c03ab1a0bb8e6e7095c838221df7d4ffd0b61269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 00:36:49 -0300
Subject: [PATCH 0736/3482] tzutils: update to 2021a.

---
 srcpkgs/tzutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index cd1d30fd2539..3bd79fb85cbb 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,6 +1,6 @@
 # Template file for 'tzutils'
 pkgname=tzutils
-version=2020d
+version=2021a
 revision=1
 wrksrc="tz-${version}"
 short_desc="Time zone and daylight-saving time utilities"
@@ -8,7 +8,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="Public Domain, BSD-3-Clause"
 homepage="https://www.iana.org/time-zones"
 distfiles="https://github.com/eggert/tz/archive/${version}.tar.gz"
-checksum=6b9ec90e79593913f687e3af5d880eaa036bb0aafea9707682b0cbd00fadbb09
+checksum=bd7ecd99cbb0a2f15bb7e38be2cbc04dced89922fce4ac0ffcd1ca844ba9362f
 
 do_build() {
 	make TZDIR=/usr/share/zoneinfo CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"

From 7fd3de4b31b9ac526153979130874995d2fe0730 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 29 Jan 2021 19:39:28 +0100
Subject: [PATCH 0737/3482] tokei: update to 12.1.2.

---
 srcpkgs/tokei/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tokei/template b/srcpkgs/tokei/template
index 30ba02dcb3dd..59205436a68a 100644
--- a/srcpkgs/tokei/template
+++ b/srcpkgs/tokei/template
@@ -1,6 +1,6 @@
 # Template file for 'tokei'
 pkgname=tokei
-version=12.0.4
+version=12.1.2
 revision=1
 build_style=cargo
 short_desc="Count lines of code"
@@ -8,7 +8,7 @@ maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/XAMPPRocky/tokei"
 distfiles="https://github.com/XAMPPRocky/tokei/archive/v${version}.tar.gz"
-checksum=031dabbe1253af53fea8258e11eeb352371b6cf0c790db573ca7be33f761c733
+checksum=81ef14ab8eaa70a68249a299f26f26eba22f342fb8e22fca463b08080f436e50
 
 post_install() {
 	vlicense LICENCE-MIT

From 9c1c11a065d6afd5311e5eb608389864e1e0f303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 29 Jan 2021 21:08:12 +0100
Subject: [PATCH 0738/3482] busybox: fix build w/ glibc-2.32 by disabling NFS

---
 srcpkgs/busybox/files/dotconfig             |  2 +-
 srcpkgs/busybox/patches/missing-stime.patch | 32 +++++++++++++++++++++
 srcpkgs/busybox/template                    |  3 +-
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/busybox/patches/missing-stime.patch

diff --git a/srcpkgs/busybox/files/dotconfig b/srcpkgs/busybox/files/dotconfig
index 68876b0821aa..b3c2a607ecc5 100644
--- a/srcpkgs/busybox/files/dotconfig
+++ b/srcpkgs/busybox/files/dotconfig
@@ -654,7 +654,7 @@ CONFIG_FEATURE_MOUNT_FAKE=y
 CONFIG_FEATURE_MOUNT_VERBOSE=y
 CONFIG_FEATURE_MOUNT_HELPERS=y
 CONFIG_FEATURE_MOUNT_LABEL=y
-CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_NFS=n
 CONFIG_FEATURE_MOUNT_CIFS=y
 CONFIG_FEATURE_MOUNT_FLAGS=y
 CONFIG_FEATURE_MOUNT_FSTAB=y
diff --git a/srcpkgs/busybox/patches/missing-stime.patch b/srcpkgs/busybox/patches/missing-stime.patch
new file mode 100644
index 000000000000..7cef477c7568
--- /dev/null
+++ b/srcpkgs/busybox/patches/missing-stime.patch
@@ -0,0 +1,32 @@
+--- libbb/missing_syscalls.c	2019-06-10 12:50:53.000000000 +0200
++++ libbb/missing_syscalls.c	2021-01-29 20:48:33.413486161 +0100
+@@ -7,14 +7,6 @@
+ 
+ #include "libbb.h"
+ 
+-#if defined(ANDROID) || defined(__ANDROID__)
+-/*# include <linux/timex.h> - for struct timex, but may collide with <time.h> */
+-# include <sys/syscall.h>
+-pid_t getsid(pid_t pid)
+-{
+-	return syscall(__NR_getsid, pid);
+-}
+-
+ int stime(const time_t *t)
+ {
+ 	struct timeval tv;
+@@ -23,6 +15,14 @@
+ 	return settimeofday(&tv, NULL);
+ }
+ 
++#if defined(ANDROID) || defined(__ANDROID__)
++/*# include <linux/timex.h> - for struct timex, but may collide with <time.h> */
++# include <sys/syscall.h>
++pid_t getsid(pid_t pid)
++{
++	return syscall(__NR_getsid, pid);
++}
++
+ int sethostname(const char *name, size_t len)
+ {
+ 	return syscall(__NR_sethostname, name, len);
diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index 35e589aced4f..707dac57d2d2 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -1,7 +1,7 @@
 # Template file for 'busybox'
 pkgname=busybox
 version=1.31.1
-revision=3
+revision=4
 hostmakedepends="perl"
 checkdepends="zip"
 short_desc="Swiss Army Knife of Embedded Linux"
@@ -48,7 +48,6 @@ do_configure() {
 
 		case "$XBPS_TARGET_MACHINE" in
 		*-musl) sed -i -e /CONFIG_FEATURE_VI_REGEX_SEARCH/s/y/n/ \
-				-e /CONFIG_FEATURE_MOUNT_NFS/s/y/n/ \
 				${t}/.config;;
 		esac
 

From 27aac8793264068678d0c73ac397aea3646940e1 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Fri, 29 Jan 2021 18:30:55 +0000
Subject: [PATCH 0739/3482] ImageMagick: update to 7.0.10.60.

---
 srcpkgs/ImageMagick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 5764712db610..17e597557405 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 _majorver=7.0.10
-_patchver=58
+_patchver=60
 version="${_majorver}.${_patchver}"
 revision=1
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
@@ -21,7 +21,7 @@ license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=0daabb64602164940fbf95cbd6f16709903eef5d3eee7bd329da878f17605df5
+checksum=044fc1b27bd9aab515d4c512a33cf3a39313af2baef4aebf5c5c3044b7366ee4
 
 subpackages="libmagick libmagick-devel"
 

From 698087305ff7b86b290a46cb526772bff658136e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 29 Jan 2021 17:57:05 +0100
Subject: [PATCH 0740/3482] tml: update to 0.4.0.

---
 srcpkgs/tml/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tml/template b/srcpkgs/tml/template
index 494883b1010c..fb1e4b7953cd 100644
--- a/srcpkgs/tml/template
+++ b/srcpkgs/tml/template
@@ -1,17 +1,18 @@
 # Template file for 'tml'
 pkgname=tml
-version=0.3.0
+version=0.4.0
 revision=1
 build_style=go
 go_import_path="github.com/liamg/tml"
 go_package="github.com/liamg/tml/tml"
+go_ldflags="-X github.com/liamg/tml/version.Version=${TRAVIS_TAG}"
 hostmakedepends="git"
 short_desc="Tiny markup language for terminal output"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/liamg/tml"
 distfiles="https://github.com/liamg/tml/archive/v${version}.tar.gz"
-checksum=083d0252827d13da36a0b9c967d522adf31f8ce770a00c29d84a197d0102216e
+checksum=b0c421ec8f3c3fcbdfbabe1a07c71ce5fd572a8f34181b8d032dff1a297d458b
 
 post_install() {
 	vlicense LICENSE

From c5ab97afd9306a01f61520b543a656b195431183 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Fri, 29 Jan 2021 19:48:54 +0000
Subject: [PATCH 0741/3482] dehydrated: update to 0.7.0.

---
 srcpkgs/dehydrated/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dehydrated/template b/srcpkgs/dehydrated/template
index b624b1fe226f..949e5ab73b32 100644
--- a/srcpkgs/dehydrated/template
+++ b/srcpkgs/dehydrated/template
@@ -1,7 +1,7 @@
 # Template file for 'dehydrated'
 pkgname=dehydrated
-version=0.6.5
-revision=2
+version=0.7.0
+revision=1
 depends="curl"
 short_desc="Acme client implemented as a shell-script – just add water"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://dehydrated.io/"
 changelog="https://raw.githubusercontent.com/lukas2511/dehydrated/master/CHANGELOG"
 distfiles="https://github.com/lukas2511/dehydrated/releases/download/v${version}/dehydrated-${version}.tar.gz"
-checksum=10aabd0027450bc70a18e49acaca7a9697e0cfb92368d3e508b7a4d6d69bfa35
+checksum=1c5f12c2e57e64b1762803f82f0f7e767a72e65a6ce68e4d1ec197e61b9dc4f9
 conf_files="/etc/dehydrated/config
  /etc/dehydrated/domains.txt
  /etc/dehydrated/hook.sh"

From 42e4e4e13758ca1f42dc2bb7a91c7b5150fcd11a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 29 Jan 2021 22:44:49 +0100
Subject: [PATCH 0742/3482] linux5.10: enable amdgpu dcn30 (rx 6xxx series) on
 ppc64

---
 srcpkgs/linux5.10/files/ppc64-dotconfig       |  4 +-
 srcpkgs/linux5.10/files/ppc64le-dotconfig     | 19 ++------
 .../patches/amdgpu-dcn30-ppc64.patch          | 46 +++++++++++++++++++
 3 files changed, 53 insertions(+), 16 deletions(-)
 create mode 100644 srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch

diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig
index 4299f42e17c3..4579421aac23 100644
--- a/srcpkgs/linux5.10/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.10 Kernel Configuration
+# Linux/powerpc 5.10.11 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -6032,6 +6032,7 @@ CONFIG_DRM_AMD_ACP=y
 #
 CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMD_DC_DCN=y
+CONFIG_DRM_AMD_DC_DCN3_0=y
 # CONFIG_DRM_AMD_DC_HDCP is not set
 CONFIG_DRM_AMD_DC_SI=y
 # end of Display Engine Configuration
@@ -7197,7 +7198,6 @@ CONFIG_USB_BDC_UDC=m
 #
 # Platform Support
 #
-CONFIG_USB_BDC_PCI=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_NET2272=m
 # CONFIG_USB_NET2272_DMA is not set
diff --git a/srcpkgs/linux5.10/files/ppc64le-dotconfig b/srcpkgs/linux5.10/files/ppc64le-dotconfig
index 1397fe1b7763..08459346e243 100644
--- a/srcpkgs/linux5.10/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64le-dotconfig
@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.1 Kernel Configuration
+# Linux/powerpc 5.10.11 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc64le-linux-musl-gcc (GCC) 9.3.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=232000000
+CONFIG_GCC_VERSION=100201
+CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
@@ -4202,7 +4202,6 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_REGMAP=m
 CONFIG_GPIO_MAX730X=m
 
 #
@@ -4261,7 +4260,6 @@ CONFIG_GPIO_MAX77620=m
 CONFIG_GPIO_MAX77650=m
 CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_RC5T583=y
-CONFIG_GPIO_SL28CPLD=m
 CONFIG_GPIO_STMPE=y
 CONFIG_GPIO_TC3589X=y
 CONFIG_GPIO_TPS65086=m
@@ -4545,7 +4543,6 @@ CONFIG_SENSORS_UCD9200=m
 CONFIG_SENSORS_XDPE122=m
 CONFIG_SENSORS_ZL6100=m
 CONFIG_SENSORS_PWM_FAN=m
-CONFIG_SENSORS_SL28CPLD=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SHT3x=m
@@ -4638,7 +4635,6 @@ CONFIG_WM831X_WATCHDOG=m
 # CONFIG_WM8350_WATCHDOG is not set
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_ZIIRAVE_WATCHDOG=m
-CONFIG_SL28CPLD_WATCHDOG=m
 CONFIG_CADENCE_WATCHDOG=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_RN5T618_WATCHDOG=m
@@ -4763,8 +4759,6 @@ CONFIG_MFD_RK808=m
 CONFIG_MFD_RN5T618=m
 # CONFIG_MFD_SEC_CORE is not set
 CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SIMPLE_MFD_I2C=m
-CONFIG_MFD_SL28CPLD=m
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SKY81452=m
@@ -5838,6 +5832,7 @@ CONFIG_DRM_AMD_ACP=y
 #
 CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMD_DC_DCN=y
+CONFIG_DRM_AMD_DC_DCN3_0=y
 # CONFIG_DRM_AMD_DC_HDCP is not set
 CONFIG_DRM_AMD_DC_SI=y
 # end of Display Engine Configuration
@@ -6893,7 +6888,6 @@ CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_APPLE_MFI_FASTCHARGE=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -6949,7 +6943,6 @@ CONFIG_USB_BDC_UDC=m
 #
 # Platform Support
 #
-CONFIG_USB_BDC_PCI=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_NET2272=m
 # CONFIG_USB_NET2272_DMA is not set
@@ -8503,7 +8496,6 @@ CONFIG_PWM_FSL_FTM=m
 CONFIG_PWM_IQS620A=m
 CONFIG_PWM_LP3943=m
 CONFIG_PWM_PCA9685=m
-CONFIG_PWM_SL28CPLD=m
 CONFIG_PWM_STMPE=y
 # CONFIG_PWM_TWL is not set
 # CONFIG_PWM_TWL_LED is not set
@@ -9418,7 +9410,6 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
-CONFIG_DMA_VIRT_OPS=y
 CONFIG_SWIOTLB=y
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_SGL_ALLOC=y
diff --git a/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch b/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch
new file mode 100644
index 000000000000..a72cdfea781d
--- /dev/null
+++ b/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch
@@ -0,0 +1,46 @@
+From 3a75ebe236580073d77ad69730fc1d8980e130c2 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Fri, 29 Jan 2021 22:25:29 +0100
+Subject: [PATCH] amd/display: enable dcn30 for ppc64
+
+---
+ drivers/gpu/drm/amd/display/Kconfig           | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig
+index 3c410d2..a749cc7 100644
+--- a/drivers/gpu/drm/amd/display/Kconfig
++++ b/drivers/gpu/drm/amd/display/Kconfig
+@@ -19,7 +19,7 @@ config DRM_AMD_DC_DCN
+ 
+ config DRM_AMD_DC_DCN3_0
+         bool "DCN 3.0 family"
+-        depends on DRM_AMD_DC && X86
++        depends on DRM_AMD_DC
+         depends on DRM_AMD_DC_DCN
+         help
+             Choose this option if you want to have
+diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/Makefile b/drivers/gpu/drm/amd/display/dc/dcn30/Makefile
+index bd2a068..248c271 100644
+--- a/drivers/gpu/drm/amd/display/dc/dcn30/Makefile
++++ b/drivers/gpu/drm/amd/display/dc/dcn30/Makefile
+@@ -52,6 +52,7 @@ IS_OLD_GCC = 1
+ endif
+ endif
+ 
++ifdef CONFIG_X86
+ ifdef IS_OLD_GCC
+ # Stack alignment mismatch, proceed with caution.
+ # GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3
+@@ -62,6 +63,7 @@ else
+ CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_resource.o += -msse2
+ CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_optc.o += -msse2
+ endif
++endif
+ 
+ AMD_DAL_DCN30 = $(addprefix $(AMDDALPATH)/dc/dcn30/,$(DCN30))
+ 
+-- 
+2.30.0
+

From a782318a915edb7cbc3439230529a110af534ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 29 Jan 2021 23:48:59 +0100
Subject: [PATCH 0743/3482] ario: fix install path for locale files

---
 srcpkgs/ario/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d21014..80caeb5b5598 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
@@ -16,6 +16,6 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
 post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,$(prefix)/$(DATADIRNAME)/locale,$(datarootdir)/locale,' po/Makefile.in.in
 }

From 2261daa3ad47f144aa9cb8b2344b15cbd512bfc7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 29 Jan 2021 23:56:44 +0100
Subject: [PATCH 0744/3482] ario: fix the l10n dir, this time properly

the previous change would change the install path but not where
the patch actually looks up the files, breaking locale support
entirely
---
 srcpkgs/ario/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 80caeb5b5598..eaa4bb2b89c7 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
@@ -17,5 +17,5 @@ checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
 post_extract() {
 	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	vsed -i 's,$(prefix)/$(DATADIRNAME)/locale,$(datarootdir)/locale,' po/Makefile.in.in
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
 }

From 1b9b69cc8c5cbbb1c3b6009b9d4b5d5f8a47e541 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 30 Jan 2021 01:32:58 +0100
Subject: [PATCH 0745/3482] appdata-tools: properly fix locale dir

---
 srcpkgs/appdata-tools/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index 126997ddee96..3613bef253e9 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,18 +1,17 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
 
 post_configure() {
-	vsed -i po/Makefile \
-		-e 's;\(itlocaledir = $(prefix)\)/$(DATADIRNAME)/locale;\1/share/locale;'
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
 }

From 2d2cc562ffadfe73a7e84616101453d2b1c2c0fd Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 30 Jan 2021 01:38:25 +0100
Subject: [PATCH 0746/3482] appdata-tools: use post_patch

oops, post_configure wasn't correct but it also built fine because
the changed timestamp would make it re-run configure
---
 srcpkgs/appdata-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index 3613bef253e9..40779679ba11 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -12,6 +12,6 @@ homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
 
-post_configure() {
+post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
 }

From 021a796b67cf1317dfa237cf7b8eaa9268db015e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 30 Jan 2021 01:40:47 +0100
Subject: [PATCH 0747/3482] polkit-gnome: fix l10n directory

---
 srcpkgs/polkit-gnome/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad86..21841eebb2c7 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
@@ -12,6 +12,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From d00fa5c4e87b72ae59b1818326f667ac4840a976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 17:28:49 -0300
Subject: [PATCH 0748/3482] librsvg: update to 2.50.3.

Remove outdated comments.

Remove forgotten conditionals for vmoves. Would have built erroneous
packages.

Add changelog.
---
 srcpkgs/librsvg/template | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template
index 3e4954a13326..871e61482836 100644
--- a/srcpkgs/librsvg/template
+++ b/srcpkgs/librsvg/template
@@ -1,7 +1,6 @@
 # Template file for 'librsvg'
 pkgname=librsvg
-# https://gitlab.gnome.org/GNOME/librsvg/-/issues/604
-version=2.48.8
+version=2.50.3
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -13,11 +12,14 @@ short_desc="SVG library for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/LibRsvg"
+# update changelog when release series changes
+changelog="https://gitlab.gnome.org/GNOME/librsvg/-/raw/librsvg-2.50/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f480a325bbdf26d1874eb6fb330ebc5920ba64e3e08de61931bb4506dfef2692
+checksum=a4298a98e3a95fdd73c858c17d4dd018525fb09dbb13bbd668a0c2243989e958
 
 do_check() {
-	# reference files are for pango 1.44.x, we're on 1.42.x
+	# reference files are for specific pango and harfbuzz versions
+	# the test suite isn't designed to be run by distros
 	:
 }
 
@@ -29,12 +31,8 @@ librsvg-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove usr/share/gtk-doc
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
-			vmove usr/share/vala
-		fi
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
 	}
 }
 librsvg-utils_package() {

From 9549944eb9bc1dc1cce278f6125d63724364c753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 09:43:02 +0700
Subject: [PATCH 0749/3482] geeqie: fix l10n dir

---
 srcpkgs/geeqie/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3efa..efc425e9d83c 100644
--- a/srcpkgs/geeqie/template
+++ b/srcpkgs/geeqie/template
@@ -1,7 +1,7 @@
 # Template file for 'geeqie'
 pkgname=geeqie
 version=1.5.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gtk3"
 hostmakedepends="automake pkg-config intltool glib-devel gtk+3-devel"
@@ -25,6 +25,11 @@ post_extract() {
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
+	# The shipped configure doesn't have the code path
+	# for generating gtk+3 cflags and ldflags
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/CATOBJEXT=/s/\.mo/.gmo/' \
+		configure
 }
 
 do_build() {

From e1105eff89909cd79431f1ded2f313413c305c2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 09:50:10 +0700
Subject: [PATCH 0750/3482] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc25..8e547f1f9ebd 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,7 +1,7 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
@@ -19,6 +19,7 @@ post_patch() {
 
 pre_configure() {
 	autoreconf -fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
 }
 
 libgpod-devel_package() {

From 8f9791cbf78d696eb85d62b50f06d6e8e5817aa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 13:40:19 +0700
Subject: [PATCH 0751/3482] pragha: fix l10n dir, remove build_options

---
 srcpkgs/pragha/template | 44 ++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c0..2069b22b1ef6 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,41 +1,35 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
-hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
+hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
+ pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
- $(vopt_if peas libpeas-devel) libxfce4ui-devel totem-pl-parser-devel gst-plugins-base1-devel
+ libpeas-devel libxfce4ui-devel totem-pl-parser-devel gst-plugins-base1-devel
  libnotify-devel libcdio-devel libcdio-paranoia-devel libcddb-devel
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
-short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
+short_desc="Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8
 
-build_options="peas"
-desc_option_peas="Enable libpeas plugin library"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="peas"
-fi
-
-pre_configure() {
-	CPP=$CPP ./autogen.sh
+do_configure() {
+	CFLAGS+=" $($PKG_CONFIG --cflags gupnp-1.2)"
+	CPP=$CPP ./autogen.sh \
+		$configure_args \
+		--disable-maintainer-mode \
+		--with-locales-dir=/usr/share/locale
 }
 
-if [ -z "$CROSS_BUILD" ]; then
-
-	pragha-devel_package() {
-		short_desc+=" - development files"
-		depends="${sourcepkg}>=${version}_${revision}"
-		pkg_install() {
-			vmove usr/include/pragha/plugins
-			vmove usr/lib/pragha/plugins/devices/libdeviceclient.so
-		}
+pragha-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/pragha/plugins
+		vmove usr/lib/pragha/plugins/devices/libdeviceclient.so
 	}
-
-fi
+}

From a061c693a863faa816976561e5a91a436939ef89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 14:29:51 +0700
Subject: [PATCH 0752/3482] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d064..8c6bc8115023 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
@@ -18,7 +18,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +28,17 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/CATOBJEXT=/s/\.mo/.gmo/' \
+		configure
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 376f3788f23f49fde37c78ecad1dbbeac9b286b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 13:59:01 +0700
Subject: [PATCH 0753/3482] xsane: fix l10n dir

---
 srcpkgs/xsane/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template
index 022eae8e9463..65c6fd79288f 100644
--- a/srcpkgs/xsane/template
+++ b/srcpkgs/xsane/template
@@ -1,8 +1,8 @@
 # Template file for 'xsane'
 pkgname=xsane
 version=0.999
-revision=3
-hostmakedepends="pkg-config"
+revision=4
+hostmakedepends="pkg-config sane-devel gettext"
 makedepends="gtk+-devel lcms-devel sane-devel gimp-devel"
 depends="sane"
 short_desc="GTK-based X11 frontend for SANE"
@@ -12,9 +12,11 @@ homepage="http://www.xsane.org"
 distfiles="${DEBIAN_SITE}/main/x/xsane/xsane_${version}.orig.tar.gz"
 checksum=5782d23e67dc961c81eef13a87b17eb0144cae3d1ffc5cf7e0322da751482b4b
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" sane-devel"
-fi
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=.*/DATADIRNAME=share/' \
+		-e 's,/usr/local/include,/usr/include,' \
+		configure
+}
 
 do_build() {
 	local _args="--prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man
@@ -26,7 +28,6 @@ do_build() {
 	make clean
 	echo "=== ./configure ${_args} --disable-gimp"
 	./configure ${_args} --disable-gimp
-	sed -i 's;/usr/local;/usr;g' src/Makefile
 	make ${makejobs}
 }
 

From 6c73b3731152d67068f41b3629797bb39e163cd8 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 30 Jan 2021 13:52:45 +0000
Subject: [PATCH 0754/3482] entr: update to 4.7.

---
 srcpkgs/entr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/entr/template b/srcpkgs/entr/template
index af4119764bbd..0b42bf9c50e1 100644
--- a/srcpkgs/entr/template
+++ b/srcpkgs/entr/template
@@ -1,6 +1,6 @@
 # Template file for 'entr'
 pkgname=entr
-version=4.6
+version=4.7
 revision=1
 build_style=gnu-makefile
 short_desc="Utility for running arbitrary commands when files change"
@@ -8,7 +8,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="ISC"
 homepage="http://entrproject.org"
 distfiles="$homepage/code/$pkgname-$version.tar.gz"
-checksum=16de20820df4a38162354754487b1248c8711822c7342d2f6d4f28fbd4a38e6d
+checksum=b6c1ab7644d83bb2a269dc74160867a3be0f5df116c7eb453c25053173534429
 
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in

From fb8b4b82efdd1809cc89c54e757b097778816ca7 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 09:58:07 +0100
Subject: [PATCH 0755/3482] perl-Specio: update to 0.47

---
 srcpkgs/perl-Specio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Specio/template b/srcpkgs/perl-Specio/template
index 5f9190c0a482..23a14cba1924 100644
--- a/srcpkgs/perl-Specio/template
+++ b/srcpkgs/perl-Specio/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Specio'
 pkgname=perl-Specio
-version=0.46
-revision=2
+version=0.47
+revision=1
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -14,4 +14,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="Artistic-2.0"
 homepage="https://metacpan.org/release/Specio"
 distfiles="${CPAN_SITE}/Test/Specio-${version}.tar.gz"
-checksum=0bf42aa116076d6efc18f72b72c7acb5638bd41c0aa09aecc12fc8bf9ceb9596
+checksum=f41307f14444f8777e572f27eeb6a964084399e7e382c47c577827ad8a286a1c

From 8a29a29abc8fc0004a6c6a3189c1b29b5391f42f Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 01:58:11 -0700
Subject: [PATCH 0756/3482] procs: update to 0.11.3.

---
 srcpkgs/procs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template
index ec213049c73d..17a0dc5e0527 100644
--- a/srcpkgs/procs/template
+++ b/srcpkgs/procs/template
@@ -1,6 +1,6 @@
 # Template file for 'procs'
 pkgname=procs
-version=0.10.10
+version=0.11.3
 revision=1
 build_style=cargo
 short_desc="Modern replacement for ps written in Rust"
@@ -8,7 +8,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://github.com/dalance/procs"
 distfiles="https://github.com/dalance/procs/archive/v${version}.tar.gz"
-checksum=dbef5afc118f54e794b539b86fc3a53ac4a94ec566ad78cddfe0580940388421
+checksum=bf56fde52d0f6544a2ca3db6d4552867e5cf9daf1c5a31f8b3ad6e3258986b0f
 
 post_install() {
 	vlicense LICENSE

From a2a662c5d59ab4a012eb2489081c2c53e702bc6e Mon Sep 17 00:00:00 2001
From: Renato Aguiar <renato@renatoaguiar.net>
Date: Sat, 30 Jan 2021 05:53:35 +0000
Subject: [PATCH 0757/3482] delve: update to 1.6.0

---
 srcpkgs/delve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index 00360982335a..22f8bc63051a 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,6 +1,6 @@
 # Template file for 'delve'
 pkgname=delve
-version=1.5.0
+version=1.6.0
 revision=1
 build_style=go
 go_import_path=github.com/go-delve/delve/cmd/dlv
@@ -9,7 +9,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/go-delve/delve"
 distfiles="https://github.com/go-delve/delve/archive/v${version}.tar.gz"
-checksum=f8bbaecdfc9d1ff6148900d3dea44b6dd06a7f0197be4e9a75c289b7f62682ab
+checksum=a10a6fc40d87572c6d3f3becdb1a289269e17526d038749f2fa04dd9f591f26a
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|arm*|ppc*) broken=yes ;;

From fa1f671504965c4a289412ac1ac48b95d8e80e85 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 09:53:36 +0100
Subject: [PATCH 0758/3482] perl-Role-Tiny: update to 2.002004

---
 srcpkgs/perl-Role-Tiny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Role-Tiny/template b/srcpkgs/perl-Role-Tiny/template
index f0754d4ab5b2..7887cfeb166e 100644
--- a/srcpkgs/perl-Role-Tiny/template
+++ b/srcpkgs/perl-Role-Tiny/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Role-Tiny'
 pkgname=perl-Role-Tiny
-version=2.002003
+version=2.002004
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Role-Tiny"
 distfiles="${CPAN_SITE}/lib/HAARG/Role-Tiny-${version}.tar.gz"
-checksum=6981e5f2d0beded157840199d678da462b22a9a3753333cab322ab6efb0fbb89
+checksum=d7bdee9e138a4f83aa52d0a981625644bda87ff16642dfa845dcb44d9a242b45

From 43f3ca3dbaad456bde5d2f244f32e3179efae1b5 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 09:50:21 +0100
Subject: [PATCH 0759/3482] perl-Gtk3: update to 0.038

---
 srcpkgs/perl-Gtk3/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Gtk3/template b/srcpkgs/perl-Gtk3/template
index b5ef6929ba0f..7b0b175733ca 100644
--- a/srcpkgs/perl-Gtk3/template
+++ b/srcpkgs/perl-Gtk3/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Gtk3'
 pkgname=perl-Gtk3
-version=0.037
-revision=2
+version=0.038
+revision=1
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -13,4 +13,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="LGPL-2.1-or-later"
 homepage="http://gtk2-perl.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Gtk3/Gtk3-${version}.tar.gz"
-checksum=bf5ae1547294a78ca8ba5a88cb20f99a16e4c82bed55446aa054c944918e3f51
+checksum=70dc4bf2aa74981c79e15fd298d998e05a92eba4811f1ad5c9f1f4de37737acc

From 26ec8902ecffcf25e82059ef3c9890fa71bd511c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 23:27:49 -0500
Subject: [PATCH 0760/3482] lxc: update to 4.0.6.

---
 srcpkgs/lxc/patches/fix-config-parsing.patch | 169 -------------------
 srcpkgs/lxc/patches/fix-rootfs-mount.patch   |  27 ---
 srcpkgs/lxc/template                         |  11 +-
 3 files changed, 5 insertions(+), 202 deletions(-)
 delete mode 100644 srcpkgs/lxc/patches/fix-config-parsing.patch
 delete mode 100644 srcpkgs/lxc/patches/fix-rootfs-mount.patch

diff --git a/srcpkgs/lxc/patches/fix-config-parsing.patch b/srcpkgs/lxc/patches/fix-config-parsing.patch
deleted file mode 100644
index cbb435c3e4ac..000000000000
--- a/srcpkgs/lxc/patches/fix-config-parsing.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 26dffd825842edf019bc17da24a6809ed51c048c Mon Sep 17 00:00:00 2001
-From: Christian Brauner <christian.brauner@ubuntu.com>
-Date: Mon, 16 Nov 2020 12:18:14 +0100
-Subject: [PATCH] parse: rework config parsing routine
-
-Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
----
- src/lxc/file_utils.c |  7 +++++--
- src/lxc/file_utils.h |  6 +++++-
- src/lxc/parse.c      | 49 ++++++++++++++++++++++++--------------------
- 3 files changed, 37 insertions(+), 25 deletions(-)
-
-diff --git src/lxc/file_utils.c src/lxc/file_utils.c
-index fafaba354c..3b4bffb399 100644
---- src/lxc/file_utils.c
-+++ src/lxc/file_utils.c
-@@ -382,8 +382,10 @@ ssize_t lxc_sendfile_nointr(int out_fd, int in_fd, off_t *offset, size_t count)
- 	return ret;
- }
- 
--int fd_to_fd(int from, int to)
-+ssize_t __fd_to_fd(int from, int to)
- {
-+	ssize_t total_bytes = 0;
-+
- 	for (;;) {
- 		uint8_t buf[PATH_MAX];
- 		uint8_t *p = buf;
-@@ -407,9 +409,10 @@ int fd_to_fd(int from, int to)
- 			bytes_to_write -= bytes_written;
- 			p += bytes_written;
- 		} while (bytes_to_write > 0);
-+		total_bytes += bytes_to_write;
- 	}
- 
--	return 0;
-+	return total_bytes;
- }
- 
- int fd_to_buf(int fd, char **buf, size_t *length)
-diff --git src/lxc/file_utils.h src/lxc/file_utils.h
-index ea9570dd18..11acdb3a7b 100644
---- src/lxc/file_utils.h
-+++ src/lxc/file_utils.h
-@@ -68,7 +68,11 @@ __hidden extern FILE *fopen_cloexec(const char *path, const char *mode);
- __hidden extern ssize_t lxc_sendfile_nointr(int out_fd, int in_fd, off_t *offset, size_t count);
- __hidden extern char *file_to_buf(const char *path, size_t *length);
- __hidden extern int fd_to_buf(int fd, char **buf, size_t *length);
--__hidden extern int fd_to_fd(int from, int to);
-+__hidden extern ssize_t __fd_to_fd(int from, int to);
-+static inline int fd_to_fd(int from, int to)
-+{
-+	return __fd_to_fd(from, to) >= 0;
-+}
- __hidden extern int lxc_open_dirfd(const char *dir);
- __hidden extern FILE *fdopen_cached(int fd, const char *mode, void **caller_freed_buffer);
- __hidden extern FILE *fopen_cached(const char *path, const char *mode, void **caller_freed_buffer);
-diff --git src/lxc/parse.c src/lxc/parse.c
-index 291bf3efc1..5a5b853458 100644
---- src/lxc/parse.c
-+++ src/lxc/parse.c
-@@ -5,6 +5,7 @@
- #endif
- #include <dirent.h>
- #include <errno.h>
-+#include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -50,11 +51,12 @@ int lxc_strmunmap(void *addr, size_t length)
- 
- int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *data)
- {
--	int saved_errno;
--	ssize_t ret = -1, bytes_sent;
--	char *line;
--	int fd = -1, memfd = -1;
-+	__do_close int fd = -EBADF, memfd = -EBADF;
-+	ssize_t ret = -1;
- 	char *buf = NULL;
-+	struct stat st = {};
-+	ssize_t bytes;
-+	char *line;
- 
- 	memfd = memfd_create(".lxc_config_file", MFD_CLOEXEC);
- 	if (memfd < 0) {
-@@ -65,8 +67,7 @@ int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *da
- 			goto on_error;
- 		}
- 
--		TRACE("Failed to create in-memory file. Falling back to "
--		      "temporary file");
-+		TRACE("Failed to create in-memory file. Falling back to temporary file");
- 		memfd = lxc_make_tmpfile(template, true);
- 		if (memfd < 0) {
- 			SYSERROR("Failed to create temporary file \"%s\"", template);
-@@ -80,10 +81,21 @@ int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *da
- 		goto on_error;
- 	}
- 
--	/* sendfile() handles up to 2GB. No config file should be that big. */
--	bytes_sent = lxc_sendfile_nointr(memfd, fd, NULL, LXC_SENDFILE_MAX);
--	if (bytes_sent < 0) {
--		SYSERROR("Failed to sendfile \"%s\"", file);
-+	ret = fstat(fd, &st);
-+	if (ret) {
-+		SYSERROR("Failed to stat file \"%s\"", file);
-+		goto on_error;
-+	}
-+
-+	if (st.st_size > INT_MAX) {
-+		SYSERROR("Excessively large config file \"%s\"", file);
-+		goto on_error;
-+	}
-+
-+
-+	bytes = __fd_to_fd(fd, memfd);
-+	if (bytes < 0) {
-+		SYSERROR("Failed to copy config file \"%s\"", file);
- 		goto on_error;
- 	}
- 
-@@ -92,7 +104,7 @@ int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *da
- 		SYSERROR("Failed to append zero byte");
- 		goto on_error;
- 	}
--	bytes_sent++;
-+	bytes++;
- 
- 	ret = lseek(memfd, 0, SEEK_SET);
- 	if (ret < 0) {
-@@ -101,8 +113,7 @@ int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *da
- 	}
- 
- 	ret = -1;
--	buf = mmap(NULL, bytes_sent, PROT_READ | PROT_WRITE,
--		   MAP_SHARED | MAP_POPULATE, memfd, 0);
-+	buf = mmap(NULL, bytes, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_POPULATE, memfd, 0);
- 	if (buf == MAP_FAILED) {
- 		buf = NULL;
- 		SYSERROR("Failed to mmap");
-@@ -117,24 +128,18 @@ int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *da
- 			 * error.
- 			 */
- 			if (ret < 0)
--				ERROR("Failed to parse config file \"%s\" at "
--				      "line \"%s\"", file, line);
-+				ERROR("Failed to parse config file \"%s\" at line \"%s\"",
-+				      file, line);
- 			break;
- 		}
- 	}
- 
- on_error:
--	saved_errno = errno;
--	if (fd >= 0)
--		close(fd);
--	if (memfd >= 0)
--		close(memfd);
--	if (buf && munmap(buf, bytes_sent)) {
-+	if (buf && munmap(buf, bytes)) {
- 		SYSERROR("Failed to unmap");
- 		if (ret == 0)
- 			ret = -1;
- 	}
--	errno = saved_errno;
- 
- 	return ret;
- }
diff --git a/srcpkgs/lxc/patches/fix-rootfs-mount.patch b/srcpkgs/lxc/patches/fix-rootfs-mount.patch
deleted file mode 100644
index f4465b6277ea..000000000000
--- a/srcpkgs/lxc/patches/fix-rootfs-mount.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 26ea5533c941baee14923dfc3edfb9c91666d245 Mon Sep 17 00:00:00 2001
-From: Christian Brauner <christian.brauner@ubuntu.com>
-Date: Mon, 14 Dec 2020 17:52:44 +0100
-Subject: [PATCH] conf: fix block-device based rootfs mounting
-
-Fixes: #3598
-Cc: stable-4.0
-Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
----
- src/lxc/conf.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git src/lxc/conf.c src/lxc/conf.c
-index 9f631e0c23..27f9706687 100644
---- src/lxc/conf.c
-+++ src/lxc/conf.c
-@@ -3135,6 +3135,10 @@ int lxc_setup_rootfs_prepare_root(struct lxc_conf *conf, const char *name,
- 		if (ret < 0)
- 			return log_error(-1, "Failed to bind mount container / onto itself");
- 
-+		conf->rootfs.mntpt_fd = openat(-EBADF, path, O_RDONLY | O_CLOEXEC | O_DIRECTORY | O_PATH | O_NOCTTY);
-+		if (conf->rootfs.mntpt_fd < 0)
-+			return log_error_errno(-errno, errno, "Failed to open file descriptor for container rootfs");
-+
- 		return log_trace(0, "Bind mounted container / onto itself");
- 	}
- 
diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 03fbeb400f51..4e74c364b8d1 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,9 +1,7 @@
 # Template file for 'lxc'
-_desc="Linux Containers"
-
 pkgname=lxc
-version=4.0.5
-revision=3
+version=4.0.6
+revision=1
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none
@@ -11,12 +9,13 @@ configure_args="--enable-doc --enable-seccomp
 hostmakedepends="automake libtool pkg-config docbook2x"
 makedepends="libcap-devel libseccomp-devel gnutls-devel libapparmor-devel"
 depends="xz wget gnupg"
+_desc="Linux Containers"
 short_desc="${_desc} - utilities"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
-homepage="https://linuxcontainers.org"
 license="LGPL-2.1-or-later"
+homepage="https://linuxcontainers.org"
 distfiles="https://linuxcontainers.org/downloads/lxc-${version}.tar.gz"
-checksum=af2cd616d5ab689e5d2305361c6571b5e632afd7eaab1754cca1670446a2e6a4
+checksum=9165dabc0bb6ef7f2fda2009aee90b20fbefe77ed8008347e9f06048eba1e463
 
 conf_files="/etc/lxc/default.conf"
 make_dirs="

From 6ecbbf767a9d202d00d4eb069ec819e28d75a6a6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Jan 2021 00:42:31 +0100
Subject: [PATCH 0761/3482] hooks/pre-pkg/03-rewrite-python-shebang.sh: use
 grep -r instead of find.

This saves us one sed execution per file in the destdir, resulting
in a major speedup.

Grep will only consider text files and only look at the first line.
---
 common/hooks/pre-pkg/03-rewrite-python-shebang.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
index 22f506155a06..60e7f61975b5 100644
--- a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
+++ b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
@@ -16,7 +16,7 @@ hook() {
 		default_shebang="#!/usr/bin/python${pyver%.*}"
 	fi
 
-	find "${PKGDESTDIR}" -type f -print0 | \
+	grep -rlIZ -m1 '^#!.*python' "${PKGDESTDIR}" |
 		while IFS= read -r -d '' file; do
 			[ ! -s "$file" ] && continue
 

From 210b461028f206f1dc1e300bfee6fd0a14eea8a4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Jan 2021 01:18:07 +0100
Subject: [PATCH 0762/3482] hooks/post-install/06-strip-and-debug-pkgs.sh:
 speed up.

Only run file once for each file in the destdir, only double-check
when we are about to strip the ELF files.
---
 .../hooks/post-install/06-strip-and-debug-pkgs.sh   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/common/hooks/post-install/06-strip-and-debug-pkgs.sh b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
index b59dde5ab3cd..52591c38b311 100644
--- a/common/hooks/post-install/06-strip-and-debug-pkgs.sh
+++ b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
@@ -70,10 +70,6 @@ hook() {
 			continue
 		fi
 
-		if [[ $(file -b "$f") =~ "no machine" ]]; then
-			continue
-		fi
-
 		fname=${f##*/}
 		for x in ${nostrip_files}; do
 			if [ "$x" = "$fname" ]; then
@@ -119,6 +115,13 @@ hook() {
 			fi
 			;;
 		application/x-sharedlib*|application/x-pie-executable*)
+			local type="$(file -b "$f")"
+			if [[ $type =~ "no machine" ]]; then
+				# using ELF as a container format (e.g. guile)
+				echo "   Ignoring ELF file without machine set: ${f#$PKGDESTDIR}"
+				continue
+			fi
+
 			chmod +w "$f"
 			# shared library
 			make_debug "$f"
@@ -127,7 +130,7 @@ hook() {
 				msg_red "$pkgver: failed to strip ${f#$PKGDESTDIR}\n"
 				return 1
 			fi
-			if [[ $(file $f) =~ "interpreter " ]]; then
+			if [[ $type =~ "interpreter " ]]; then
 				echo "   Stripped position-independent executable: ${f#$PKGDESTDIR}"
 			else
 				echo "   Stripped library: ${f#$PKGDESTDIR}"

From 3061913b90e3d6209dc34a0c2726da08a473badb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 30 Jan 2021 15:19:31 +0100
Subject: [PATCH 0763/3482] linux5.10: update to 5.10.12.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index e5930f6f0bbb..ecf5eeed7016 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.11
+version=5.10.12
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=02ef2b56b00fc5145701c603a5235e1265772e40d488a936b27ba65fe78e710f
+checksum=1d454f2817ab4f34cf313ea680ab75e20f79c6431b3bd3ea3bcd39353030c4aa
 python_version=3
 patch_args="-Np1"
 

From ecaeb6f5f8d69134d2b7b881bb1a94ee81e79daa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 22:16:32 +0700
Subject: [PATCH 0764/3482] qmltermwidget: fix ftbfs

---
 srcpkgs/qmltermwidget/patches/iswspace.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/qmltermwidget/patches/iswspace.patch

diff --git a/srcpkgs/qmltermwidget/patches/iswspace.patch b/srcpkgs/qmltermwidget/patches/iswspace.patch
new file mode 100644
index 000000000000..89695c53b529
--- /dev/null
+++ b/srcpkgs/qmltermwidget/patches/iswspace.patch
@@ -0,0 +1,13 @@
+Index: lib/TerminalCharacterDecoder.cpp
+===================================================================
+--- lib/TerminalCharacterDecoder.cpp.orig
++++ lib/TerminalCharacterDecoder.cpp
+@@ -22,6 +22,8 @@
+ // Own
+ #include "TerminalCharacterDecoder.h"
+ 
++#include <cwctype>
++
+ // Qt
+ #include <QTextStream>
+ 

From 854ed7af20e246daf794857980f8e217b8e3f47f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 30 Jan 2021 19:00:04 +0100
Subject: [PATCH 0765/3482] qmltermwidget: enable cross

There is no problem with wrong install paths (anymore).
---
 srcpkgs/qmltermwidget/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/qmltermwidget/template b/srcpkgs/qmltermwidget/template
index 734f812435f5..60de10dfef87 100644
--- a/srcpkgs/qmltermwidget/template
+++ b/srcpkgs/qmltermwidget/template
@@ -11,5 +11,3 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/Swordfish90/qmltermwidget"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=23e19eedb59d6fe3e37ecc06872f54befd94384946926e009c42c4b39914cfe2
-nocross=yes
-# some things do get wrongly installed into $DESTDOR/$XBPS_CROSS_BASE

From 9547bb18ef8efae6c97bf5cd0046e4c1195be519 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 30 Jan 2021 19:39:42 +0100
Subject: [PATCH 0766/3482] linux5.10: fix dcn30 ppc64 patch on musl

since musl uses 64-bit ldbl, this will trigger the soft vs hard
float linker nonsense, so apply the same hack as for renoir
---
 .../patches/amdgpu-dcn30-ppc64.patch          | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch b/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch
index a72cdfea781d..6f5688d7530f 100644
--- a/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch
+++ b/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch
@@ -1,12 +1,13 @@
-From 3a75ebe236580073d77ad69730fc1d8980e130c2 Mon Sep 17 00:00:00 2001
+From 295ba06fc80af54595c604ca6bab5f3e9c9ef154 Mon Sep 17 00:00:00 2001
 From: Daniel Kolesa <daniel@octaforge.org>
 Date: Fri, 29 Jan 2021 22:25:29 +0100
 Subject: [PATCH] amd/display: enable dcn30 for ppc64
 
 ---
- drivers/gpu/drm/amd/display/Kconfig           | 2 +-
- drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
+ drivers/gpu/drm/amd/display/Kconfig             |  2 +-
+ drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 10 ++++++++++
+ drivers/gpu/drm/amd/display/dc/dcn30/Makefile   |  2 ++
+ 3 files changed, 13 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig
 index 3c410d2..a749cc7 100644
@@ -21,6 +22,27 @@ index 3c410d2..a749cc7 100644
          depends on DRM_AMD_DC_DCN
          help
              Choose this option if you want to have
+diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile b/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile
+index 52b1ce7..adf3919 100644
+--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile
++++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile
+@@ -114,6 +114,16 @@ ifdef CONFIG_DRM_AMD_DC_DCN3_0
+ ###############################################################################
+ CLK_MGR_DCN30 = dcn30_clk_mgr.o dcn30_clk_mgr_smu_msg.o
+ 
++# see above
++# technically it should not matter that this file is soft-float since all it
++# does is read doubles from a struct and write them somewhere else; this is not
++# passing between hard-float and soft-float APIs via registers (which would be
++# problematic because of different calling convention), and the memory layout
++# is always the same (IEEE double precision) so the error is probably harmless
++ifdef CONFIG_PPC64
++CFLAGS_$(AMDDALPATH)/dc/clk_mgr/dcn30/dcn30_clk_mgr.o := $(call cc-option,-mno-gnu-attribute)
++endif
++
+ AMD_DAL_CLK_MGR_DCN30 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn30/,$(CLK_MGR_DCN30))
+ 
+ AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN30)
 diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/Makefile b/drivers/gpu/drm/amd/display/dc/dcn30/Makefile
 index bd2a068..248c271 100644
 --- a/drivers/gpu/drm/amd/display/dc/dcn30/Makefile

From 2d56c40d8fa2659087b76194c5d50254804c3773 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 08:34:46 +0100
Subject: [PATCH 0767/3482] librpcsecgss: remove package

broke with glibc-2.32
does not compile with libtirpc
---
 common/shlibs                     |  1 -
 srcpkgs/librpcsecgss-devel        |  1 -
 srcpkgs/librpcsecgss/template     | 32 -------------------------------
 srcpkgs/removed-packages/template |  2 ++
 4 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 120000 srcpkgs/librpcsecgss-devel
 delete mode 100644 srcpkgs/librpcsecgss/template

diff --git a/common/shlibs b/common/shlibs
index 75075c2d2599..2f298ff9ad30 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1033,7 +1033,6 @@ libobt.so.2 libopenbox-3.5.2_1
 libobrender.so.32 libopenbox-3.6.1_1
 libgssglue.so.1 libgssglue-0.3_1
 libtirpc.so.3 libtirpc-1.0.2_1
-librpcsecgss.so.3 librpcsecgss-0.19_1
 libnfsidmap.so.1 libnfsidmap-2.4.3_2
 libbind9.so.1600 bind-libs-9.16.2_1
 libdns.so.1607 bind-libs-9.16.7_1
diff --git a/srcpkgs/librpcsecgss-devel b/srcpkgs/librpcsecgss-devel
deleted file mode 120000
index 328b419146d3..000000000000
--- a/srcpkgs/librpcsecgss-devel
+++ /dev/null
@@ -1 +0,0 @@
-librpcsecgss
\ No newline at end of file
diff --git a/srcpkgs/librpcsecgss/template b/srcpkgs/librpcsecgss/template
deleted file mode 100644
index d20446cb3ce5..000000000000
--- a/srcpkgs/librpcsecgss/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'librpcsecgss'
-pkgname=librpcsecgss
-version=0.19
-revision=5
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libgssglue-devel"
-short_desc="Library for RPCSECGSS support"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="http://www.citi.umich.edu/projects/nfsv4/linux/"
-distfiles="$homepage/$pkgname/$pkgname-$version.tar.gz"
-checksum=0cafb86b67e5eb4c89e8abaaad9165298946bc164d258e8925fc6dc1fa913abd
-
-case "$XBPS_TARGET_LIBC" in
-	musl) broken="rpc/rpc.h header is not available on musl"
-esac
-
-post_install() {
-	vlicense COPYING
-}
-
-librpcsecgss-devel_package() {
-	depends="libgssglue-devel ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 30b4ac8b2bd6..0a16d53a3c05 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -140,6 +140,8 @@ replaces="
  libdbusmenu-qt<=0.9.2_4
  libgksu<=2.0.12_5
  libqzeitgeist<=0.8.0_6
+ librpcsecgss<=0.19_6
+ librpcsecgss-devel<=0.19_6
  livewallpaper<=0.5.0_2
  llvm3.9<=3.9.1_5
  ls++-git<=20140919_3

From 794bcb40c16bbcef39e855da61a8373d26609e21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 20:10:08 +0100
Subject: [PATCH 0768/3482] rtmpdump: add gnutls build_option

rtmpdump doesn't build with OpenSSL-1.1
---
 srcpkgs/rtmpdump/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index eeeff44012ed..f98160d7f186 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -4,7 +4,7 @@ version=2.4.20161210
 revision=8
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"
@@ -17,8 +17,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+=" -D__LINUX_NETFILTER_H"
 esac
 
+build_options="gnutls"
+
 do_build() {
-	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" ${makejobs}
+	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}
 }
 do_install() {
 	vmkdir usr/lib

From 7c8f4c06e671ee475ee723be6a54edfe9ef98ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 30 Jan 2021 22:42:19 +0100
Subject: [PATCH 0769/3482] openbazaar: fix ftbfs

Move binaries to usr/lib/openbazaar and create symlinks in usr/bin
---
 srcpkgs/openbazaar/template | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/openbazaar/template b/srcpkgs/openbazaar/template
index 79df50f88fa4..00103d221bf6 100644
--- a/srcpkgs/openbazaar/template
+++ b/srcpkgs/openbazaar/template
@@ -1,32 +1,42 @@
 # Template file for 'openbazaar'
 pkgname=openbazaar
 version=1.1.13
-revision=1
+revision=2
+archs="i686 x86_64"
 build_style=fetch
+depends="nodejs"
 short_desc="P2P Distributed marketplace"
 maintainer="ananteris <ananteris@protonmail.ch>"
-archs="i686 x86_64"
-depends="nodejs"
 license="MIT"
-nostrip=yes
 homepage="http://openbazaar.org"
+python_version=3
+nostrip=yes
 repository="nonfree"
 
-if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ];then
-	_debarch=amd64
-	checksum=34118eecedd15d89052b8cc6d08fb789adba5788d43019ea5c89e52f1f07064a
-else
-	_debarch=i386
-	checksum=87c73589aebdb78455e69fe1ccc058440d0ae662404e9ef7d4988e6c574e2add
-fi
+case "${XBPS_TARGET_MACHINE}" in
+	x86_64) _debarch=amd64
+		checksum=34118eecedd15d89052b8cc6d08fb789adba5788d43019ea5c89e52f1f07064a
+		;;
+	i686)	_debarch=i386
+		checksum=87c73589aebdb78455e69fe1ccc058440d0ae662404e9ef7d4988e6c574e2add
+		;;
+esac
 
 distfiles="https://github.com/OpenBazaar/OpenBazaar-Installer/releases/download/v${version}/${pkgname}_${version}_${_debarch}.deb"
 
 do_install() {
 	ar p ${pkgname}_${version}_${_debarch}.deb data.tar.xz | bsdtar xvf - -C ${DESTDIR}
 	vlicense ${DESTDIR}/usr/share/openbazaar/LICENSE
-	vbin ${DESTDIR}/usr/share/openbazaar/resources/OpenBazaar-Server/openbazaard
-	vconf ${DESTDIR}/usr/share/openbazaar/resources/OpenBazaar-Server/ob.cfg
+	vmkdir usr/lib/openbazaar/resources
+	mv -v ${DESTDIR}/usr/share/openbazaar/resources/OpenBazaar-Server \
+		${DESTDIR}/usr/lib/openbazaar/resources
+	ln -frsv ${DESTDIR}/usr/lib/openbazaar/resources/OpenBazaar-Server/openbazaard \
+		${DESTDIR}/usr/bin/
+	vconf ${DESTDIR}/usr/lib/openbazaar/resources/OpenBazaar-Server/ob.cfg
+	mv -v ${DESTDIR}/usr/share/openbazaar/openbazaar \
+		${DESTDIR}/usr/lib/openbazaar
+	ln -frsv ${DESTDIR}/usr/lib/openbazaar/openbazaar \
+		${DESTDIR}/usr/bin/
 	vdoc ${FILESDIR}/void_service.EXAMPLE
 
 	find ${DESTDIR}/usr/share/openbazaar -iname "*.so" -print0 | while read -d "" lib; do

From 375b91ebcd65e793113fc235506b1b2366311e8c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 30 Jan 2021 17:54:15 -0500
Subject: [PATCH 0770/3482] python-pip: split package

New package: python3-pip-21.0.1
---
 srcpkgs/python-pip/template                   | 20 ++++------------
 srcpkgs/python-pip/update                     |  3 ++-
 srcpkgs/python3-pip                           |  1 -
 .../patches/no-versioned-pip.patch            | 13 +++++++++++
 srcpkgs/python3-pip/template                  | 23 +++++++++++++++++++
 5 files changed, 43 insertions(+), 17 deletions(-)
 delete mode 120000 srcpkgs/python3-pip
 create mode 100644 srcpkgs/python3-pip/patches/no-versioned-pip.patch
 create mode 100644 srcpkgs/python3-pip/template

diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
index 1fd9fce6e692..096aa7b63b22 100644
--- a/srcpkgs/python-pip/template
+++ b/srcpkgs/python-pip/template
@@ -1,10 +1,10 @@
 # Template file for 'python-pip'
 pkgname=python-pip
-version=20.3.3
+version=20.3.4
 revision=1
 wrksrc="pip-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-setuptools"
 short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
@@ -12,19 +12,9 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=79c1ac8a9dccbec8752761cb5a2df833224263ca661477a2a9ed03ddf4e0e3ba
+checksum=6773934e5f5fc3eaa8c5a44949b5b924fc122daa0a8aa9f80c835b4ca2a543fc
 
 post_install() {
 	vlicense LICENSE.txt
-}
-
-python3-pip_package() {
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/pip3
-		mv ${PKGDESTDIR}/usr/bin/pip{3,}
-		vmove ${py3_lib}
-		vlicense LICENSE.txt
-	}
+	mv ${DESTDIR}/usr/bin/pip{,2}
 }
diff --git a/srcpkgs/python-pip/update b/srcpkgs/python-pip/update
index 724819677ce2..88ebcc780cfc 100644
--- a/srcpkgs/python-pip/update
+++ b/srcpkgs/python-pip/update
@@ -1 +1,2 @@
-pattern='pip-\K[0-9.]+(?=.tar.gz)'
+# Support for Python 2 was dropped in pip >= 21
+pattern='pip-\K20\.[0-9.]+(?=.tar.gz)'
diff --git a/srcpkgs/python3-pip b/srcpkgs/python3-pip
deleted file mode 120000
index 9de2412ef674..000000000000
--- a/srcpkgs/python3-pip
+++ /dev/null
@@ -1 +0,0 @@
-python-pip
\ No newline at end of file
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
new file mode 100644
index 000000000000..b3a50bb2c138
--- /dev/null
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -0,0 +1,13 @@
+--- setup.py.orig	2021-01-30 17:47:39.874134606 -0500
++++ setup.py	2021-01-30 17:47:54.435139352 -0500
+@@ -74,10 +74,6 @@
+     entry_points={
+         "console_scripts": [
+             "pip=pip._internal.cli.main:main",
+-            "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
+-            "pip{}.{}=pip._internal.cli.main:main".format(
+-                *sys.version_info[:2]
+-            ),
+         ],
+     },
+ 
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
new file mode 100644
index 000000000000..d0a3a1d7516a
--- /dev/null
+++ b/srcpkgs/python3-pip/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pip'
+pkgname=python3-pip
+version=21.0.1
+revision=1
+wrksrc="pip-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="PyPA recommended tool for installing PyPI packages (Python3)"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="MIT"
+homepage="https://pip.pypa.io/"
+changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
+distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
+checksum=99bbde183ec5ec037318e774b0d8ae0a64352fe53b2c7fd630be1d07e94f41e5
+
+do_check() {
+	: tests have unpackaged dependencies
+}
+
+post_install() {
+	vlicense LICENSE.txt
+}

From c317e042ba4f11dc3ad174ff30332da8a6eeb9b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 22:37:03 -0300
Subject: [PATCH 0771/3482] hooktftp: remove bzr from hostmakedepends.

Build system doesn't use it.
---
 srcpkgs/hooktftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template
index e1e669154b4f..2cba14aec605 100644
--- a/srcpkgs/hooktftp/template
+++ b/srcpkgs/hooktftp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=go
 go_import_path="github.com/tftp-go-team/hooktftp"
 go_package="github.com/tftp-go-team/hooktftp/cmd/hooktftp"
-hostmakedepends="bzr git"
+hostmakedepends="git"
 short_desc="Hook based tftp server"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 19c8629877795d3215219cb6e7cc7efa2576396e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 22:35:05 -0300
Subject: [PATCH 0772/3482] brz: remove package.

No longer works with python 2.7. Has been replaced by breezy on all
distros.
---
 srcpkgs/bzr/template              | 19 -------------------
 srcpkgs/bzr/update                |  1 -
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 srcpkgs/bzr/template
 delete mode 100644 srcpkgs/bzr/update

diff --git a/srcpkgs/bzr/template b/srcpkgs/bzr/template
deleted file mode 100644
index 72ac30eae6e9..000000000000
--- a/srcpkgs/bzr/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'bzr'
-pkgname=bzr
-version=2.7.0
-revision=1
-build_style=python2-module
-hostmakedepends="python-Cython"
-makedepends="zlib-devel python-devel"
-depends="ca-certificates"
-pycompile_module="bzrlib"
-short_desc="Distributed version control system that Just Works"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://bazaar.canonical.com"
-distfiles="http://launchpad.net/bzr/${version%.*}/$version/+download/bzr-$version.tar.gz"
-checksum=0d451227b705a0dd21d8408353fe7e44d3a5069e6c4c26e5f146f1314b8fdab3
-
-pre_install() {
-	sed -i -e "s|man/man1|share/man/man1|" setup.py
-}
diff --git a/srcpkgs/bzr/update b/srcpkgs/bzr/update
deleted file mode 100644
index e9b0a0a5ea4c..000000000000
--- a/srcpkgs/bzr/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b*"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0a16d53a3c05..5f5bfe1dd9f4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -14,6 +14,7 @@ replaces="
  arm-mem-git<=20131108_2
  arptables<=0.0.4_3
  bokken<=1.8_3
+ bzr<=2.7.0_1
  caja-gksu<=1.20.2_2
  california<=0.4.0_4
  couchdb<=1.7.1_2

From e48983e43dc574b132afc078b660230238cbc02e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 22:36:25 -0300
Subject: [PATCH 0773/3482] bzrtools: remove package.

bzr no longer works.
---
 srcpkgs/bzrtools/template         | 15 ---------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 srcpkgs/bzrtools/template

diff --git a/srcpkgs/bzrtools/template b/srcpkgs/bzrtools/template
deleted file mode 100644
index 05492b1b5e29..000000000000
--- a/srcpkgs/bzrtools/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'bzrtools'
-pkgname=bzrtools
-version=2.6.0
-revision=4
-wrksrc=bzrtools
-build_style=python2-module
-hostmakedepends="python"
-makedepends="python bzr"
-depends="${makedepends}"
-short_desc="Plugin providing a collection of utilities for bzr"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://bazaar-vcs.org/BzrTools"
-distfiles="http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz"
-checksum=8b17fbba61dafc8dbefe1917a2ce084a8adc7650dee60add340615270dfb7f58
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5f5bfe1dd9f4..b8a4e651ac83 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -15,6 +15,7 @@ replaces="
  arptables<=0.0.4_3
  bokken<=1.8_3
  bzr<=2.7.0_1
+ bzrtools<=2.6.0_4
  caja-gksu<=1.20.2_2
  california<=0.4.0_4
  couchdb<=1.7.1_2

From fb720c4b790d43feeace886b16ba9d12d539bd60 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 22:44:17 +0200
Subject: [PATCH 0774/3482] scribus: update to 1.5.5.

---
 srcpkgs/scribus/patches/fix-musl.patch | 31 +++++++++++++++++---------
 srcpkgs/scribus/template               | 22 ++++++++----------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/scribus/patches/fix-musl.patch b/srcpkgs/scribus/patches/fix-musl.patch
index 6df9a2da2b45..36bb71e62a91 100644
--- a/srcpkgs/scribus/patches/fix-musl.patch
+++ b/srcpkgs/scribus/patches/fix-musl.patch
@@ -1,20 +1,31 @@
---- scribus/util.cpp.orig	2016-01-11 15:35:18.171968184 +0100
-+++ scribus/util.cpp	2016-01-11 15:35:53.600967308 +0100
-@@ -37,7 +37,7 @@ for which a new license (GPL+exception)
+--- scribus/util.cpp	2019-07-31 00:35:04.000000000 +0200
++++ -	2019-09-17 22:29:18.301884583 +0200
+@@ -40,7 +40,7 @@
  
- #include <signal.h>
+ #include <csignal>
  
--#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU) 
-+#ifdef __GLIBC__
+-#if !defined(_WIN32) && !defined(Q_OS_MAC) 
++#if defined(__GLIBC__)
  #include <execinfo.h>
  #include <cxxabi.h>
  #endif
-@@ -947,7 +947,7 @@ void getDashArray(int dashtype, double l
+--- scribus/util_debug.cpp	2019-07-31 00:35:07.000000000 +0200
++++ -	2019-09-17 22:30:10.159216480 +0200
+@@ -24,7 +24,7 @@
+ #include <QDateTime>
+ #include <QtGlobal>
+ 
+-#if !defined(_WIN32) && !defined(Q_OS_MAC)
++#if defined(__GLIBC__)
+ #include <execinfo.h>
+ #include <cxxabi.h>
+ #endif
+@@ -54,7 +54,7 @@
   */
  void printBacktrace ( int nFrames )
  {
--#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_OPENBSD)  && !defined(Q_OS_FREEBSD) && !defined(Q_OS_HAIKU)
-+#ifdef __GLIBC__
+-#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_FREEBSD)
++#if defined(__GLIBC__)
  	void ** trace = new void*[nFrames + 1];
- 	char **messages = ( char ** ) NULL;
+ 	char **messages = ( char ** ) nullptr;
  	int i, trace_size = 0;
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index c96ce332eb3f..868ec55590fa 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,26 +1,22 @@
 # Template file for 'scribus'
 pkgname=scribus
-version=1.4.8
+version=1.5.6.1
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config qt-devel"
-makedepends="qt-devel zlib-devel cairo-devel lcms2-devel cups-devel libxml2-devel
- hyphen-devel ghostscript-devel boost-devel python-devel"
+configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3"
+makedepends="qt5-devel qt5-tools-devel zlib-devel cairo-devel lcms2-devel
+ cups-devel libxml2-devel hyphen-devel ghostscript-devel boost-devel
+ hunspell-devel poppler-cpp-devel python3-devel harfbuzz-devel"
 depends="ghostscript"
 short_desc="Open Source DTP (Desktop Publishing) application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://scribus.net"
-distfiles="$SOURCEFORGE_SITE/scribus/scribus/${version}/scribus-${version}.tar.xz"
-checksum=22253bb5994023f39608b37c57c7cd0280059fd97d2a4d71d4011aeeeb18042f
-python_version=2 #unverified
+distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz"
+checksum=d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab
+python_version=3
 
-nocross="https://travis-ci.org/void-linux/void-packages/jobs/504239118"
-
-pre_configure() {
-	sed -i 's#^Icon=scribus#^Icon=/usr/share/scribus/icons/scribus.png#' scribus.desktop
-}
 post_install() {
-	vinstall scribus.desktop 644 usr/share/applications
 	rm -rf ${DESTDIR}/usr/include
 }

From 0d44722459dc3c5bfb145c13c41f76760ad793d0 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 24 Jan 2021 23:13:06 +0300
Subject: [PATCH 0775/3482] snapper: update to 0.8.15

---
 .../patches/0001-disable-locale-tests.patch   |  31 ++++
 .../snapper/patches/0001-musl-sterror_r.patch |  26 ---
 .../0002-backport-equal-date-test.patch       | 164 ++++++++++++++++++
 .../snapper/patches/0002-musl-mktime.patch    |  26 ---
 .../0003-backport-fix-jsonc-linkage.patch     |  19 ++
 .../patches/0004-musl-stdout_stderr.patch     |  26 ---
 srcpkgs/snapper/patches/musl_u_int-type.patch |  27 ---
 srcpkgs/snapper/template                      |  22 +--
 8 files changed, 223 insertions(+), 118 deletions(-)
 create mode 100644 srcpkgs/snapper/patches/0001-disable-locale-tests.patch
 delete mode 100644 srcpkgs/snapper/patches/0001-musl-sterror_r.patch
 create mode 100644 srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
 delete mode 100644 srcpkgs/snapper/patches/0002-musl-mktime.patch
 create mode 100644 srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch
 delete mode 100644 srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
 delete mode 100644 srcpkgs/snapper/patches/musl_u_int-type.patch

diff --git a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch
new file mode 100644
index 000000000000..05e589dbfc5d
--- /dev/null
+++ b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch
@@ -0,0 +1,31 @@
+These 4 tests fail with error:
+std::runtime_error: locale::facet::_S_create_c_locale name not valid
+
+diff --git testsuite/Makefile.am testsuite/Makefile.am
+index d7e30b8..001f834 100644
+--- testsuite/Makefile.am
++++ testsuite/Makefile.am
+@@ -7,8 +7,8 @@ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
+ LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
+ 
+ check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test 		\
+-	equal-date.test dbus-escape.test cmp-lt.test humanstring.test 		\
+-	table.test table-formatter.test csv-formatter.test json-formatter.test	\
++	equal-date.test dbus-escape.test 		\
++	csv-formatter.test json-formatter.test	\
+ 	getopts.test
+ 
+ if ENABLE_BTRFS_QUOTA
+@@ -27,12 +27,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) sysconfig-get1.txt sysconfig-set1.txt
+ 
+ equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+ 
+-humanstring_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+-
+-table_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+-
+-table_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+-
+ csv_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+ 
+ json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la $(JSONC_LIBS)
diff --git a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch b/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
deleted file mode 100644
index 3bd9be5872e0..000000000000
--- a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a4068f03b471777151c4eb43fc70c3b6ebf8df3a Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:23:38 -0600
-Subject: [PATCH 1/4] musl-sterror_r
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 553065c..2897276 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -223,7 +223,7 @@ namespace snapper
-     string
-     stringerror(int errnum)
-     {
--#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE
-+#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE || MUSL_LIBC
- 	char buf1[100];
- 	if (strerror_r(errnum, buf1, sizeof(buf1) - 1) == 0)
- 	    return string(buf1);
--- 
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch b/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
new file mode 100644
index 000000000000..688ab7e1f27d
--- /dev/null
+++ b/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
@@ -0,0 +1,164 @@
+diff --git package/snapper.changes package/snapper.changes
+index 9235de3..5570cf1 100644
+--- package/snapper.changes
++++ package/snapper.changes
+@@ -1,3 +1,8 @@
++-------------------------------------------------------------------
++Mon Jan 25 11:29:45 CET 2021 - aschnell@suse.com
++
++- fixed testsuite for equal-date (gh#openSUSE/snapper#526)
++
+ -------------------------------------------------------------------
+ Thu Dec 17 12:20:59 CET 2020 - aschnell@suse.com
+ 
+diff --git testsuite/Makefile.am testsuite/Makefile.am
+index d7e30b8..cfd1002 100644
+--- testsuite/Makefile.am
++++ testsuite/Makefile.am
+@@ -9,7 +9,7 @@ LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
+ check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test 		\
+ 	equal-date.test dbus-escape.test 		\
+ 	csv-formatter.test json-formatter.test	\
+-	getopts.test
++	getopts.test scan-datetime.test
+ 
+ if ENABLE_BTRFS_QUOTA
+ check_PROGRAMS += qgroup1.test
+@@ -27,6 +27,8 @@ EXTRA_DIST = $(noinst_SCRIPTS) sysconfig-get1.txt sysconfig-set1.txt
+ 
+ equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+ 
++scan_datetime_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
++
+ csv_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+
+ json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la $(JSONC_LIBS)
+diff --git testsuite/equal-date.cc testsuite/equal-date.cc
+index 42e00d8..8d8eda8 100644
+--- testsuite/equal-date.cc
++++ testsuite/equal-date.cc
+@@ -5,18 +5,25 @@
+ #include <boost/test/unit_test.hpp>
+ 
+ #include "../client/utils/equal-date.h"
++#include "../snapper/AppUtil.h"
++
++using namespace snapper;
+ 
+ 
+ bool
+ equal_week(const char* s1, const char* s2)
+ {
++    // use interim time_t since strptime on musl does not set tm_yday
++
++    time_t t1 = scan_datetime(s1, true);
+     struct tm tmp1;
+     memset(&tmp1, 0, sizeof(tmp1));
+-    strptime(s1, "%Y-%m-%d", &tmp1);
++    gmtime_r(&t1, &tmp1);
+ 
++    time_t t2 = scan_datetime(s2, true);
+     struct tm tmp2;
+     memset(&tmp2, 0, sizeof(tmp2));
+-    strptime(s2, "%Y-%m-%d", &tmp2);
++    gmtime_r(&t2, &tmp2);
+ 
+     return equal_week(tmp1, tmp2);
+ }
+@@ -25,46 +32,46 @@ equal_week(const char* s1, const char* s2)
+ BOOST_AUTO_TEST_CASE(test1)
+ {
+     // 2012 is a leap year
+-    BOOST_CHECK(equal_week("2011-12-31", "2012-01-01"));
+-    BOOST_CHECK(equal_week("2012-01-01", "2011-12-31"));
++    BOOST_CHECK(equal_week("2011-12-31 00:00:00", "2012-01-01 00:00:00"));
++    BOOST_CHECK(equal_week("2012-01-01 00:00:00", "2011-12-31 00:00:00"));
+ }
+ 
+ 
+ BOOST_AUTO_TEST_CASE(test2)
+ {
+     // 2012 is a leap year
+-    BOOST_CHECK(equal_week("2012-12-31", "2013-01-01"));
+-    BOOST_CHECK(equal_week("2013-01-01", "2012-12-31"));
++    BOOST_CHECK(equal_week("2012-12-31 00:00:00", "2013-01-01 00:00:00"));
++    BOOST_CHECK(equal_week("2013-01-01 00:00:00", "2012-12-31 00:00:00"));
+ }
+ 
+ 
+ BOOST_AUTO_TEST_CASE(test3)
+ {
+     // Saturday and Sunday
+-    BOOST_CHECK(equal_week("2014-01-04", "2014-01-05"));
+-    BOOST_CHECK(equal_week("2014-01-05", "2014-01-04"));
++    BOOST_CHECK(equal_week("2014-01-04 00:00:00", "2014-01-05 00:00:00"));
++    BOOST_CHECK(equal_week("2014-01-05 00:00:00", "2014-01-04 00:00:00"));
+ 
+     // Sunday and Monday
+-    BOOST_CHECK(!equal_week("2014-01-05", "2014-01-06"));
+-    BOOST_CHECK(!equal_week("2014-01-06", "2014-01-05"));
++    BOOST_CHECK(!equal_week("2014-01-05 00:00:00", "2014-01-06 00:00:00"));
++    BOOST_CHECK(!equal_week("2014-01-06 00:00:00", "2014-01-05 00:00:00"));
+ 
+     // Monday and Tuesday
+-    BOOST_CHECK(equal_week("2014-01-06", "2014-01-07"));
+-    BOOST_CHECK(equal_week("2014-01-07", "2014-01-06"));
++    BOOST_CHECK(equal_week("2014-01-06 00:00:00", "2014-01-07 00:00:00"));
++    BOOST_CHECK(equal_week("2014-01-07 00:00:00", "2014-01-06 00:00:00"));
+ }
+ 
+ 
+ BOOST_AUTO_TEST_CASE(test4)
+ {
+     // 2014-12-31 is a Wednesday, 2015-01-01 is a Thursday
+-    BOOST_CHECK(equal_week("2014-12-31", "2015-01-01"));
+-    BOOST_CHECK(equal_week("2015-01-01", "2014-12-31"));
++    BOOST_CHECK(equal_week("2014-12-31 00:00:00", "2015-01-01 00:00:00"));
++    BOOST_CHECK(equal_week("2015-01-01 00:00:00", "2014-12-31 00:00:00"));
+ }
+ 
+ 
+ BOOST_AUTO_TEST_CASE(test5)
+ {
+     // 2017-12-31 is a Sunday, 2018-01-01 is a Monday
+-    BOOST_CHECK(!equal_week("2017-12-31", "2018-01-01"));
+-    BOOST_CHECK(!equal_week("2018-01-01", "2017-12-31"));
++    BOOST_CHECK(!equal_week("2017-12-31 00:00:00", "2018-01-01 00:00:00"));
++    BOOST_CHECK(!equal_week("2018-01-01 00:00:00", "2017-12-31 00:00:00"));
+ }
+diff --git testsuite/scan-datetime.cc testsuite/scan-datetime.cc
+new file mode 100644
+index 0000000..8f0d1c0
+--- /dev/null
++++ testsuite/scan-datetime.cc
+@@ -0,0 +1,30 @@
++
++#define BOOST_TEST_DYN_LINK
++#define BOOST_TEST_MODULE snapper
++
++#include <boost/test/unit_test.hpp>
++
++#include "../snapper/AppUtil.h"
++
++using namespace snapper;
++
++
++BOOST_AUTO_TEST_CASE(test1)
++{
++    time_t t1 = scan_datetime("2020-03-04 12:34:56", true);
++
++    struct tm tmp1;
++    memset(&tmp1, 0, sizeof(tmp1));
++    gmtime_r(&t1, &tmp1);
++
++    BOOST_CHECK_EQUAL(tmp1.tm_year, 2020 - 1900);
++    BOOST_CHECK_EQUAL(tmp1.tm_mon, 3 - 1);
++    BOOST_CHECK_EQUAL(tmp1.tm_mday, 4);
++
++    BOOST_CHECK_EQUAL(tmp1.tm_yday, 31 + 28 + 4);
++    BOOST_CHECK_EQUAL(tmp1.tm_wday, 3);
++
++    BOOST_CHECK_EQUAL(tmp1.tm_hour, 12);
++    BOOST_CHECK_EQUAL(tmp1.tm_min, 34);
++    BOOST_CHECK_EQUAL(tmp1.tm_sec, 56);
++}
diff --git a/srcpkgs/snapper/patches/0002-musl-mktime.patch b/srcpkgs/snapper/patches/0002-musl-mktime.patch
deleted file mode 100644
index 25850a519a37..000000000000
--- a/srcpkgs/snapper/patches/0002-musl-mktime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6385e34fb13dbfabd0b4b93f7670eac0c490637f Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:24:08 -0600
-Subject: [PATCH 2/4] musl-mktime
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 2897276..64812d7 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -288,7 +288,7 @@ namespace snapper
- 	const char* p = strptime(str.c_str(), "%F %T", &s);
- 	if (!p || *p != '\0')
- 	    return (time_t)(-1);
--	return utc ? timegm(&s) : timelocal(&s);
-+	return utc ? timegm(&s) : mktime(&s);
-     }
- 
- 
--- 
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch b/srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch
new file mode 100644
index 000000000000..2582dfb1d87c
--- /dev/null
+++ b/srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch
@@ -0,0 +1,19 @@
+This patch fixes the issue, that the build doesn't link against json-c
+when --disable-zypp flag is enabled.
+See openSUSE/snapper#617
+
+diff --git configure.ac configure.ac
+index 839d012..06e4721 100644
+--- configure.ac
++++ configure.ac
+@@ -194,9 +194,7 @@ fi
+ 
+ PKG_CHECK_MODULES(DBUS, dbus-1)
+ PKG_CHECK_MODULES(XML2, libxml-2.0)
+-if test "x$with_zypp" = "xyes"; then
+-   PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])])
+-fi
++PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])])
+ 
+ AC_CHECK_HEADER(acl/libacl.h,[],[AC_MSG_ERROR([Cannout find libacl headers. Please install libacl-devel])])
+ 
diff --git a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch b/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
deleted file mode 100644
index 0524aa1c0fb3..000000000000
--- a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d519c3c94a029d6891b0703ce5adb6ea0ac8b9fa Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:27:17 -0600
-Subject: [PATCH 4/4] musl-stdout_stderr
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/SystemCmd.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/snapper/SystemCmd.h b/snapper/SystemCmd.h
-index 3d38604..72bbb2b 100644
---- snapper/SystemCmd.h
-+++ snapper/SystemCmd.h
-@@ -32,6 +32,8 @@
- #include <list>
- #include <boost/noncopyable.hpp>
- 
-+#undef stdout
-+#undef stderr
- 
- namespace snapper
- {
--- 
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/musl_u_int-type.patch b/srcpkgs/snapper/patches/musl_u_int-type.patch
deleted file mode 100644
index 66cb63b2f122..000000000000
--- a/srcpkgs/snapper/patches/musl_u_int-type.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7ddd58ee5e6b7c3a8df3086ff5a6d17d19362761 Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:35:55 -0600
-Subject: [PATCH] musl-_u_int-types
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- client/utils/JsonFormatter.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git client/utils/JsonFormatter.h client/utils/JsonFormatter.h
-index 79f7672..501b77d 100644
---- client/utils/JsonFormatter.h
-+++ client/utils/JsonFormatter.h
-@@ -25,6 +25,9 @@
- #include <string>
- #include <vector>
- #include <utility>
-+#ifndef __GLIBC__
-+#include <sys/types.h>
-+#endif
- 
- namespace snapper
- {
--- 
-2.24.1
-
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index 292cfed6a190..481f94c13c5e 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,32 +1,30 @@
 # Template file for 'snapper'
 pkgname=snapper
-version=0.8.14
-revision=2
+version=0.8.15
+revision=1
 build_style=gnu-configure
-configure_args="--disable-zypp --with-conf=/etc/conf.d"
+configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
 conf_files="/etc/conf.d/snapper"
 make_dirs="/etc/snapper/configs 0755 root root"
 hostmakedepends="automake docbook-xsl libtool libxml2-devel libxslt
  gettext pkg-config"
 makedepends="acl-devel boost-devel dbus-devel e2fsprogs-devel libbtrfs-devel
- libmount-devel libxml2-devel pam-devel"
+ libmount-devel libxml2-devel pam-devel ncurses-devel ncurses-libtinfo-devel
+ json-c-devel"
 depends="dbus"
 short_desc="Tool for Linux filesystem snapshot management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://snapper.io"
 distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz"
-checksum=d3abe4d542dade06b361e7c89b5de03bb5202853bc5e314ca74080caa24923f6
+checksum=fe0e32912275713f8fad17dbe510f32dbba8526365a849e3f7d6c786d43cfca2
 lib32disabled=yes
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)	# We define MUSL_LIBC to pick the correct return type
-		# for strerror_r(2) which is int (XSI-compliant)
-		CXXFLAGS="-DMUSL_LIBC=1"
-		# We also link against libintl
+if [ "$XBPS_TARGET_LIBC" = musl ]
+then
 		makedepends+=" gettext-devel"
 		LDFLAGS="-lintl"
-esac
+fi
 
 pre_configure() {
 	# rename cron scripts
@@ -43,8 +41,6 @@ pre_configure() {
 post_install() {
 	vinstall data/sysconfig.snapper 644 etc/conf.d snapper
 	vsv snapperd
-
-	rm -rf -- "${DESTDIR}"/usr/lib/systemd
 }
 
 libsnapper_package() {

From 13a7d1d5ea305d0e578490a08a2eda1fdd15e214 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 15:59:57 +0100
Subject: [PATCH 0776/3482] libdatrie: update to 0.2.13

Closes: #28331 [via git-merge-pr]
---
 srcpkgs/libdatrie/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdatrie/template b/srcpkgs/libdatrie/template
index 56fae586b9c1..c5e846fae99a 100644
--- a/srcpkgs/libdatrie/template
+++ b/srcpkgs/libdatrie/template
@@ -1,6 +1,6 @@
 # Template file for 'libdatrie'
 pkgname=libdatrie
-version=0.2.12
+version=0.2.13
 revision=1
 build_style=gnu-configure
 short_desc="Implementation of double-array structure for representing trie"
@@ -8,7 +8,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="LGPL-2.1-or-later"
 homepage="https://linux.thai.net/projects/datrie"
 distfiles="https://linux.thai.net/pub/ThaiLinux/software/libthai/libdatrie-${version}.tar.xz"
-checksum=452dcc4d3a96c01f80f7c291b42be11863cd1554ff78b93e110becce6e00b149
+checksum=12231bb2be2581a7f0fb9904092d24b0ed2a271a16835071ed97bed65267f4be
 
 libdatrie-devel_package() {
 	short_desc+=" - development files"

From 42d058e8701c3154dfe3f02297db84f60a42764e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 30 Jan 2021 23:20:05 -0300
Subject: [PATCH 0777/3482] libdatrie: add changelog entry.

---
 srcpkgs/libdatrie/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/libdatrie/template b/srcpkgs/libdatrie/template
index c5e846fae99a..7f81aed9cc7f 100644
--- a/srcpkgs/libdatrie/template
+++ b/srcpkgs/libdatrie/template
@@ -7,6 +7,7 @@ short_desc="Implementation of double-array structure for representing trie"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="LGPL-2.1-or-later"
 homepage="https://linux.thai.net/projects/datrie"
+changelog="https://raw.githubusercontent.com/tlwg/libdatrie/master/NEWS"
 distfiles="https://linux.thai.net/pub/ThaiLinux/software/libthai/libdatrie-${version}.tar.xz"
 checksum=12231bb2be2581a7f0fb9904092d24b0ed2a271a16835071ed97bed65267f4be
 

From 50b98ed7510dce72619631a166cac4c5c81ecc9b Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 15:54:48 -0700
Subject: [PATCH 0778/3482] mesa: update to 20.3.4.

---
 srcpkgs/mesa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 614f17e76d07..1e622adebf95 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=20.3.3
+version=20.3.4
 revision=1
 wrksrc="mesa-${version}"
 build_style=meson
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=f74e212d4838e982a10c203ffa998817d1855c5cf448ae87b58f96edea61d156
+checksum=dc21a987ec1ff45b278fe4b1419b1719f1968debbb80221480e44180849b4084
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From 0c512695143ca627f510459d8951f630f5c67e6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 31 Jan 2021 03:43:38 +0100
Subject: [PATCH 0779/3482] liteide: update to 37.3

---
 srcpkgs/liteide/template | 41 +++++++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/liteide/template b/srcpkgs/liteide/template
index d2e9aa44ac00..a3bae429b886 100644
--- a/srcpkgs/liteide/template
+++ b/srcpkgs/liteide/template
@@ -1,24 +1,43 @@
 # Template file for 'liteide'
 pkgname=liteide
-version=36.3
+version=37.3
 revision=1
 wrksrc="liteide-x${version}"
 build_wrksrc=liteidex
 build_style=qmake
-hostmakedepends="qt5-qmake"
-makedepends="qt5-tools-devel"
+hostmakedepends="go qt5-qmake qt5-host-tools"
+makedepends="libglvnd-devel libvterm-devel qt5-tools-devel qt5-webkit-devel"
 depends="go"
 short_desc="Simple, open source, cross-platform Go IDE"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://liteide.org/"
 distfiles="https://github.com/visualfc/liteide/archive/x${version}.tar.gz"
-checksum=d1b2b6a7994b764f7b12550e4759c90da18de574eb8544eebbcee98d7741c801
+checksum=e91e52ae7f9fdb8c904ef0f11f462b48eff6550b97c58928e848b5fe1f0bc198
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools"
-	CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5"
-	for i in ${XBPS_CROSS_BASE}/usr/include/qt5/*; do
-		CXXFLAGS+=" -I$i"
-	done
-fi
+pre_configure() {
+	# Use system libvterm instead of the one shipped
+	vsed -i -e 's;libvterm;;' src/3rdparty/3rdparty.pro
+	# Remove wrong extra 'lib' prefix
+	vsed -i -e 's;libvterm;vterm;' src/utils/vterm/vterm.pri
+}
+
+post_install() {
+	ln -frs ${DESTDIR}/usr/bin/{liteide,golangide}
+
+	# Package resources
+	vmkdir usr/share/liteide
+	cp -ar deploy/* os_deploy/* ${DESTDIR}/usr/share/liteide
+
+	# Package license files
+	vlicense LICENSE.LGPL LICENSE
+	vlicense LGPL_EXCEPTION.TXT LGPL_EXCEPTION
+
+	# Package desktop shortcut
+	vinstall liteide.desktop 644 usr/share/applications
+	vmkdir usr/share/pixmaps
+	vinstall deploy/welcome/images/liteide400.png 644 usr/share/pixmaps liteide.png
+
+	# Fix for FS#38781
+	mv ${DESTDIR}/usr/share/liteide/{linux/,}liteenv
+}

From 72919df6b4bb769ab500fe99f3ccf599d78fa9d8 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 15:41:59 -0700
Subject: [PATCH 0780/3482] scdoc: update to 1.11.1.

---
 srcpkgs/scdoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scdoc/template b/srcpkgs/scdoc/template
index ef4168086d03..f7f4b7c43673 100644
--- a/srcpkgs/scdoc/template
+++ b/srcpkgs/scdoc/template
@@ -1,6 +1,6 @@
 # Template file for 'scdoc'
 pkgname=scdoc
-version=1.11.0
+version=1.11.1
 revision=1
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr"
@@ -9,7 +9,7 @@ maintainer="Julio Galvan <juliogalvan@protonmail.com>"
 license="MIT"
 homepage="https://git.sr.ht/~sircmpwn/scdoc"
 distfiles="https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"
-checksum=8ac3e7e08fdfab0d75a312b1abcb6eafbd9114a5deaafbaba0fe5ec7e880929d
+checksum=e529fcb00508e7e4c5025a745591b805b754b3bd5c84c5192acaefabdfa8f700
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" scdoc"

From c35972ce61feaf1dc82e305a64ce7c281109c719 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 17:37:39 +0100
Subject: [PATCH 0781/3482] lilypond: update to 2.23.0

---
 srcpkgs/lilypond/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index c3be0ae65c02..f4ae908d511b 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.22.0
+version=2.23.0
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
@@ -16,8 +16,8 @@ short_desc="Music engraving program"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later, GFDL-1.3-or-later"
 homepage="https://lilypond.org/"
-distfiles="https://lilypond.org/downloads/sources/v2.22/lilypond-${version}.tar.gz"
-checksum=64ddd03171d247adc243e01a3be3ec2610d97c62b893c253ad02ac50694b0f4e
+distfiles="https://lilypond.org/downloads/sources/v2.23/lilypond-${version}.tar.gz"
+checksum=b2c795278ecef7e7b4383be6d9ad64b735dd826e790ccf791e656fa16a135fd3
 python_version=3
 
 if [ -n "${CROSS_BUILD}" ]; then

From 9775898b00e8b6846bf22e622f449f0f66f6f96e Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 17:38:01 +0100
Subject: [PATCH 0782/3482] lilypond-doc: update to 2.23.0

---
 srcpkgs/lilypond-doc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index 3d5a809a9618..7b9211f312b4 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.22.0
+version=2.23.0
 revision=1
 create_wrksrc=yes
 short_desc="Documentation for the lilypond music engraving program"
@@ -8,7 +8,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later, GFDL-1.3-or-later"
 homepage="http://lilypond.org/"
 distfiles="http://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2"
-checksum=2698a407424e29abf834d12376fb33aa1bfa2afa8b7f3537120b0817b982bd8f
+checksum=1b7f10a0a03923ab7e944916cdb1532312afe91d97272c3c0e0a547fe7161e88
 
 do_install() {
 	vmkdir usr

From 304dd0cf03889b262c3a79da1d787463434fdcca Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 18:14:13 +0100
Subject: [PATCH 0783/3482] foot: update to 1.6.3.

---
 srcpkgs/foot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template
index 544ef9187c1b..3782240fead1 100644
--- a/srcpkgs/foot/template
+++ b/srcpkgs/foot/template
@@ -1,6 +1,6 @@
 # Template file for 'foot'
 pkgname=foot
-version=1.6.2
+version=1.6.3
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/foot"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dee10d8153a3ed57e21f5d8c0ed4121ddf83eeb33655728e5b8c46dfa3566a45
+checksum=0340df647d3baae5bcafe6b081173d1850d3f92452d0d0b68d3edf0ef6eb1819
 
 post_install() {
 	vlicense LICENSE

From 6f3aeb1ff6d8bf625252723793dbd1ff7f644338 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 30 Jan 2021 23:54:41 +0200
Subject: [PATCH 0784/3482] fluidsynth: update to 2.1.7.

---
 srcpkgs/fluidsynth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 53e299a1d66b..581568a69813 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,6 +1,6 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=2.1.6
+version=2.1.7
 revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.fluidsynth.org/"
 distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=328fc290b5358544d8dea573f81cb1e97806bdf49e8507db067621242f3f0b8a
+checksum=365a1c0982efcaff724a7b05d26ce1db76bc7435aa4c239df61cbc87f04b6c90
 
 do_check() {
 	cd build

From df6d6c33675f93e1c0e0871d1de2ff1a1002313e Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sat, 30 Jan 2021 23:59:42 +0300
Subject: [PATCH 0785/3482] lf: update to r20.

---
 srcpkgs/lf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 1b4fc94cfc44..721a33cbf580 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,6 +1,6 @@
 # Template file for 'lf'
 pkgname=lf
-version=r19
+version=r20
 revision=1
 build_style=go
 go_import_path="github.com/gokcehan/${pkgname}"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/gokcehan/lf"
 distfiles="https://github.com/gokcehan/lf/archive/${version}.tar.gz"
-checksum=8808069021ee1c0012440edabdc239b9f58f36bdd44d27b07eae7c91b97afdef
+checksum=b0d755e255d48229c14b7ec5f86788c6fc96df1f6859f677b313fd9deb856398
 
 post_install() {
 	vlicense LICENSE

From b6d0bdc9f93146cb1a9d3aa14a96425c02965066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 22:16:17 -0300
Subject: [PATCH 0786/3482] bind: clean up outdated seccomp build option.

Revbump to show updated options in package.
---
 srcpkgs/bind/template | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 4e35aafb00ad..f0744606e44e 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.7
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -11,12 +11,11 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libtool --with-openssl=${XBPS_CROSS_BASE}/usr --with-gssapi=/usr/bin
  --without-gost --enable-openssl-hash --with-readline --with-tuning=default
  --without-python --enable-fetchlimit --enable-sit
- --with-libidn2 $(vopt_enable seccomp)
+ --with-libidn2
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
 makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
- libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)
- $(vopt_if seccomp libseccomp-devel)"
+ libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="MPL-2.0"
@@ -31,13 +30,9 @@ named_descr="BIND DNS server"
 named_homedir="/var/named"
 make_dirs="/var/named 0770 root named"
 
-build_options="geoip seccomp"
+build_options="geoip"
 build_options_default="geoip"
 
-case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*) build_options_default+=" seccomp";;
-esac
-
 do_check() {
 	# requires special network setup
 	:

From 6e80b25f58ecd6c67ef7bb04616a2c1763905e03 Mon Sep 17 00:00:00 2001
From: Renato Aguiar <renato@renatoaguiar.net>
Date: Sat, 30 Jan 2021 06:02:56 +0000
Subject: [PATCH 0787/3482] golangci-lint: update to 1.36.0

---
 srcpkgs/golangci-lint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index de9cc114e162..169680cf5797 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,6 +1,6 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
-version=1.35.2
+version=1.36.0
 revision=1
 build_style=go
 go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
@@ -10,7 +10,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="GPL-3.0-only"
 homepage="https://github.com/golangci/golangci-lint"
 distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
-checksum=31f245cb78a4f79d666a9357d5ea1f6ce30e15ea37d5c10c3ffb6765a158dc9d
+checksum=3476288341b2c6e2b5a426334ec982769a9ea5341e0336198fd33c7250b4928b
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"

From 01fc426beb5b346e48c5891812f02051693ecf82 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 17:49:03 +0100
Subject: [PATCH 0788/3482] p11-kit: update to 0.23.22.

---
 srcpkgs/p11-kit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
index 290c4620a030..85ca651456e5 100644
--- a/srcpkgs/p11-kit/template
+++ b/srcpkgs/p11-kit/template
@@ -1,6 +1,6 @@
 # Template file for 'p11-kit'
 pkgname=p11-kit
-version=0.23.21
+version=0.23.22
 revision=1
 build_style=gnu-configure
 configure_args="--with-module-path=/usr/lib/pkcs11"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/p11-glue/p11-kit"
 distfiles="${homepage}/releases/download/${version}/p11-kit-${version}.tar.xz"
-checksum=f1baa493f05ca0d867f06bcb54cbb5cdb28c756db07207b6e18de18a87b10627
+checksum=8a8f40153dd5a3f8e7c03e641f8db400133fb2a6a9ab2aee1b6d0cb0495ec6b6
 conf_files="/etc/pkcs11/pkcs11.conf"
 
 if [ "$CROSS_BUILD" ]; then

From 471aebcf5efbeb9c5c26889946ad2cb1094227c9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 31 Jan 2021 09:02:46 +0100
Subject: [PATCH 0789/3482] linux5.4: update to 5.4.94.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 60f097ab3da9..dc289a313bb3 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.92
+version=5.4.94
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=c0937ff98824c4b14cfea68a04340e0beb3c00f1cc02984daf2f3bdf542394fd
+checksum=c23df57db7312e9afa5ce477046e227a3c2153efbe1f29045ad23c820aad2b39
 python_version=3
 patch_args="-Np1"
 

From cf0997290511a402327835f78460dbac83a4718f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 31 Jan 2021 09:05:25 +0100
Subject: [PATCH 0790/3482] linux4.19: update to 4.19.172.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 1f109e47a201..359cf7d7cc11 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.170
+version=4.19.172
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=dd0d0264f8ef4363d0080054fd344470a73f07aca2cd673e91bf6e77fbe25b4a
+checksum=4f34cceb0558640ce04fa1929b99110282ba285c1655fbd4b72f985cf83e1422
 python_version=2 #unverified
 patch_args="-Np1"
 

From df52627bbcf4ce581f4f80cbac00dfebe342a9f2 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 31 Jan 2021 09:27:42 +0100
Subject: [PATCH 0791/3482] autofs: update to 5.1.7.

---
 srcpkgs/autofs/patches/musl.patch | 14 ++++++++++++++
 srcpkgs/autofs/template           |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/autofs/patches/musl.patch b/srcpkgs/autofs/patches/musl.patch
index 870731b7078a..5825d646a843 100644
--- a/srcpkgs/autofs/patches/musl.patch
+++ b/srcpkgs/autofs/patches/musl.patch
@@ -43,3 +43,17 @@
        if (attempt_id) {
                int len = sizeof(buffer) + 1 + strlen(msg) + 1;
  
+--- include/hash.h.orig	2021-01-31 09:22:19.668222263 +0100
++++ include/hash.h	2021-01-31 09:22:41.390327622 +0100
+@@ -5,6 +5,11 @@
+ 
+ #include <sys/types.h>
+ #include <stdint.h>
++#include <linux/stddef.h>
++
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ /*
+  * The "GOLDEN_RATIO_PRIME" is used in ifs/btrfs/brtfs_inode.h and
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index d84e1b8da4ba..b306368242d3 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
 # Template file for 'autofs'
 pkgname=autofs
-version=5.1.6
-revision=3
+version=5.1.7
+revision=1
 build_style=gnu-configure
 make_build_args="DONTSTRIP=1"
 configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
@@ -13,7 +13,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/daemons/autofs"
 distfiles="${KERNEL_SITE}/daemons/autofs/v5/autofs-${version}.tar.xz"
-checksum=dddee3d9b7388ce6cb7432832dfade25b07ef68ad48dcce01cf247b26a10caef
+checksum=a36b268611b79b07051749870ba540b139938efc84bc0293244c483e94f9ced7
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/gssglue -I${XBPS_CROSS_BASE}/usr/include/tirpc"
 

From d00be429c8c27640b7629e6a9753472e263ef80c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 31 Jan 2021 12:20:52 +0100
Subject: [PATCH 0792/3482] wine: update to 6.1.

---
 srcpkgs/wine/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 3694984c42d6..b80e73bbdc9d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.0
-revision=2
+version=6.1
+revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -11,10 +11,10 @@ short_desc="Run Microsoft Windows applications"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${_pkgver}.tar.xz
+distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="b493065f2f83ee429c62e2ec58698a3cf63ef78722e1b20765823152e8582c56
- 194902cb880a657de386e0789f8ce1f369fb896468ca299fd5abbe921fee043c"
+checksum="a92c24308c48b851b5dc22a1d35696a57311c447b31ec9fa543ec5b0aa73a149
+ f4de54fe026b920191db6c5001cfd563503d0fa3e2b191315311285019afddf4"
 
 build_options="mingw staging"
 build_options_default="mingw"

From cd1517941efdcc1791f00d4679c82c2efe58a9b0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 31 Jan 2021 15:52:16 +0100
Subject: [PATCH 0793/3482] ugrep: update to 3.1.6.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 188a499d1652..ca570f521876 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.1.5
+version=3.1.6
 revision=1
 build_style=gnu-configure
 configure_args="--disable-avx"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=f9efdc95c77e7c2651b614f7dc525db31c8e4809e70af4a9f2e33035859f7278
+checksum=5e494bccabebfa91b4ac34b0c44ac6e36fe8604e78ef4b22c099f68e82e32e35

From e33e07b18beeec80c565435fa1d646f006f1a28a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 31 Jan 2021 15:54:42 +0100
Subject: [PATCH 0794/3482] rlwrap: update to 0.44.

---
 srcpkgs/rlwrap/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/rlwrap/template b/srcpkgs/rlwrap/template
index 6f120a6f29fd..22787a1bfc7f 100644
--- a/srcpkgs/rlwrap/template
+++ b/srcpkgs/rlwrap/template
@@ -1,13 +1,13 @@
 # Template file for 'rlwrap'
 pkgname=rlwrap
-version=0.43
-revision=2
+version=0.44
+revision=1
 build_style=gnu-configure
 makedepends="readline-devel"
 depends="perl"
 short_desc="Adds readline-style editing and history to programs"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/hanslub42/rlwrap"
-distfiles="https://github.com/hanslub42/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=8e86d0b7882d9b8a73d229897a90edc207b1ae7fa0899dca8ee01c31a93feb2f
+distfiles="https://github.com/hanslub42/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz"
+checksum=cd7ff50cde66e443cbea0049b4abf1cca64a74948371fa4f1b5d9a5bbce1e13c

From e1632b85621c1cd6128a8e659ef2e4a148dbff5e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 31 Jan 2021 16:28:39 +0100
Subject: [PATCH 0795/3482] sbcl: update to 2.1.1.

---
 srcpkgs/sbcl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 5e57358bd65f..0a1afbeb9a2b 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.0
+version=2.1.1
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=05ee56bd66f9ce2f4fff3716766eb53aef2a74be3bbe862a31d83a60bea8224c
+checksum=a9ad892ea038b7155a60c1144801084fab3b2b8cbb0c5bde7e1f42a6b4318a97
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 4ab9a3dd8989427f7a27762ab7e0488e21603bd45aeac593d1667ad672e7fa35"
+	checksum+=" d7935c116af2ecd7485eae54d29491964b1f3ed97068f3127bd8871e120611a4"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"

From ec5c7fda2bd7b0759387b59e3737bb6ec28cdc89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 31 Jan 2021 16:35:02 +0100
Subject: [PATCH 0796/3482] squashfs-tools: enable zstd compression

---
 srcpkgs/squashfs-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template
index 7692eb01761e..d49d6c5602a8 100644
--- a/srcpkgs/squashfs-tools/template
+++ b/srcpkgs/squashfs-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'squashfs-tools'
 pkgname=squashfs-tools
 version=4.4
-revision=1
+revision=2
 wrksrc="squashfs${version}"
 build_wrksrc="squashfs-tools"
 build_style=gnu-makefile
-makedepends="zlib-devel lzo-devel liblzma-devel liblz4-devel"
+makedepends="zlib-devel lzo-devel liblzma-devel liblz4-devel libzstd-devel"
 license="GPL-2.0-or-later"
 homepage="http://squashfs.sf.net/"
 short_desc="Tool to create and append to squashfs filesystems"
@@ -16,7 +16,7 @@ checksum=a981b3f3f2054b5a2e658851a3c06a2460ad04a9a8a645e0afe063a63fdbb07e
 CFLAGS="-fcommon"
 
 do_build() {
-	make ${makejobs} XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1
+	make ${makejobs} XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1 ZSTD_SUPPORT=1
 }
 
 do_install() {

From a639d1431d7a94f4d86c7662c84e71a30d1e3813 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:04:58 +0100
Subject: [PATCH 0797/3482] fcitx: drop qt4 support

---
 srcpkgs/fcitx/template    | 27 +++++----------------------
 srcpkgs/libfcitx-qt       |  1 -
 srcpkgs/libfcitx-qt-devel |  1 -
 3 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 120000 srcpkgs/libfcitx-qt
 delete mode 120000 srcpkgs/libfcitx-qt-devel

diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template
index 0f810fe19b55..8373cf9ff972 100644
--- a/srcpkgs/fcitx/template
+++ b/srcpkgs/fcitx/template
@@ -1,7 +1,7 @@
 # Template file for 'fcitx'
 pkgname=fcitx
 version=4.2.9.8
-revision=1
+revision=2
 build_style=cmake
 short_desc="Flexible Context-aware Input Tool with eXtension"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -10,13 +10,13 @@ homepage="https://fcitx-im.org/"
 distfiles="http://download.fcitx-im.org/fcitx/fcitx-${version}_dict.tar.xz"
 checksum=bc3515cba0561546fe02dae81391d4a03e0e79a2d668aa794cd3a377284033c6
 
-hostmakedepends="pkg-config doxygen gobject-introspection extra-cmake-modules qt-qmake"
+hostmakedepends="pkg-config doxygen gobject-introspection extra-cmake-modules"
 makedepends="iso-codes gettext-devel enchant-devel libxml2-devel
  json-c-devel opencc-devel
- libxkbfile-devel icu-devel qt-devel dbus-devel gtk+-devel gtk+3-devel"
+ libxkbfile-devel icu-devel dbus-devel gtk+-devel gtk+3-devel"
 lib32disabled=yes
 configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF
- -DENABLE_GTK2_IM_MODULE=ON -DENABLE_GTK3_IM_MODULE=ON -DENABLE_QT_IM_MODULE=ON
+ -DENABLE_GTK2_IM_MODULE=ON -DENABLE_GTK3_IM_MODULE=ON -DENABLE_QT=OFF
  -DFORCE_ENCHANT=ON -DENABLE_TEST=ON"
 
 # Warning: do NOT enable backtrace for musl, do NOT add libexecinfo-devel
@@ -26,7 +26,7 @@ esac
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DENABLE_GIR=OFF"
-	hostmakedepends+=" glib-devel qt-host-tools fcitx"
+	hostmakedepends+=" glib-devel fcitx"
 fi
 
 pre_configure() {
@@ -94,20 +94,3 @@ libfcitx-gtk3_package() {
 		vmove usr/lib/gtk-3.0
 	}
 }
-libfcitx-qt_package() {
-	short_desc+=" - Qt4 IM module"
-	pkg_install() {
-		vmove "usr/lib/libfcitx-qt.so.*"
-		vmove usr/lib/fcitx/libexec/fcitx-qt-gui-wrapper
-		vmove usr/lib/qt
-	}
-}
-libfcitx-qt-devel_package() {
-	short_desc+=" - Qt4 IM module development files"
-	depends="fcitx-${version}_${revision} qt-devel"
-	pkg_install() {
-		vmove usr/include/fcitx-qt
-		vmove usr/lib/libfcitx-qt.so
-		vmove usr/lib/pkgconfig/fcitx-qt.pc
-	}
-}
diff --git a/srcpkgs/libfcitx-qt b/srcpkgs/libfcitx-qt
deleted file mode 120000
index 421114c67a28..000000000000
--- a/srcpkgs/libfcitx-qt
+++ /dev/null
@@ -1 +0,0 @@
-fcitx
\ No newline at end of file
diff --git a/srcpkgs/libfcitx-qt-devel b/srcpkgs/libfcitx-qt-devel
deleted file mode 120000
index 421114c67a28..000000000000
--- a/srcpkgs/libfcitx-qt-devel
+++ /dev/null
@@ -1 +0,0 @@
-fcitx
\ No newline at end of file

From 788da08bd5bb1239574ea1c7dabfef7fcb8ca2b8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:06:37 +0100
Subject: [PATCH 0798/3482] removed-packages: add fcitx-qt

---
 srcpkgs/removed-packages/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index b8a4e651ac83..a82cd326b0a2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -140,6 +140,8 @@ replaces="
  keepassx<=0.4.4_2
  libapp<=20140527_2
  libdbusmenu-qt<=0.9.2_4
+ libfcitx-qt<=4.2.9.8_1
+ libfcitx-qt-devel<=4.2.9.8_1
  libgksu<=2.0.12_5
  libqzeitgeist<=0.8.0_6
  librpcsecgss<=0.19_6

From bed1d0b634df43ea72e94a9a31d2bc15c752d2d1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:10:06 +0100
Subject: [PATCH 0799/3482] tagainijisho: remove

depends on qt4, added in 2016 and never really updated since;
upstream seems dormant at best, and while git version has qt5
support, release does not
---
 srcpkgs/tagainijisho/template | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 srcpkgs/tagainijisho/template

diff --git a/srcpkgs/tagainijisho/template b/srcpkgs/tagainijisho/template
deleted file mode 100644
index 30cc4ad91d41..000000000000
--- a/srcpkgs/tagainijisho/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'tagainijisho'
-
-pkgname="tagainijisho"
-version="1.0.3"
-revision=1
-build_style=cmake
-makedepends="qt-devel"
-short_desc="A free software Japanese dictionary and learning assistant"
-maintainer="Salih Gerdan <msalih45@gmail.com>"
-license="GPL-3"
-homepage="http://www.tagaini.net"
-distfiles="https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz"
-checksum="6fe3c579ec1cea6c41393ac9a82dd12d0e240032d2bb7837a90e470f480aaf4e"
-nocross="Found unsuitable Qt version, this code requires Qt 4.x"
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="other dicts are not built";;
-esac

From 918b2dbd7332b1e81c910e098d9e05415d21d15d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:11:39 +0100
Subject: [PATCH 0800/3482] removed-packages: add tagainijisho

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a82cd326b0a2..14a3be7f92e9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -182,6 +182,7 @@ replaces="
  soulseekqt<=20160117_2
  spacefm-ng<=1.0.6_3
  sqlite-replication<=3.32.3_2
+ tagainijisho<=1.0.3_1
  ttyload-git<=20141117_4
  tuxc<=1.1_3
  urlmatch-git<=20141116_2

From 228bc2b3e50755cbce173e40afd67cc8863392cd Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:13:01 +0100
Subject: [PATCH 0801/3482] scantailor: remove

depends on qt4, and declared dead by upstream
---
 srcpkgs/scantailor/files/scantailor.desktop   | 51 -------------------
 .../patches/fix-pthread_check.patch           | 31 -----------
 srcpkgs/scantailor/template                   | 24 ---------
 srcpkgs/scantailor/update                     |  2 -
 4 files changed, 108 deletions(-)
 delete mode 100644 srcpkgs/scantailor/files/scantailor.desktop
 delete mode 100644 srcpkgs/scantailor/patches/fix-pthread_check.patch
 delete mode 100644 srcpkgs/scantailor/template
 delete mode 100644 srcpkgs/scantailor/update

diff --git a/srcpkgs/scantailor/files/scantailor.desktop b/srcpkgs/scantailor/files/scantailor.desktop
deleted file mode 100644
index e51d881748b6..000000000000
--- a/srcpkgs/scantailor/files/scantailor.desktop
+++ /dev/null
@@ -1,51 +0,0 @@
-[Desktop Entry]
-Name=ScanTailor
-GenericName=Scan processing software
-GenericName[ru]=Постобработка отсканированных страниц
-Comment=Interactive post-processing tool for scanned pages
-Comment[af]=Interaktiewe post-verwerkings hulpmiddel vir geskandeerde bladsye
-Comment[sq]=Mjet interaktiv pas përpunimi për faqet e skanuara
-Comment[ast]=Ferramienta interactiva de postprocesamientu pa páxines escaneaes
-Comment[bn]=স্ক্যানকৃত পৃষ্ঠার জন্য মিথস্ক্রিয় পোস্ট-প্রসেসিং টুল
-Comment[bs]=Interaktivni alat za naknadnu obradu optički skeniranih stranica
-Comment[pt_BR]=Ferramenta interativa de pós processamento para páginas digitalizadas
-Comment[bg]=Инструмент за интерактивна пост обработка на сканирани страници
-Comment[ca]=Eina interactiva de postprocessament de pàgines escanejades
-Comment[ca@valencia]=Eina interactiva de postprocessament de pàgines escanejades
-Comment[zh_HK]=掃描紙張的互動式後製工具
-Comment[zh_TW]=掃描紙張的互動式後製工具
-Comment[zh_CN]=用于扫描页面的交互式后期处理工具
-Comment[crh]=Taranmış sayfalar için etkileşimli son işlem aracı
-Comment[cs]=Interaktivní nástroj pro zpracování naskenovaných stránek
-Comment[et]=Skaneeritud lehekülgede interaktiivne järeltöötlus vahend
-Comment[da]=Interaktivt efterbehandlingsværktøj til skannede sider
-Comment[nl]=Interactief, post-processing hulpmiddel voor gescande pagina"s
-Comment[fi]=Interaktiivinen jälkikäsittelytyökalu skannatuille sivuille
-Comment[fr]=Interactive outil de post-traitement pour des pages numérisées
-Comment[gl]=Ferramenta interactiva de postprocesamento de imaxes dixitalizadas
-Comment[el]=Διαδραστικό εργαλείο post-processing για σελίδες που έχουν σαρωθεί
-Comment[de]=Interaktives Nachbearbeitungswerkzeug für gescannte Seiten
-Comment[hu]=Beolvasott képek interaktív utófeldolgozása
-Comment[ja]=スキャンされたページを対話式に後処理するツール
-Comment[it]=Strumento interattivo per il post processamento di pagine acquisite con lo scanner
-Comment[ky]=Сканерленген баракчаларды кайра иштетүү үчүн интерактивдүү шайман
-Comment[ms]=Alat post-pemprosesan berinteraktif untuk halaman terimbas
-Comment[nb]=Interaktivt verktøy for etterbehandling av skannede sider
-Comment[oc]=Aisina interactiva de tractament de document aprèp numerizacion
-Comment[pl]=Program do obróbki i przetwarzana zeskanowanych dokumentów tekstowych
-Comment[pt]=Ferramenta de pós-processamento interactivo de páginas scaneadas
-Comment[ro]=Utilitar interactiv pentru post-procesare pagini scanate
-Comment[ru]=Интерактивный инструмент постобработки для отсканированных страниц
-Comment[sl]=Vzajemno orodje za poopravilo optično prebranih strani
-Comment[es]=Herramienta interactiva de postprocesamiento para páginas escaneadas
-Comment[sv]=Interaktivt vektyg för efterbearbetning av inlästa sidor
-Comment[vi]=Công cụ tương tác xử lý trước các trang được quét
-Comment[uk]=Інтерактивний інструмент пост-обробки відсканованих сторінок
-Comment[tr]=Taranmış sayfalar için etkileşimli son işlem aracı
-TryExec=/usr/bin/scantailor
-Exec=/usr/bin/scantailor %f
-Type=Application
-Icon=scantailor
-Terminal=false
-MimeType=application/x-scantailor;
-Categories=Graphics;2DGraphics;RasterGraphics;
diff --git a/srcpkgs/scantailor/patches/fix-pthread_check.patch b/srcpkgs/scantailor/patches/fix-pthread_check.patch
deleted file mode 100644
index 370774eb565e..000000000000
--- a/srcpkgs/scantailor/patches/fix-pthread_check.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- cmake/FindPthreads.cmake	2012-02-27 21:11:05.000000000 +0100
-+++ cmake/FindPthreads.cmake	2016-03-08 04:46:38.516378187 +0100
-@@ -27,7 +27,7 @@
- 	SET(_aix_flags "-D_THREAD_SAFE:-lpthreads")
- 	
- 	# gcc on various OSes
--	SET(_other_flags "-pthread:-pthread")
-+	SET(_other_flags "-pthread -fPIC:-pthread")
- 	
- 	IF(CMAKE_SYSTEM_NAME MATCHES "AIX.*")
- 		LIST(APPEND _available_flags ${_aix_flags})
-@@ -59,14 +59,17 @@
- 		
- 		FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/TestPthreads.c
- 			"#include <pthread.h>\n"
-+			"void* start_routine(void* arg) { return arg; }\n"
- 			"int main()\n"
- 			"{\n"
- 			"	pthread_t th;\n"
--			"	pthread_create(&th, 0, 0, 0);\n"
-+			"	pthread_attr_t att;\n"
-+			"	pthread_attr_init(&att);\n"
-+			"	pthread_create(&th, &att, start_routine, 0);\n"
- 			"	pthread_join(th, 0);\n"
--			"	pthread_attr_init(0);\n"
- 			"	pthread_cleanup_push(0, 0);\n"
- 			"	pthread_cleanup_pop(0);\n"
-+			"	return 0;\n"
- 			"}\n"
- 		)
- 		
diff --git a/srcpkgs/scantailor/template b/srcpkgs/scantailor/template
deleted file mode 100644
index 68af70833b29..000000000000
--- a/srcpkgs/scantailor/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'scantailor'
-pkgname=scantailor
-version=0.9.12.1
-revision=2
-wrksrc=${pkgname}-RELEASE_${version//./_}
-build_style=cmake
-#configure_args="-DPTHREADS_CFLAGS=-pthread -DPTHREADS_LIBS=-pthread"
-hostmakedepends="qt-devel qt-qmake pkg-config"
-makedepends="libpng-devel tiff-devel boost-devel qt-devel libXrender-devel"
-short_desc="Interactive post-processing for scans"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-3"
-homepage="http://scantailor.org/"
-distfiles="http://github.com/${pkgname}/${pkgname}/archive/RELEASE_${version//./_}.tar.gz"
-checksum=ef5d5bdca207ab00701121a32e9b95c7c7353c642b9538b3f9ca040d8d1a5dde
-
-CFLAGS="-fPIC"
-
-post_install() {
-	vinstall resources/icons/appicon-about.png 644 \
-		usr/share/pixmaps ${pkgname}.png
-	vinstall ${FILESDIR}/${pkgname}.desktop 644 \
-		usr/share/applications
-}
diff --git a/srcpkgs/scantailor/update b/srcpkgs/scantailor/update
deleted file mode 100644
index e7abd4e82b6e..000000000000
--- a/srcpkgs/scantailor/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://github.com/scantailor/scantailor/releases
-pattern='RELEASE_.*">\K[\d.]+'

From 358e2cd8669f7b38fd7d374fc6323e5b4e9a7410 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:13:53 +0100
Subject: [PATCH 0802/3482] removed-packages: add scantailor

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 14a3be7f92e9..66ea2e44f463 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -176,6 +176,7 @@ replaces="
  qimageblitz<=0.0.6_4
  r2-bindings<=1.0.1_2
  reminiscence<=0.4.6_1
+ scantailor<=0.9.12.1_2
  seriespl<=2.3.5_2
  simple-obfs<=0.0.5_2
  skypetab-ng<=20150201_3

From 0dc8d90095aa5e8d38253636d725f97662ecb6e5 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:38:16 +0100
Subject: [PATCH 0803/3482] keepassx2: remove

---
 srcpkgs/keepassx2/patches/musl.patch | 10 ----------
 srcpkgs/keepassx2/template           | 29 ----------------------------
 srcpkgs/keepassx2/update             |  3 ---
 3 files changed, 42 deletions(-)
 delete mode 100644 srcpkgs/keepassx2/patches/musl.patch
 delete mode 100644 srcpkgs/keepassx2/template
 delete mode 100644 srcpkgs/keepassx2/update

diff --git a/srcpkgs/keepassx2/patches/musl.patch b/srcpkgs/keepassx2/patches/musl.patch
deleted file mode 100644
index 7f7bd27ac8df..000000000000
--- a/srcpkgs/keepassx2/patches/musl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/core/qlockfile_unix.cpp.orig	2015-07-19 00:41:35.000000000 +0200
-+++ src/core/qlockfile_unix.cpp	2015-07-21 20:01:02.607722077 +0200
-@@ -39,6 +39,7 @@
- #include <QDebug>
- #include <QDateTime>
- 
-+#include <fcntl.h>
- #include <sys/file.h>  // flock
- #include <sys/types.h> // kill
- #include <signal.h>    // kill
diff --git a/srcpkgs/keepassx2/template b/srcpkgs/keepassx2/template
deleted file mode 100644
index d643ebf182a6..000000000000
--- a/srcpkgs/keepassx2/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'keepassx2'
-_realname="keepassx"
-pkgname="${_realname}2"
-version="2.0.3"
-revision=2
-build_style=cmake
-hostmakedepends="pkg-config qt-devel"
-makedepends="qt-devel libgcrypt-devel zlib-devel libXi-devel libXtst-devel"
-short_desc="A password manager to secure personal data"
-maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
-license="GPL-2"
-homepage="https://www.keepassx.org/"
-distfiles="${homepage}/releases/${version}/${_realname}-${version}.tar.gz"
-checksum=23ffb4ae360c58aa139943442d175bc6b8f08e6a876ae76c4543ab983a6647c5
-wrksrc="${_realname}-${version}"
-
-pre_configure() {
-	sed -i CMakeLists.txt \
-		-e "s/set(PROGNAME.*/set(PROGNAME keepassx2)/"
-}
-
-post_install() {
-	sed -i $DESTDIR/usr/share/applications/keepassx.desktop \
-		-e "s/^Exec=.*/Exec=keepassx2/"
-	mv $DESTDIR/usr/share/applications/keepassx.desktop \
-		$DESTDIR/usr/share/applications/keepassx2.desktop
-	mv $DESTDIR/usr/share/mime/packages/keepassx.xml \
-		$DESTDIR/usr/share/mime/packages/keepassx2.xml
-}
diff --git a/srcpkgs/keepassx2/update b/srcpkgs/keepassx2/update
deleted file mode 100644
index e21b8c6880ec..000000000000
--- a/srcpkgs/keepassx2/update
+++ /dev/null
@@ -1,3 +0,0 @@
-pkgname=keepassx
-site=https://www.keepassx.org/downloads
-

From 3f20c39dc9c69e9d454a3c7fc1eb0ea9599da9f7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:39:32 +0100
Subject: [PATCH 0804/3482] removed-packages: add keepassx2

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 66ea2e44f463..3fa87ecb866f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -138,6 +138,7 @@ replaces="
  js<=1.8.5_11
  kadu<=4.3_6
  keepassx<=0.4.4_2
+ keepassx2<=2.0.3_2
  libapp<=20140527_2
  libdbusmenu-qt<=0.9.2_4
  libfcitx-qt<=4.2.9.8_1

From 925e714d527d0a39b604f6465701d3535a863622 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:01:58 +0100
Subject: [PATCH 0805/3482] avogadro: remove

---
 srcpkgs/avogadro-devel               |  1 -
 srcpkgs/avogadro/patches/glibc.patch | 18 --------------
 srcpkgs/avogadro/template            | 37 ----------------------------
 3 files changed, 56 deletions(-)
 delete mode 120000 srcpkgs/avogadro-devel
 delete mode 100644 srcpkgs/avogadro/patches/glibc.patch
 delete mode 100644 srcpkgs/avogadro/template

diff --git a/srcpkgs/avogadro-devel b/srcpkgs/avogadro-devel
deleted file mode 120000
index 9ed7d75d9d24..000000000000
--- a/srcpkgs/avogadro-devel
+++ /dev/null
@@ -1 +0,0 @@
-avogadro
\ No newline at end of file
diff --git a/srcpkgs/avogadro/patches/glibc.patch b/srcpkgs/avogadro/patches/glibc.patch
deleted file mode 100644
index 4d652af22c68..000000000000
--- a/srcpkgs/avogadro/patches/glibc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- libavogadro/src/extensions/symmetry/libmsym/src/orbital.c.orig
-+++ libavogadro/src/extensions/symmetry/libmsym/src/orbital.c
-@@ -67,13 +67,13 @@
-         }
-         case 2 : {
-             //o->v = dpolynomial[m+l];
--            char *d = (signbit(m) == 1 ? "-" : "+");
-+            char *d = (signbit(m*1.0) == 1 ? "-" : "+");
-             snprintf(o->name, sizeof(o->name), "%dd%d%s",n,abs(m),d);
-             break;
-         }
-         default : {
-             char t = 'f' - 3 + l;
--            char *d = (signbit(m) == 1 ? "-" : "+");
-+            char *d = (signbit(m*1.0) == 1 ? "-" : "+");
-             snprintf(o->name, sizeof(o->name), "%d%c%d%s",n,t,abs(m),d);
-         }
-     }
diff --git a/srcpkgs/avogadro/template b/srcpkgs/avogadro/template
deleted file mode 100644
index 03b886f1e0df..000000000000
--- a/srcpkgs/avogadro/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'avogadro'
-pkgname=avogadro
-version=1.2.0
-revision=8
-build_style=cmake
-configure_args="-DENABLE_TESTING:BOOL=OFF"
-hostmakedepends="pkg-config doxygen"
-makedepends="openbabel-devel qt-devel glew-devel zlib-devel boost-devel
- python-devel hdf5-devel eigen3.2"
-short_desc="An intuitive molecular editor and visualization tool"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-2"
-homepage="http://avogadro.cc"
-distfiles="https://github.com/cryos/avogadro/archive/${version}.tar.gz"
-checksum=6453e36e8ae3e61655cbe062df6d6fa6b2409122c7b5abc0a6f1d410a181640b
-
-pre_build() {
-	sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|g' CMakeLists.txt
-}
-post_install() {
-	rm -rf ${DESTDIR}/usr/features
-}
-
-avogadro-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/avogadro/*.cmake
-		subver=${version%.*}
-		vmove usr/lib/avogadro/${subver%.*}_${subver#*.}/*cmake
-	}
-}

From 4393c4bac6e058d0fa4493e13b901b67d2fd65c3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:02:45 +0100
Subject: [PATCH 0806/3482] luxmark: remove

---
 srcpkgs/luxmark/patches/openexr-2_4.patch | 11 ----------
 srcpkgs/luxmark/template                  | 26 -----------------------
 srcpkgs/luxmark/update                    |  2 --
 3 files changed, 39 deletions(-)
 delete mode 100644 srcpkgs/luxmark/patches/openexr-2_4.patch
 delete mode 100644 srcpkgs/luxmark/template
 delete mode 100644 srcpkgs/luxmark/update

diff --git a/srcpkgs/luxmark/patches/openexr-2_4.patch b/srcpkgs/luxmark/patches/openexr-2_4.patch
deleted file mode 100644
index 5dd88f3093ef..000000000000
--- a/srcpkgs/luxmark/patches/openexr-2_4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/Packages/FindOpenEXR.cmake	2015-09-01 12:07:29.000000000 +0200
-+++ cmake/Packages/FindOpenEXR.cmake	2019-12-06 18:58:06.185329837 +0100
-@@ -68,7 +68,7 @@
- ENDFOREACH(i)
- ENDIF(OPENEXR_INCLUDE_DIRS)
- 
--SET(OpenEXR_LIBRARY_MODULES Iex IlmImf Half Imath IlmThread)
-+SET(OpenEXR_LIBRARY_MODULES Iex-2_4 IlmImf-2_4 Half-2_4 Imath-2_4 IlmThread-2_4)
- SET(OpenEXR_LIB_SUFFIXES lib64 lib Lib lib/OpenEXR Libs)
- SET(OpenEXR_LIB_SUFFIXES_REL)
- SET(OpenEXR_LIB_SUFFIXES_DBG)
diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template
deleted file mode 100644
index 68a7a7ab86c1..000000000000
--- a/srcpkgs/luxmark/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'luxmark'
-pkgname=luxmark
-version=3.1
-revision=9
-build_style=cmake
-makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel
- libopenexr-devel MesaLib-devel ocl-icd-devel opencl2-headers boost-devel
- python-devel luxrays-devel glew-devel libfreeglut-devel qt-devel opencl-clhpp"
-short_desc="OpenCL benchmark based on LuxCore"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
-homepage="http://www.luxrender.net/wiki/LuxMark"
-distfiles="https://bitbucket.org/luxrender/luxmark/get/${pkgname}_v${version}.tar.gz"
-checksum=175cc38f8a3cb73cf2ef25d6e99981456d66e1f9c7fb362522e7e58319c026e6
-
-configure_args=" -DCMAKE_SKIP_RPATH=ON"
-
-post_extract() {
-	mv $XBPS_BUILDDIR/luxrender-luxmark* $wrksrc
-}
-
-do_install() {
-	vbin build/bin/luxmark
-	vmkdir usr/share/luxmark
-	vcopy scenes usr/share/luxmark
-}
diff --git a/srcpkgs/luxmark/update b/srcpkgs/luxmark/update
deleted file mode 100644
index 24c7a3b659ee..000000000000
--- a/srcpkgs/luxmark/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://bitbucket.org/api/1.0/repositories/luxrender/luxmark/tags"
-pattern='luxmark_v\K([\d.]+)(?=")'

From f13a058550a10b38785f1570c190ba109d4048e0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:03:10 +0100
Subject: [PATCH 0807/3482] luxrays: remove

---
 srcpkgs/luxrays-devel                     |  1 -
 srcpkgs/luxrays/patches/boost.patch       | 11 ------
 srcpkgs/luxrays/patches/openexr-2_4.patch | 11 ------
 srcpkgs/luxrays/template                  | 45 -----------------------
 srcpkgs/luxrays/update                    |  2 -
 5 files changed, 70 deletions(-)
 delete mode 120000 srcpkgs/luxrays-devel
 delete mode 100644 srcpkgs/luxrays/patches/boost.patch
 delete mode 100644 srcpkgs/luxrays/patches/openexr-2_4.patch
 delete mode 100644 srcpkgs/luxrays/template
 delete mode 100644 srcpkgs/luxrays/update

diff --git a/srcpkgs/luxrays-devel b/srcpkgs/luxrays-devel
deleted file mode 120000
index 7c8145202886..000000000000
--- a/srcpkgs/luxrays-devel
+++ /dev/null
@@ -1 +0,0 @@
-luxrays
\ No newline at end of file
diff --git a/srcpkgs/luxrays/patches/boost.patch b/srcpkgs/luxrays/patches/boost.patch
deleted file mode 100644
index dbbf94d3cd0a..000000000000
--- a/srcpkgs/luxrays/patches/boost.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/Dependencies.cmake	2015-08-29 23:34:01.000000000 +0200
-+++ -	2018-10-05 21:42:24.139024667 +0200
-@@ -58,7 +58,7 @@
- 
- set(Boost_ADDITIONAL_VERSIONS "1.47.0" "1.46.1" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0")
- 
--set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python)
-+set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python27)
- find_package(Boost ${Boost_MINIMUM_VERSION} COMPONENTS ${LUXRAYS_BOOST_COMPONENTS})
- if (NOT Boost_FOUND)
-         # Try again with the other type of libs
diff --git a/srcpkgs/luxrays/patches/openexr-2_4.patch b/srcpkgs/luxrays/patches/openexr-2_4.patch
deleted file mode 100644
index dc59111a0f66..000000000000
--- a/srcpkgs/luxrays/patches/openexr-2_4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/Packages/FindOpenEXR.cmake
-+++ cmake/Packages/FindOpenEXR.cmake
-@@ -68,7 +68,7 @@
- ENDFOREACH(i)
- ENDIF(OPENEXR_INCLUDE_DIRS)
- 
--SET(OpenEXR_LIBRARY_MODULES Iex IlmImf Half Imath IlmThread)
-+SET(OpenEXR_LIBRARY_MODULES Iex-2_4 IlmImf-2_4 Half-2_4 Imath-2_4 IlmThread-2_4)
- SET(OpenEXR_LIB_SUFFIXES lib64 lib Lib lib/OpenEXR Libs)
- SET(OpenEXR_LIB_SUFFIXES_REL)
- SET(OpenEXR_LIB_SUFFIXES_DBG)
diff --git a/srcpkgs/luxrays/template b/srcpkgs/luxrays/template
deleted file mode 100644
index 4ed0916d2826..000000000000
--- a/srcpkgs/luxrays/template
+++ /dev/null
@@ -1,45 +0,0 @@
-# Template file for 'luxrays'
-pkgname=luxrays
-version=3.1
-revision=18
-build_style=cmake
-configure_args="-DLUXRAYS_DISABLE_OPENCL=OFF -DCMAKE_SKIP_RPATH=ON"
-hostmakedepends="flex bison boost-devel"
-makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel
- boost-devel glew-devel opencl2-headers opencl-clhpp libopenexr-devel
- python-devel libfreeglut-devel embree-devel"
-short_desc="LuxMark renderer engine"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
-homepage="http://www.luxrender.net/wiki/LuxRays"
-distfiles="https://sources.voidlinux.org/${pkgname}-${version}/luxmark_v${version}.tar.gz"
-checksum=f5b67220b72ec261ad51526d5c4550e2f95130565f3aa02a92d40f56593d8064
-
-post_extract() {
-	mv $XBPS_BUILDDIR/luxrender-luxrays* $wrksrc
-}
-
-do_install() {
-	for B in build/bin/*; do
-		vbin $B
-	done
-
-	for L in build/lib/*; do
-		vinstall $L 644 usr/lib
-	done
-
-	vmkdir usr/include
-	vcopy include/* usr/include
-
-	vmkdir usr/lib/python2.7
-	mv ${DESTDIR}/usr/lib/pyluxcore.so ${DESTDIR}/usr/lib/python2.7
-}
-
-luxrays-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-	}
-}
diff --git a/srcpkgs/luxrays/update b/srcpkgs/luxrays/update
deleted file mode 100644
index a32280ed6bec..000000000000
--- a/srcpkgs/luxrays/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://bitbucket.org/api/1.0/repositories/luxrender/luxrays/tags"
-pattern='luxmark_v\K([\d.]+)(?=")'

From ff497e077bf2a496c246d058f37df113013069c6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:04:16 +0100
Subject: [PATCH 0808/3482] qucs: remove

---
 .../patches/qucsator-fix-list-traversion.patch  | 17 -----------------
 srcpkgs/qucs/template                           | 15 ---------------
 2 files changed, 32 deletions(-)
 delete mode 100644 srcpkgs/qucs/patches/qucsator-fix-list-traversion.patch
 delete mode 100644 srcpkgs/qucs/template

diff --git a/srcpkgs/qucs/patches/qucsator-fix-list-traversion.patch b/srcpkgs/qucs/patches/qucsator-fix-list-traversion.patch
deleted file mode 100644
index c22a608adc05..000000000000
--- a/srcpkgs/qucs/patches/qucsator-fix-list-traversion.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- qucs-core/src/net.cpp.org	2017-09-13 20:47:24.863069583 +0200
-+++ qucs-core/src/net.cpp	2017-09-10 00:16:48.863636748 +0200
-@@ -350,7 +350,13 @@
- void net::sortChildAnalyses (analysis * parent) {
-   ptrlist<analysis> * alist = parent->getAnalysis ();
-   if (alist != nullptr) {
--    for (auto *a: *alist) {
-+
-+    for (auto it = alist->begin(); it != alist->end(); /* empty */) {
-+      // Copy the value of the element (a pointer), and advance the
-+      // iterator prior to manipulating the list.
-+      analysis *a = *it;
-+      ++it;
-+
-       if (a->getType () == ANALYSIS_DC
- 	  || containsAnalysis (a, ANALYSIS_DC)) {
- 	parent->delAnalysis (a);
diff --git a/srcpkgs/qucs/template b/srcpkgs/qucs/template
deleted file mode 100644
index 4c18a3258c30..000000000000
--- a/srcpkgs/qucs/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'qucs'
-pkgname=qucs
-version=0.0.19
-revision=2
-build_style=gnu-configure
-configure_args="--disable-doc"
-hostmakedepends="ADMS-qucs gperf qt-devel"
-makedepends="qt-devel"
-short_desc="Quite Universal Circuit Simulator"
-maintainer="Martijn van Buul <martijn.van.buul@gmail.com>"
-license="GPL-2"
-homepage="http://qucs.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
-checksum="45c6434fde24c533e63550675ac21cdbd3cc6cbba29b82a1dc3f36e7dd4b3b3e"
-nocross="yes" # seems to compile all the way, but seems to link against the wrong libX11 (at least)

From 9d2749905d793a4281215a3520bccd445df63487 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:04:46 +0100
Subject: [PATCH 0809/3482] removed-packages: add avogadro, luxmark/luxrays,
 qucs

---
 srcpkgs/removed-packages/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3fa87ecb866f..6486543934a3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -13,6 +13,7 @@ replaces="
  apg<=2.2.3_5
  arm-mem-git<=20131108_2
  arptables<=0.0.4_3
+ avogadro<=1.2.0_8
  bokken<=1.8_3
  bzr<=2.7.0_1
  bzrtools<=2.6.0_4
@@ -150,6 +151,8 @@ replaces="
  livewallpaper<=0.5.0_2
  llvm3.9<=3.9.1_5
  ls++-git<=20140919_3
+ luxmark<=3.1_9
+ luxrays<=3.1_18
  mac<=3.99u4b5s7_3
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
@@ -175,6 +178,7 @@ replaces="
  python-pyside<=1.2.2_7
  python-pytest-relaxed<=1.1.2_2
  qimageblitz<=0.0.6_4
+ qucs<=0.0.19_2
  r2-bindings<=1.0.1_2
  reminiscence<=0.4.6_1
  scantailor<=0.9.12.1_2

From f1914c914503315cbc03682a8880256d269506f6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:09:25 +0100
Subject: [PATCH 0810/3482] qt: remove

---
 srcpkgs/qt-designer                           |   1 -
 srcpkgs/qt-designer-devel                     |   1 -
 srcpkgs/qt-designer-libs                      |   1 -
 srcpkgs/qt-devel                              |   1 -
 srcpkgs/qt-devel-tools                        |   1 -
 srcpkgs/qt-doc                                |   1 -
 srcpkgs/qt-host-tools                         |   1 -
 srcpkgs/qt-plugin-mysql                       |   1 -
 srcpkgs/qt-plugin-odbc                        |   1 -
 srcpkgs/qt-plugin-pgsql                       |   1 -
 srcpkgs/qt-plugin-sqlite                      |   1 -
 srcpkgs/qt-qmake                              |   1 -
 srcpkgs/qt/files/assistant.desktop            |   8 -
 srcpkgs/qt/files/designer.desktop             |   9 -
 srcpkgs/qt/files/linguist.desktop             |   9 -
 srcpkgs/qt/files/qtconfig.desktop             |   8 -
 ...t-usage-that-causes-compile-failure-.patch |  34 -
 srcpkgs/qt/patches/aarch64.patch              | 541 -------------
 srcpkgs/qt/patches/fix-alsatest.patch         |  13 -
 .../patches/fix-bytecompiler_narrowing.patch  |  22 -
 srcpkgs/qt/patches/fix-itemviews.patch        |  14 -
 srcpkgs/qt/patches/fix-qcoloroutput_p_h.patch |  13 -
 srcpkgs/qt/patches/fix-wtf_typetraits.patch   |  25 -
 srcpkgs/qt/patches/gcc-8.3.patch              | 236 ------
 srcpkgs/qt/patches/gcc9-qforeach.patch        |  67 --
 srcpkgs/qt/patches/improve-cups-support.patch |  84 --
 srcpkgs/qt/patches/kde4-settings.patch        |  11 -
 srcpkgs/qt/patches/libressl-2.8.patch         |  31 -
 srcpkgs/qt/patches/mips-sgidef.patch          |  11 -
 srcpkgs/qt/patches/moc-boost-workaround.patch |  12 -
 .../qt/patches/moc-syslib-workaround.patch    |  11 -
 ...rc_network_ssl_qsslsocket_openssl_cpp.diff |  34 -
 ...rk_ssl_qsslsocket_openssl_symbols_cpp.diff |  40 -
 srcpkgs/qt/patches/powerpc.patch              | 754 ------------------
 .../qsettings-recursive-global-mutex.patch    |  17 -
 srcpkgs/qt/patches/qt-clucene-timeb.patch     |  17 -
 srcpkgs/qt/patches/qt-gtk-theme-fix.patch     |  59 --
 srcpkgs/qt/patches/qt-musl-iconv-no-bom.patch |  11 -
 srcpkgs/qt/patches/qt-musl.patch              |  14 -
 srcpkgs/qt/template                           | 431 ----------
 40 files changed, 2548 deletions(-)
 delete mode 120000 srcpkgs/qt-designer
 delete mode 120000 srcpkgs/qt-designer-devel
 delete mode 120000 srcpkgs/qt-designer-libs
 delete mode 120000 srcpkgs/qt-devel
 delete mode 120000 srcpkgs/qt-devel-tools
 delete mode 120000 srcpkgs/qt-doc
 delete mode 120000 srcpkgs/qt-host-tools
 delete mode 120000 srcpkgs/qt-plugin-mysql
 delete mode 120000 srcpkgs/qt-plugin-odbc
 delete mode 120000 srcpkgs/qt-plugin-pgsql
 delete mode 120000 srcpkgs/qt-plugin-sqlite
 delete mode 120000 srcpkgs/qt-qmake
 delete mode 100644 srcpkgs/qt/files/assistant.desktop
 delete mode 100644 srcpkgs/qt/files/designer.desktop
 delete mode 100644 srcpkgs/qt/files/linguist.desktop
 delete mode 100644 srcpkgs/qt/files/qtconfig.desktop
 delete mode 100644 srcpkgs/qt/patches/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
 delete mode 100644 srcpkgs/qt/patches/aarch64.patch
 delete mode 100644 srcpkgs/qt/patches/fix-alsatest.patch
 delete mode 100644 srcpkgs/qt/patches/fix-bytecompiler_narrowing.patch
 delete mode 100644 srcpkgs/qt/patches/fix-itemviews.patch
 delete mode 100644 srcpkgs/qt/patches/fix-qcoloroutput_p_h.patch
 delete mode 100644 srcpkgs/qt/patches/fix-wtf_typetraits.patch
 delete mode 100644 srcpkgs/qt/patches/gcc-8.3.patch
 delete mode 100644 srcpkgs/qt/patches/gcc9-qforeach.patch
 delete mode 100644 srcpkgs/qt/patches/improve-cups-support.patch
 delete mode 100644 srcpkgs/qt/patches/kde4-settings.patch
 delete mode 100644 srcpkgs/qt/patches/libressl-2.8.patch
 delete mode 100644 srcpkgs/qt/patches/mips-sgidef.patch
 delete mode 100644 srcpkgs/qt/patches/moc-boost-workaround.patch
 delete mode 100644 srcpkgs/qt/patches/moc-syslib-workaround.patch
 delete mode 100644 srcpkgs/qt/patches/patch-src_network_ssl_qsslsocket_openssl_cpp.diff
 delete mode 100644 srcpkgs/qt/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp.diff
 delete mode 100644 srcpkgs/qt/patches/powerpc.patch
 delete mode 100644 srcpkgs/qt/patches/qsettings-recursive-global-mutex.patch
 delete mode 100644 srcpkgs/qt/patches/qt-clucene-timeb.patch
 delete mode 100644 srcpkgs/qt/patches/qt-gtk-theme-fix.patch
 delete mode 100644 srcpkgs/qt/patches/qt-musl-iconv-no-bom.patch
 delete mode 100644 srcpkgs/qt/patches/qt-musl.patch
 delete mode 100644 srcpkgs/qt/template

diff --git a/srcpkgs/qt-designer b/srcpkgs/qt-designer
deleted file mode 120000
index 382f738416a9..000000000000
--- a/srcpkgs/qt-designer
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-designer-devel b/srcpkgs/qt-designer-devel
deleted file mode 120000
index 382f738416a9..000000000000
--- a/srcpkgs/qt-designer-devel
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-designer-libs b/srcpkgs/qt-designer-libs
deleted file mode 120000
index 382f738416a9..000000000000
--- a/srcpkgs/qt-designer-libs
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-devel b/srcpkgs/qt-devel
deleted file mode 120000
index 382f738416a9..000000000000
--- a/srcpkgs/qt-devel
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-devel-tools b/srcpkgs/qt-devel-tools
deleted file mode 120000
index 382f738416a9..000000000000
--- a/srcpkgs/qt-devel-tools
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-doc b/srcpkgs/qt-doc
deleted file mode 120000
index 382f738416a9..000000000000
--- a/srcpkgs/qt-doc
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-host-tools b/srcpkgs/qt-host-tools
deleted file mode 120000
index 382f738416a9..000000000000
--- a/srcpkgs/qt-host-tools
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-plugin-mysql b/srcpkgs/qt-plugin-mysql
deleted file mode 120000
index 382f738416a9..000000000000
--- a/srcpkgs/qt-plugin-mysql
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-plugin-odbc b/srcpkgs/qt-plugin-odbc
deleted file mode 120000
index 382f738416a9..000000000000
--- a/srcpkgs/qt-plugin-odbc
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-plugin-pgsql b/srcpkgs/qt-plugin-pgsql
deleted file mode 120000
index 382f738416a9..000000000000
--- a/srcpkgs/qt-plugin-pgsql
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-plugin-sqlite b/srcpkgs/qt-plugin-sqlite
deleted file mode 120000
index 382f738416a9..000000000000
--- a/srcpkgs/qt-plugin-sqlite
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-qmake b/srcpkgs/qt-qmake
deleted file mode 120000
index 382f738416a9..000000000000
--- a/srcpkgs/qt-qmake
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt/files/assistant.desktop b/srcpkgs/qt/files/assistant.desktop
deleted file mode 100644
index 93c392f8a65b..000000000000
--- a/srcpkgs/qt/files/assistant.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=assistant-qt4
-Name=Qt Assistant
-GenericName=Qt Document Browser
-Icon=assistant
-Terminal=false
-Type=Application
-Categories=Qt;Development;Documentation
diff --git a/srcpkgs/qt/files/designer.desktop b/srcpkgs/qt/files/designer.desktop
deleted file mode 100644
index 4b4edce86969..000000000000
--- a/srcpkgs/qt/files/designer.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Exec=designer-qt4
-Name=Qt Designer
-GenericName=Interface Designer
-MimeType=application/x-designer
-Icon=designer
-Terminal=false
-Type=Application
-Categories=Qt;Development;GUIDesigner
diff --git a/srcpkgs/qt/files/linguist.desktop b/srcpkgs/qt/files/linguist.desktop
deleted file mode 100644
index 044a7283a4b6..000000000000
--- a/srcpkgs/qt/files/linguist.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Exec=linguist-qt4
-Name=Qt Linguist
-GenericName=Translation Tool
-MimeType=application/x-linguist
-Terminal=false
-Type=Application
-Icon=linguist
-Categories=Qt;Development;Translation
diff --git a/srcpkgs/qt/files/qtconfig.desktop b/srcpkgs/qt/files/qtconfig.desktop
deleted file mode 100644
index 357c52b7256e..000000000000
--- a/srcpkgs/qt/files/qtconfig.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Qt Config 
-Comment=Configure Qt behavior, styles, fonts
-Exec=qtconfig-qt4
-Icon=qtlogo.png
-Terminal=false
-Type=Application
-Categories=Qt;Settings;
diff --git a/srcpkgs/qt/patches/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch b/srcpkgs/qt/patches/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
deleted file mode 100644
index 1d23c929f445..000000000000
--- a/srcpkgs/qt/patches/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2011bb8029480af1d1266f258e5a5f5cef7392d3 Mon Sep 17 00:00:00 2001
-From: Pavel Heimlich <tropikhajma@gmail.com>
-Date: Wed, 26 Sep 2012 20:31:10 +0200
-Subject: [PATCH 07/21] dbus: Remove "const" usage that causes compile failure
- building nativesdk-qt4-tools
-
-Patch has apparently been rejected upstream, not because it is invalid
-but because the submitter did not submit a merge request for it, so the
-validity of the patch upstream is uncertain. For further details see:
-https://bugreports.qt-project.org/browse/QTBUG-17962
-
-Upstream-Status: Denied [possible retry]
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- src/dbus/qdbusintegrator.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
-index 0f0b647..aa4cbab 100644
---- a/src/dbus/qdbusintegrator.cpp
-+++ b/src/dbus/qdbusintegrator.cpp
-@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
- static bool isDebugging;
- #define qDBusDebug              if (!::isDebugging); else qDebug
- 
--Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
-+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
- 
- static inline QString dbusServiceString()
- { return *orgFreedesktopDBusString(); }
--- 
-1.8.0
-
diff --git a/srcpkgs/qt/patches/aarch64.patch b/srcpkgs/qt/patches/aarch64.patch
deleted file mode 100644
index b4127f0c304c..000000000000
--- a/srcpkgs/qt/patches/aarch64.patch
+++ /dev/null
@@ -1,541 +0,0 @@
---- qt.orig/configure	2017-01-13 19:15:45.711744577 +0100
-+++ qt/configure	2017-01-13 19:28:48.368861990 +0100
-@@ -2812,6 +2812,9 @@
-             *86_64)
-                 PLATFORM=qws/linux-x86_64-g++
-                 ;;
-+            aarch64)
-+                PLATFORM=qws/linux-aarch64-g++
-+                ;;
-             *)
-                 PLATFORM=qws/linux-generic-g++
-                 ;;
-@@ -3257,6 +3260,12 @@
-         fi
-         CFG_HOST_ARCH=arm
-         ;;
-+    *:*:aarch64*)
-+        if [ "$OPT_VERBOSE" = "yes" ]; then
-+            echo "    AArch64 (aarch64)"
-+        fi
-+        CFG_HOST_ARCH=aarch64
-+        ;;
-     Linux:*:sparc*)
-         if [ "$OPT_VERBOSE" = "yes" ]; then
-             echo "    Linux on SPARC"
---- /dev/null
-+++ qt/mkspecs/linux-aarch64-g++/qplatformdefs.h
-@@ -0,0 +1,42 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-+** Contact: http://www.qt-project.org/legal
-+**
-+** This file is part of the qmake spec of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and Digia.  For licensing terms and
-+** conditions see http://qt.digia.com/licensing.  For further information
-+** use the contact form at http://qt.digia.com/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU Lesser General Public License version 2.1 requirements
-+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Digia gives you certain additional
-+** rights.  These rights are described in the Digia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3.0 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU General Public License version 3.0 requirements will be
-+** met: http://www.gnu.org/copyleft/gpl.html.
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include "../linux-g++/qplatformdefs.h"
---- /dev/null
-+++ qt/mkspecs/linux-aarch64-g++/qmake.conf
-@@ -0,0 +1,28 @@
-+#
-+# qmake configuration for linux-g++
-+#
-+# Written for GNU/Linux platforms that have both lib and lib64 directories,
-+# like the AMD Opteron.
-+#
-+
-+MAKEFILE_GENERATOR	= UNIX
-+TARGET_PLATFORM		= unix
-+TEMPLATE		= app
-+CONFIG			+= qt warn_on release incremental link_prl gdb_dwarf_index
-+QT			+= core gui
-+QMAKE_INCREMENTAL_STYLE = sublib
-+
-+QMAKE_CFLAGS		= -fpermissive
-+QMAKE_LFLAGS		=
-+
-+QMAKE_CFLAGS_RELEASE   += -O2
-+
-+include(../common/linux.conf)
-+include(../common/gcc-base-unix.conf)
-+include(../common/g++-unix.conf)
-+
-+
-+QMAKE_LIBDIR_X11      = /usr/X11R6/lib
-+QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
-+
-+load(qt_config)
---- /dev/null
-+++ qt/src/corelib/arch/aarch64/qatomic_aarch64.cpp
-@@ -0,0 +1,70 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2012, 2013 Digia Plc and/or its subsidiary(-ies).
-+** Contact: http://www.qt-project.org/legal
-+**
-+** This file is part of the QtCore module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and Digia.  For licensing terms and
-+** conditions see http://qt.digia.com/licensing.  For further information
-+** use the contact form at http://qt.digia.com/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU Lesser General Public License version 2.1 requirements
-+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Digia gives you certain additional
-+** rights.  These rights are described in the Digia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3.0 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU General Public License version 3.0 requirements will be
-+** met: http://www.gnu.org/copyleft/gpl.html.
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include <QtCore/qglobal.h>
-+
-+#include <unistd.h>
-+#ifdef _POSIX_PRIORITY_SCHEDULING
-+# include <sched.h>
-+#endif
-+#include <time.h>
-+
-+QT_BEGIN_NAMESPACE
-+
-+QT_USE_NAMESPACE
-+
-+Q_CORE_EXPORT void qt_atomic_yield(int *count)
-+{
-+#ifdef _POSIX_PRIORITY_SCHEDULING
-+    if((*count)++ < 50) {
-+        sched_yield();
-+    } else
-+#endif
-+    {
-+        struct timespec tm;
-+        tm.tv_sec = 0;
-+        tm.tv_nsec = 2000001;
-+        nanosleep(&tm, NULL);
-+        *count = 0;
-+    }
-+}
-+
-+QT_END_NAMESPACE
---- qt.orig/src/corelib/arch/arch.pri
-+++ qt/src/corelib/arch/arch.pri
-@@ -31,7 +31,9 @@ integrity:HEADERS += arch/qatomic_integr
-                        arch/qatomic_s390.h \
-                        arch/qatomic_x86_64.h \
-                        arch/qatomic_sh.h \
--                       arch/qatomic_sh4a.h
-+                       arch/qatomic_sh4a.h \
-+                       arch/qatomic_aarch64.h \
-+
- 
- QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH
- DEPENDPATH += $$QT_ARCH_CPP
---- /dev/null
-+++ qt/include/QtCore/qatomic_aarch64.h
-@@ -0,0 +1 @@
-+#include "../../src/corelib/arch/qatomic_aarch64.h"
---- /dev/null
-+++ qt/src/corelib/arch/qatomic_aarch64.h
-@@ -0,0 +1,335 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-+** Contact: http://www.qt-project.org/legal
-+**
-+** This file is part of the QtCore module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and Digia.  For licensing terms and
-+** conditions see http://qt.digia.com/licensing.  For further information
-+** use the contact form at http://qt.digia.com/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU Lesser General Public License version 2.1 requirements
-+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Digia gives you certain additional
-+** rights.  These rights are described in the Digia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3.0 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU General Public License version 3.0 requirements will be
-+** met: http://www.gnu.org/copyleft/gpl.html.
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#ifndef QATOMIC_AARCH64_H
-+#define QATOMIC_AARCH64_H
-+
-+QT_BEGIN_HEADER
-+
-+QT_BEGIN_NAMESPACE
-+
-+#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE
-+
-+inline bool QBasicAtomicInt::isReferenceCountingNative()
-+{ return true; }
-+inline bool QBasicAtomicInt::isReferenceCountingWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_INT_TEST_AND_SET_IS_ALWAYS_NATIVE
-+
-+inline bool QBasicAtomicInt::isTestAndSetNative()
-+{ return true; }
-+inline bool QBasicAtomicInt::isTestAndSetWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_INT_FETCH_AND_STORE_IS_ALWAYS_NATIVE
-+
-+inline bool QBasicAtomicInt::isFetchAndStoreNative()
-+{ return true; }
-+inline bool QBasicAtomicInt::isFetchAndStoreWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_INT_FETCH_AND_ADD_IS_ALWAYS_NATIVE
-+
-+inline bool QBasicAtomicInt::isFetchAndAddNative()
-+{ return true; }
-+inline bool QBasicAtomicInt::isFetchAndAddWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_POINTER_TEST_AND_SET_IS_ALWAYS_NATIVE
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetNative()
-+{ return true; }
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_ALWAYS_NATIVE
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreNative()
-+{ return true; }
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_ALWAYS_NATIVE
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddNative()
-+{ return true; }
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree()
-+{ return false; }
-+
-+#ifndef Q_DATA_MEMORY_BARRIER
-+# define Q_DATA_MEMORY_BARRIER asm volatile("dmb sy\n":::"memory")
-+#endif
-+#ifndef Q_COMPILER_MEMORY_BARRIER
-+# define Q_COMPILER_MEMORY_BARRIER asm volatile("":::"memory")
-+#endif
-+
-+inline bool QBasicAtomicInt::ref()
-+{
-+    int newValue;
-+
-+    Q_COMPILER_MEMORY_BARRIER;
-+    newValue = __atomic_add_fetch(&_q_value, 1, __ATOMIC_ACQ_REL);
-+    Q_COMPILER_MEMORY_BARRIER;
-+
-+    return newValue != 0;
-+}
-+
-+inline bool QBasicAtomicInt::deref()
-+{
-+    int newValue;
-+
-+    Q_COMPILER_MEMORY_BARRIER;
-+    newValue = __atomic_sub_fetch(&_q_value, 1, __ATOMIC_ACQ_REL);
-+    Q_COMPILER_MEMORY_BARRIER;
-+
-+    return newValue != 0;
-+}
-+
-+inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)
-+{
-+    bool val;
-+
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val =  __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue,
-+					false, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)
-+{
-+    int val;
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)
-+{
-+    int val;
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue)
-+{
-+    bool val;
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val =  __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue,
-+					false, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
-+{
-+    T *val;
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
-+{
-+    T *val;
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
-+}
-+
-+inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue)
-+{
-+    bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    return testAndSetRelaxed(expectedValue, newValue);
-+}
-+
-+inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue)
-+{
-+    int returnValue = fetchAndStoreRelaxed(newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    return fetchAndStoreRelaxed(newValue);
-+}
-+
-+inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    int returnValue = fetchAndStoreRelaxed(newValue);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd)
-+{
-+    int returnValue = fetchAndAddRelaxed(valueToAdd);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    return fetchAndAddRelaxed(valueToAdd);
-+}
-+
-+inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    int returnValue = fetchAndAddRelaxed(valueToAdd);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValue, T *newValue)
-+{
-+    bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T *expectedValue, T *newValue)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    return testAndSetRelaxed(expectedValue, newValue);
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    bool returnValue = testAndSetAcquire(expectedValue, newValue);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
-+{
-+    T *returnValue = fetchAndStoreRelaxed(newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    return fetchAndStoreRelaxed(newValue);
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    T *returnValue = fetchAndStoreRelaxed(newValue);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd)
-+{
-+    T *returnValue = fetchAndAddRelaxed(valueToAdd);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    return fetchAndAddRelaxed(valueToAdd);
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    T *returnValue = fetchAndAddRelaxed(valueToAdd);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+#undef Q_DATA_MEMORY_BARRIER
-+#undef Q_COMPILER_MEMORY_BARRIER
-+
-+QT_END_NAMESPACE
-+
-+QT_END_HEADER
-+
-+#endif // QATOMIC_AARCH64_H
---- qt.orig/src/corelib/arch/qatomic_arch.h
-+++ qt/src/corelib/arch/qatomic_arch.h
-@@ -94,6 +94,8 @@ QT_BEGIN_HEADER
- #  include "QtCore/qatomic_sh4a.h"
- #elif defined(QT_ARCH_NACL)
- #  include "QtCore/qatomic_generic.h"
-+#elif defined(QT_ARCH_AARCH64)
-+#  include "QtCore/qatomic_aarch64.h"
- #else
- #  error "Qt has not been ported to this architecture"
- #endif
-
diff --git a/srcpkgs/qt/patches/fix-alsatest.patch b/srcpkgs/qt/patches/fix-alsatest.patch
deleted file mode 100644
index 900eef2b8a55..000000000000
--- a/srcpkgs/qt/patches/fix-alsatest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Currently alsa-lib is at 1.1.2, thus accept SND_LIB_MINOR > 0 anyway.
-
---- a/config.tests/unix/alsa/alsatest.cpp	2015-05-07 16:14:42.000000000 +0200
-+++ b/config.tests/unix/alsa/alsatest.cpp	2016-09-11 22:51:18.647973737 +0200
-@@ -40,7 +40,7 @@
- ****************************************************************************/
- 
- #include <alsa/asoundlib.h>
--#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
-+#if(!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || (SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))))
- #error "Alsa version found too old, require >= 1.0.10"
- #endif
- 
diff --git a/srcpkgs/qt/patches/fix-bytecompiler_narrowing.patch b/srcpkgs/qt/patches/fix-bytecompiler_narrowing.patch
deleted file mode 100644
index 7a164e8b49be..000000000000
--- a/srcpkgs/qt/patches/fix-bytecompiler_narrowing.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix gcc6 -Wnarrowing errors by casting to uint32_t
-
---- a/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h	2015-05-07 16:14:47.000000000 +0200
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h	2016-09-11 22:26:00.614829051 +0200
-@@ -176,7 +176,7 @@
-             // Node::emitCode assumes that dst, if provided, is either a local or a referenced temporary.
-             ASSERT(!dst || dst == ignoredResult() || !dst->isTemporary() || dst->refCount());
-             if (!m_codeBlock->numberOfLineInfos() || m_codeBlock->lastLineInfo().lineNumber != n->lineNo()) {
--                LineInfo info = { instructions().size(), n->lineNo() };
-+                LineInfo info = { (uint32_t)instructions().size(), n->lineNo() };
-                 m_codeBlock->addLineInfo(info);
-             }
-             if (m_emitNodeDepth >= s_maxEmitNodeDepth)
-@@ -195,7 +195,7 @@
-         void emitNodeInConditionContext(ExpressionNode* n, Label* trueTarget, Label* falseTarget, bool fallThroughMeansTrue)
-         {
-             if (!m_codeBlock->numberOfLineInfos() || m_codeBlock->lastLineInfo().lineNumber != n->lineNo()) {
--                LineInfo info = { instructions().size(), n->lineNo() };
-+                LineInfo info = { (uint32_t)instructions().size(), n->lineNo() };
-                 m_codeBlock->addLineInfo(info);
-             }
-             if (m_emitNodeDepth >= s_maxEmitNodeDepth)
diff --git a/srcpkgs/qt/patches/fix-itemviews.patch b/srcpkgs/qt/patches/fix-itemviews.patch
deleted file mode 100644
index 5b1d601cf44b..000000000000
--- a/srcpkgs/qt/patches/fix-itemviews.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This & seems wrong, but the static_cast to QItemSelectionModel::SelectionFlags
-is required anyway to make gcc6 happy.
-
---- a/src/plugins/accessible/widgets/itemviews.cpp	2015-05-07 16:14:48.000000000 +0200
-+++ b/src/plugins/accessible/widgets/itemviews.cpp	2016-09-11 23:17:33.960195447 +0200
-@@ -393,7 +393,7 @@
-     QModelIndex index = view()->model()->index(0, column, view()->rootIndex());
-     if (!index.isValid() || view()->selectionMode() & QAbstractItemView::NoSelection)
-         return false;
--    view()->selectionModel()->select(index, QItemSelectionModel::Columns & QItemSelectionModel::Deselect);
-+    view()->selectionModel()->select(index, static_cast<QItemSelectionModel::SelectionFlags>(QItemSelectionModel::Columns & QItemSelectionModel::Deselect));
-     return true;
- }
- 
diff --git a/srcpkgs/qt/patches/fix-qcoloroutput_p_h.patch b/srcpkgs/qt/patches/fix-qcoloroutput_p_h.patch
deleted file mode 100644
index 2132b9d779aa..000000000000
--- a/srcpkgs/qt/patches/fix-qcoloroutput_p_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/xmlpatterns/api/qcoloroutput_p.h	2015-05-07 16:14:48.000000000 +0200
-+++ b/src/xmlpatterns/api/qcoloroutput_p.h	2016-09-11 22:21:15.868628553 +0200
-@@ -70,8 +70,8 @@
-             ForegroundShift = 10,
-             BackgroundShift = 20,
-             SpecialShift    = 20,
--            ForegroundMask  = ((1 << ForegroundShift) - 1) << ForegroundShift,
--            BackgroundMask  = ((1 << BackgroundShift) - 1) << BackgroundShift
-+            ForegroundMask  = ((1 << ForegroundShift) - 1),
-+            BackgroundMask  = ((1 << BackgroundShift) - 1)
-         };
- 
-     public:
diff --git a/srcpkgs/qt/patches/fix-wtf_typetraits.patch b/srcpkgs/qt/patches/fix-wtf_typetraits.patch
deleted file mode 100644
index 27d20466c08a..000000000000
--- a/srcpkgs/qt/patches/fix-wtf_typetraits.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix type_traits for newer compilers (both, gcc-4.9.4 and gcc-6.2.0)
-There is no std::tr1::has_trivial_constructor etc. anymore.
-
---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h	2016-09-12 01:09:46.592885353 +0200
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h	2016-09-12 01:20:07.594161571 +0200
-@@ -166,7 +166,7 @@
-         typedef T Type;
-     };
- 
--#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
-+#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && (__GLIBCXX__ < 20160726) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
- 
-     // GCC's libstdc++ 20070724 and later supports C++ TR1 type_traits in the std namespace.
-     // VC10 (VS2010) and later support C++ TR1 type_traits in the std::tr1 namespace.
---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/TypeTraits.h	2015-05-07 16:14:45.000000000 +0200
-+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/TypeTraits.h	2016-09-12 01:36:22.347445737 +0200
-@@ -179,7 +179,7 @@
-         typedef T Type;
-     };
- 
--#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
-+#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && (__GLIBCXX__ < 20160726) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
- 
-     // GCC's libstdc++ 20070724 and later supports C++ TR1 type_traits in the std namespace.
-     // VC10 (VS2010) and later support C++ TR1 type_traits in the std::tr1 namespace.
diff --git a/srcpkgs/qt/patches/gcc-8.3.patch b/srcpkgs/qt/patches/gcc-8.3.patch
deleted file mode 100644
index b9b45c313961..000000000000
--- a/srcpkgs/qt/patches/gcc-8.3.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-From 97ec1d1882a83c23c91f0f7daea48e05858d8c32 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Mon, 28 Jan 2019 14:33:12 -0800
-Subject: [PATCH] Fix build with GCC 8.3
-
-Qualifiers in the asm statement are not allowed in the global scope. I
-thought they were necessary for LTO, but I the commit to this file that
-added them predates my work on setting up LTO for GCC.
-
-Change-Id: Id98140e1c2f0426cabbefffd157e23e5ece67a49
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- .../JavaScriptCore/jit/JITStubs.cpp           | 48 +++++++++----------
- 1 file changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
-index 1abdf8b..9f60761 100644
---- qtscript/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
-+++ qtscript/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
-@@ -116,7 +116,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x3c, JITStackFrame_s
- COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_callFrame_offset_matches_ctiTrampoline);
- COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x50, JITStackFrame_code_offset_matches_ctiTrampoline);
- 
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
-@@ -138,7 +138,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
-     "ret" "\n"
- );
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -154,7 +154,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-     "ret" "\n"
- );
-     
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
- HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
- SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
-@@ -179,7 +179,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x48, JITStackFrame_s
- COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90, JITStackFrame_callFrame_offset_matches_ctiTrampoline);
- COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80, JITStackFrame_code_offset_matches_ctiTrampoline);
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
- SYMBOL_STRING(ctiTrampoline) ":" "\n"
-@@ -206,7 +206,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
-     "ret" "\n"
- );
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -222,7 +222,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-     "ret" "\n"
- );
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
- HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
- SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
-@@ -242,7 +242,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
- #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7."
- #endif
- 
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
-@@ -269,7 +269,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
-     "bx lr" "\n"
- );
- 
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
-@@ -287,7 +287,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-     "bx lr" "\n"
- );
- 
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
-@@ -305,7 +305,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
- 
- #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL)
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
- SYMBOL_STRING(ctiTrampoline) ":" "\n"
-@@ -323,7 +323,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
-     "mov pc, lr" "\n"
- );
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -418,7 +418,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x38, JITStackFrame_
- COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x30, JITStackFrame_code_offset_matches_ctiTrampoline);
- COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x1c, JITStackFrame_stub_argument_space_matches_ctiTrampoline);
- 
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
-@@ -440,7 +440,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
-     "ret" "\n"
- );
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -456,7 +456,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-     "ret" "\n"
- );
-     
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
- HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
- SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
-@@ -480,7 +480,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_
- COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x48, JITStackFrame_code_offset_matches_ctiTrampoline);
- COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x78, JITStackFrame_stub_argument_space_matches_ctiTrampoline);
- 
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
-@@ -515,7 +515,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
-     "ret" "\n"
- );
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -531,7 +531,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-     "ret" "\n"
- );
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
- HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
- SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
-@@ -551,7 +551,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
- #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7."
- #endif
- 
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
-@@ -578,7 +578,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
-     "bx lr" "\n"
- );
- 
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
-@@ -596,7 +596,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-     "bx lr" "\n"
- );
- 
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
-@@ -614,7 +614,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
- 
- #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL)
- 
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
-@@ -632,7 +632,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
-     "mov pc, lr" "\n"
- );
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -1024,7 +1024,7 @@ static NEVER_INLINE void throwStackOverflowError(CallFrame* callFrame, JSGlobalD
-     extern "C" { \
-         rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \
-     }; \
--    asm volatile ( \
-+    asm ( \
-         ".text" "\n" \
-         ".align 2" "\n" \
-         ".globl " SYMBOL_STRING(cti_##op) "\n" \
-@@ -1053,7 +1053,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, thunkReturnAddress) == THUNK_RETUR
-     extern "C" { \
-         rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \
-     }; \
--    asm volatile ( \
-+    asm ( \
-         ".globl " SYMBOL_STRING(cti_##op) "\n" \
-         HIDE_SYMBOL(cti_##op) "\n"             \
-         SYMBOL_STRING(cti_##op) ":" "\n" \
-
diff --git a/srcpkgs/qt/patches/gcc9-qforeach.patch b/srcpkgs/qt/patches/gcc9-qforeach.patch
deleted file mode 100644
index a5397c9e4fc3..000000000000
--- a/srcpkgs/qt/patches/gcc9-qforeach.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-# reason: FTBFS with gcc9
-# src: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925811
-
-From c35a3f519007af44c3b364b9af86f6a336f6411b Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Tue, 11 Feb 2014 16:17:46 -0800
-Subject: [PATCH] Redo the Q_FOREACH loop control without GCC statement
- expressions
-
-It's possible to do without them, which probably makes the number of
-supported compilers a lot bigger: they just need to support decltype()
-or __typeof__.
-
-That includes the Intel compiler. The old code was also apparently
-working, but no one had realized the old workaround for some old version
-was still in place.
-
-The loop overhead is more or less the same. I have not done benchmarks,
-but inspection of the generated assembly shows more or less the same
-number of instructions.
-
-Change-Id: I32d499c84a6ddd19d994b49f17a469acb5c3a3f1
-Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
-Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
-
-Backported to Qt 4
-
---- a/src/corelib/global/qglobal.h
-+++ b/src/corelib/global/qglobal.h
-@@ -2482,22 +2482,32 @@ typedef uint Flags;
- 
- #endif /* Q_NO_TYPESAFE_FLAGS */
- 
--#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_RVCT)
-+#if (defined(Q_CC_GNU) && !defined(Q_CC_RVCT))
- /* make use of typeof-extension */
- template <typename T>
- class QForeachContainer {
- public:
--    inline QForeachContainer(const T& t) : c(t), brk(0), i(c.begin()), e(c.end()) { }
-+    inline QForeachContainer(const T& t) : c(t), i(c.begin()), e(c.end()), control(1) { }
-     const T c;
-     int brk;
-     typename T::const_iterator i, e;
-+    int control;
- };
- 
-+// Explanation of the control word:
-+//  - it's initialized to 1
-+//  - that means both the inner and outer loops start
-+//  - if there were no breaks, at the end of the inner loop, it's set to 0, which
-+//    causes it to exit (the inner loop is run exactly once)
-+//  - at the end of the outer loop, it's inverted, so it becomes 1 again, allowing
-+//    the outer loop to continue executing
-+//  - if there was a break inside the inner loop, it will exit with control still
-+//    set to 1; in that case, the outer loop will invert it to 0 and will exit too
- #define Q_FOREACH(variable, container)                                \
- for (QForeachContainer<__typeof__(container)> _container_(container); \
--     !_container_.brk && _container_.i != _container_.e;              \
--     __extension__  ({ ++_container_.brk; ++_container_.i; }))                       \
--    for (variable = *_container_.i;; __extension__ ({--_container_.brk; break;}))
-+     _container_.control && _container_.i != _container_.e;         \
-+     ++_container_.i, _container_.control ^= 1)                     \
-+    for (variable = *_container_.i; _container_.control; _container_.control = 0)
- 
- #else
- 
diff --git a/srcpkgs/qt/patches/improve-cups-support.patch b/srcpkgs/qt/patches/improve-cups-support.patch
deleted file mode 100644
index e0305e11b89a..000000000000
--- a/srcpkgs/qt/patches/improve-cups-support.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-28 04:34:16.000000000 +0100
-@@ -569,6 +569,32 @@
- void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
- {
-     options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
-+
-+    if (cups) {
-+        const ppd_option_t* duplex = cups->ppdOption("Duplex");
-+        if (duplex) {
-+            // copy default ppd duplex to qt dialog
-+            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+                options.duplexShort->setChecked(true);
-+            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+                options.duplexLong->setChecked(true);
-+            else
-+                options.noDuplex->setChecked(true);
-+        }
-+
-+        if (cups->currentPPD()) {
-+            // set default color
-+            if (cups->currentPPD()->color_device)
-+                options.color->setChecked(true);
-+            else
-+                options.grayscale->setChecked(true);
-+        }
-+
-+        // set collation
-+        const ppd_option_t *collate = cups->ppdOption("Collate");
-+        if (collate)
-+            options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
-+    }
- }
- #endif
- 
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp	2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp	2010-02-28 04:55:15.000000000 +0100
-@@ -627,6 +627,44 @@
-                && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
-         setOutputFormat(QPrinter::PdfFormat);
-     }
-+
-+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
-+    // fill in defaults from ppd file
-+    QCUPSSupport cups;
-+
-+    int printernum = -1;
-+    for (int i = 0; i < cups.availablePrintersCount(); i++) {
-+        if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
-+            printernum = i;
-+    }
-+    if (printernum >= 0) {
-+        cups.setCurrentPrinter(printernum);
-+
-+        const ppd_option_t* duplex = cups.ppdOption("Duplex");
-+        if (duplex) {
-+            // copy default ppd duplex to qt dialog
-+            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+                setDuplex(DuplexShortSide);
-+            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+                setDuplex(DuplexLongSide);
-+            else
-+                setDuplex(DuplexNone);
-+        }
-+
-+        if (cups.currentPPD()) {
-+            // set default color
-+            if (cups.currentPPD()->color_device)
-+                setColorMode(Color);
-+            else
-+                setColorMode(GrayScale);
-+        }
-+
-+        // set collation
-+        const ppd_option_t *collate = cups.ppdOption("Collate");
-+        if (collate)
-+            setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
-+    }
-+#endif
- }
- 
- /*!
diff --git a/srcpkgs/qt/patches/kde4-settings.patch b/srcpkgs/qt/patches/kde4-settings.patch
deleted file mode 100644
index 747ca4cfd647..000000000000
--- a/srcpkgs/qt/patches/kde4-settings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/gui/kernel/qkde.cpp.orig	2015-05-27 11:42:02.507129332 +0200
-+++ b/src/gui/kernel/qkde.cpp	2015-05-27 11:43:26.182875729 +0200
-@@ -63,7 +63,7 @@
-         kdeHomePath = QString::fromLocal8Bit(qgetenv("KDEHOME"));
-         if (kdeHomePath.isEmpty()) {
-             QDir homeDir(QDir::homePath());
--            QString kdeConfDir(QLatin1String("/.kde"));
-+            QString kdeConfDir(QLatin1String("/.kde4"));
-             if (4 == X11->desktopVersion && homeDir.exists(QLatin1String(".kde4")))
-             kdeConfDir = QLatin1String("/.kde4");
-             kdeHomePath = QDir::homePath() + kdeConfDir;
diff --git a/srcpkgs/qt/patches/libressl-2.8.patch b/srcpkgs/qt/patches/libressl-2.8.patch
deleted file mode 100644
index 11b149288113..000000000000
--- a/srcpkgs/qt/patches/libressl-2.8.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp      2018-10-28 11:09:30.259495644 +0100
-+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp      2018-10-28 11:10:29.941933269 +0100
-@@ -111,10 +111,10 @@
- DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return);
- DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return)
- DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return)
--DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return)
-+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return)
- DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return)
- DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return)
--DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
-+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
- DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return)
- DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return)
- DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return)
-
---- a/src/network/ssl/qsslsocket_openssl_symbols_p.h      2018-10-28 11:20:59.516033387 +0100
-+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h      2018-10-28 11:20:31.770292922 +0100
-@@ -207,10 +207,10 @@
- int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b);
- long q_BIO_ctrl(BIO *a, int b, long c, void *d);
- int q_BIO_free(BIO *a);
--BIO *q_BIO_new(BIO_METHOD *a);
-+BIO *q_BIO_new(const BIO_METHOD *a);
- BIO *q_BIO_new_mem_buf(void *a, int b);
- int q_BIO_read(BIO *a, void *b, int c);
--BIO_METHOD *q_BIO_s_mem();
-+const BIO_METHOD *q_BIO_s_mem();
- int q_BIO_write(BIO *a, const void *b, int c);
- int q_BN_num_bits(const BIGNUM *a);
- int q_CRYPTO_num_locks();
diff --git a/srcpkgs/qt/patches/mips-sgidef.patch b/srcpkgs/qt/patches/mips-sgidef.patch
deleted file mode 100644
index b0d8181182ec..000000000000
--- a/srcpkgs/qt/patches/mips-sgidef.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2015-05-07 16:14:48.000000000 +0200
-+++ qt/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2017-01-14 19:34:43.375000207 +0100
-@@ -336,7 +336,7 @@
- /* CPU(MIPS) - MIPS, any version */
- #if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_))
- #define WTF_CPU_MIPS 1
--#include <sgidefs.h>
-+#include <asm/sgidefs.h>
- #if defined(__MIPSEB__)
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
diff --git a/srcpkgs/qt/patches/moc-boost-workaround.patch b/srcpkgs/qt/patches/moc-boost-workaround.patch
deleted file mode 100644
index 027f8064dcfc..000000000000
--- a/srcpkgs/qt/patches/moc-boost-workaround.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp
---- qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp	2014-04-10 21:37:12.000000000 +0300
-+++ qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp	2014-11-06 02:24:44.287305916 +0200
-@@ -190,6 +190,8 @@ int runMoc(int _argc, char **_argv)
- 
-     // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
-     pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
-+    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
-+    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
- 
-     QByteArray filename;
-     QByteArray output;
diff --git a/srcpkgs/qt/patches/moc-syslib-workaround.patch b/srcpkgs/qt/patches/moc-syslib-workaround.patch
deleted file mode 100644
index ac7d5e648301..000000000000
--- a/srcpkgs/qt/patches/moc-syslib-workaround.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp	2017-02-20 18:21:15.826212874 +0100
-+++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp	2017-02-20 18:23:02.448342205 +0100
-@@ -192,6 +192,8 @@
-     pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
-     pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
-     pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
-+    // Workaround a bug where newer kernel-libc-headers sys/sysmacros.h define macros like major, minor
-+    pp.macros["_SYS_SYSMACROS_H_OUTER"];
- 
-     QByteArray filename;
-     QByteArray output;
diff --git a/srcpkgs/qt/patches/patch-src_network_ssl_qsslsocket_openssl_cpp.diff b/srcpkgs/qt/patches/patch-src_network_ssl_qsslsocket_openssl_cpp.diff
deleted file mode 100644
index c7f7c2e30e27..000000000000
--- a/srcpkgs/qt/patches/patch-src_network_ssl_qsslsocket_openssl_cpp.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-$OpenBSD: patch-src_network_ssl_qsslsocket_openssl_cpp,v 1.4 2016/01/06 17:17:32 zhuk Exp $
-1.  Disable SSLv3 by default.
-2.  TLSv1_*_method() are TLSv1.0-only, so default to SSLv23_*_method(), which is
-    actually TLSv1.* nowadays.
-2a. Make QSsl::TlsV1 also use SSLv23_*_method(), noone in good mind would
-    want to run TLSv1.0-only connections, and too many developers fail
-    same way due to bad naming.
-
---- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp.orig	Thu May  7 17:14:44 2015
-+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp	Wed Jan  6 20:10:23 2016
-@@ -267,16 +267,18 @@ init_context:
- #endif
-         break;
-     case QSsl::SslV3:
-+#ifndef OPENSSL_NO_SSL3
-         ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
-+#else
-+        ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error
-+#endif
-         break;
--    case QSsl::SecureProtocols: // SslV2 will be disabled below
--    case QSsl::TlsV1SslV3: // SslV2 will be disabled below
-     case QSsl::AnyProtocol:
-+    case QSsl::SecureProtocols:
-+    case QSsl::TlsV1SslV3:
-+    case QSsl::TlsV1:   // this is TLSv1.0 only case, but misused as TLSv1.x too often
-     default:
-         ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method());
--        break;
--    case QSsl::TlsV1:
--        ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method());
-         break;
-     }
-     if (!ctx) {
diff --git a/srcpkgs/qt/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp.diff b/srcpkgs/qt/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp.diff
deleted file mode 100644
index 2f8c6777aac0..000000000000
--- a/srcpkgs/qt/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-$OpenBSD: patch-src_network_ssl_qsslsocket_openssl_symbols_cpp,v 1.3 2015/09/17 12:24:42 dcoppa Exp $
-
---- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	Wed Sep 16 13:27:39 2015
-+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp	Wed Sep 16 13:33:06 2015
-@@ -228,13 +228,17 @@ DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, re
- #ifndef OPENSSL_NO_SSL2
- DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
- #endif
-+#ifndef OPENSSL_NO_SSL3
- DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
-+#endif
- DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
- DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
- #ifndef OPENSSL_NO_SSL2
- DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
- #endif
-+#ifndef OPENSSL_NO_SSL3
- DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
-+#endif
- DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
- DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
- #else
-@@ -822,13 +826,17 @@ bool q_resolveOpenSslSymbols()
- #ifndef OPENSSL_NO_SSL2
-     RESOLVEFUNC(SSLv2_client_method)
- #endif
-+#ifndef OPENSSL_NO_SSL3
-     RESOLVEFUNC(SSLv3_client_method)
-+#endif
-     RESOLVEFUNC(SSLv23_client_method)
-     RESOLVEFUNC(TLSv1_client_method)
- #ifndef OPENSSL_NO_SSL2
-     RESOLVEFUNC(SSLv2_server_method)
- #endif
-+#ifndef OPENSSL_NO_SSL3
-     RESOLVEFUNC(SSLv3_server_method)
-+#endif
-     RESOLVEFUNC(SSLv23_server_method)
-     RESOLVEFUNC(TLSv1_server_method)
-     RESOLVEFUNC(X509_NAME_entry_count)
diff --git a/srcpkgs/qt/patches/powerpc.patch b/srcpkgs/qt/patches/powerpc.patch
deleted file mode 100644
index b3b0e313571f..000000000000
--- a/srcpkgs/qt/patches/powerpc.patch
+++ /dev/null
@@ -1,754 +0,0 @@
-Source: @pullmoll
-Upstream: no (Qt4 is dead)
-Reason: Implement atomic operations like it was done for aarch64 using gcc builtins
-
-diff -rub qt.orig/src/corelib/arch/powerpc/arch.pri qt/src/corelib/arch/powerpc/arch.pri
---- qt.orig/src/corelib/arch/powerpc/arch.pri	2015-05-07 16:14:48.000000000 +0200
-+++ qt/src/corelib/arch/powerpc/arch.pri	2019-06-13 13:29:09.168289246 +0200
-@@ -1,10 +1,4 @@
- #
- # PowerPC architecture
- #
--!*-g++* {
--    *-64 {
--        SOURCES += $$QT_ARCH_CPP/qatomic64.s
--    } else {
--        SOURCES += $$QT_ARCH_CPP/qatomic32.s
--    }
--}
-+SOURCES += $$QT_ARCH_CPP/qatomic_powerpc.cpp
-diff -rub qt.orig/src/corelib/arch/qatomic_powerpc.h qt/corelib/arch/qatomic_powerpc.h
---- qt.orig/src/corelib/arch/qatomic_powerpc.h	2015-05-07 16:14:48.000000000 +0200
-+++ qt/src/corelib/arch/qatomic_powerpc.h	2019-06-13 13:30:55.499295070 +0200
-@@ -101,546 +101,233 @@
- Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree()
- { return false; }
- 
--#if defined(Q_CC_GNU)
--
--#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2) \
--    || (!defined(__64BIT__) && !defined(__powerpc64__) && !defined(__ppc64__))
--#  define _Q_VALUE "0, %[_q_value]"
--#  define _Q_VALUE_MEMORY_OPERAND "+m" (_q_value)
--#  define _Q_VALUE_REGISTER_OPERAND [_q_value] "r" (&_q_value),
--#else
--// On 64-bit with gcc >= 4.2
--#  define _Q_VALUE "%y[_q_value]"
--#  define _Q_VALUE_MEMORY_OPERAND [_q_value] "+Z" (_q_value)
--#  define _Q_VALUE_REGISTER_OPERAND
-+#ifndef Q_DATA_MEMORY_BARRIER
-+# define Q_DATA_MEMORY_BARRIER asm volatile("sync\n":::"memory")
-+#endif
-+#ifndef Q_COMPILER_MEMORY_BARRIER
-+# define Q_COMPILER_MEMORY_BARRIER asm volatile("":::"memory")
- #endif
- 
- inline bool QBasicAtomicInt::ref()
- {
--    register int originalValue;
--    register int newValue;
--    asm volatile("lwarx  %[originalValue]," _Q_VALUE "\n"
--                 "addi   %[newValue], %[originalValue], %[one]\n"
--                 "stwcx. %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-12\n"
--                 : [originalValue] "=&b" (originalValue),
--                   [newValue] "=&r" (newValue),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [one] "i" (1)
--                 : "cc", "memory");
-+    int newValue;
-+
-+    Q_COMPILER_MEMORY_BARRIER;
-+    newValue = __atomic_add_fetch(&_q_value, 1, __ATOMIC_ACQ_REL);
-+    Q_COMPILER_MEMORY_BARRIER;
-+
-     return newValue != 0;
- }
- 
- inline bool QBasicAtomicInt::deref()
- {
--    register int originalValue;
--    register int newValue;
--    asm volatile("lwarx  %[originalValue]," _Q_VALUE "\n"
--                 "addi   %[newValue], %[originalValue], %[minusOne]\n"
--                 "stwcx. %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-12\n"
--                 : [originalValue] "=&b" (originalValue),
--                   [newValue] "=&r" (newValue),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [minusOne] "i" (-1)
--                 : "cc", "memory");
-+    int newValue;
-+
-+    Q_COMPILER_MEMORY_BARRIER;
-+    newValue = __atomic_sub_fetch(&_q_value, 1, __ATOMIC_ACQ_REL);
-+    Q_COMPILER_MEMORY_BARRIER;
-+
-     return newValue != 0;
- }
- 
- inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)
- {
--    register int result;
--    asm volatile("lwarx  %[result]," _Q_VALUE "\n"
--                 "xor.   %[result], %[result], %[expectedValue]\n"
--                 "bne    $+12\n"
--                 "stwcx. %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-16\n"
--                 : [result] "=&r" (result),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [expectedValue] "r" (expectedValue),
--                   [newValue] "r" (newValue)
--                 : "cc", "memory");
--    return result == 0;
--}
-+    bool val;
- 
--inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue)
--{
--    register int result;
--    asm volatile("lwarx  %[result]," _Q_VALUE "\n"
--                 "xor.   %[result], %[result], %[expectedValue]\n"
--                 "bne    $+16\n"
--                 "stwcx. %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-16\n"
--                 "isync\n"
--                 : [result] "=&r" (result),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [expectedValue] "r" (expectedValue),
--                   [newValue] "r" (newValue)
--                 : "cc", "memory");
--    return result == 0;
--}
--
--inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)
--{
--    register int result;
--    asm volatile("eieio\n"
--                 "lwarx  %[result]," _Q_VALUE "\n"
--                 "xor.   %[result], %[result], %[expectedValue]\n"
--                 "bne    $+12\n"
--                 "stwcx. %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-16\n"
--                 : [result] "=&r" (result),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [expectedValue] "r" (expectedValue),
--                   [newValue] "r" (newValue)
--                 : "cc", "memory");
--    return result == 0;
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val =  __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue,
-+					false, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
- }
- 
- inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)
- {
--    register int originalValue;
--    asm volatile("lwarx  %[originalValue]," _Q_VALUE "\n"
--                 "stwcx. %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-8\n"
--                 : [originalValue] "=&r" (originalValue),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [newValue] "r" (newValue)
--                 : "cc", "memory");
--    return originalValue;
--}
--
--inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue)
--{
--    register int originalValue;
--    asm volatile("lwarx  %[originalValue]," _Q_VALUE "\n"
--                 "stwcx. %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-8\n"
--                 "isync\n"
--                 : [originalValue] "=&r" (originalValue),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [newValue] "r" (newValue)
--                 : "cc", "memory");
--    return originalValue;
--}
--
--inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue)
--{
--    register int originalValue;
--    asm volatile("eieio\n"
--                 "lwarx  %[originalValue]," _Q_VALUE "\n"
--                 "stwcx. %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-8\n"
--                 : [originalValue] "=&r" (originalValue),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [newValue] "r" (newValue)
--                 : "cc", "memory");
--    return originalValue;
-+    int val;
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
- }
- 
- inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)
- {
--    register int originalValue;
--    register int newValue;
--    asm volatile("lwarx  %[originalValue]," _Q_VALUE "\n"
--                 "add    %[newValue], %[originalValue], %[valueToAdd]\n"
--                 "stwcx. %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-12\n"
--                 : [originalValue] "=&r" (originalValue),
--                   [newValue] "=&r" (newValue),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [valueToAdd] "r" (valueToAdd)
--                 : "cc", "memory");
--    return originalValue;
-+    int val;
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
- }
- 
--inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd)
--{
--    register int originalValue;
--    register int newValue;
--    asm volatile("lwarx  %[originalValue]," _Q_VALUE "\n"
--                 "add    %[newValue], %[originalValue], %[valueToAdd]\n"
--                 "stwcx. %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-12\n"
--                 "isync\n"
--                 : [originalValue] "=&r" (originalValue),
--                   [newValue] "=&r" (newValue),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [valueToAdd] "r" (valueToAdd)
--                 : "cc", "memory");
--    return originalValue;
--}
--
--inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)
--{
--    register int originalValue;
--    register int newValue;
--    asm volatile("eieio\n"
--                 "lwarx  %[originalValue]," _Q_VALUE "\n"
--                 "add    %[newValue], %[originalValue], %[valueToAdd]\n"
--                 "stwcx. %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-12\n"
--                 : [originalValue] "=&r" (originalValue),
--                   [newValue] "=&r" (newValue),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [valueToAdd] "r" (valueToAdd)
--                 : "cc", "memory");
--    return originalValue;
--}
--
--#if defined(__64BIT__) || defined(__powerpc64__) || defined(__ppc64__)
--#  define LPARX "ldarx"
--#  define STPCX "stdcx."
--#else
--#  define LPARX "lwarx"
--#  define STPCX "stwcx."
--#endif
--
- template <typename T>
- Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue)
- {
--    register void *result;
--    asm volatile(LPARX"  %[result]," _Q_VALUE "\n"
--                 "xor.   %[result], %[result], %[expectedValue]\n"
--                 "bne    $+12\n"
--                 STPCX"  %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-16\n"
--                 : [result] "=&r" (result),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [expectedValue] "r" (expectedValue),
--                   [newValue] "r" (newValue)
--                 : "cc", "memory");
--    return result == 0;
--}
--
--template <typename T>
--Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValue, T *newValue)
--{
--    register void *result;
--    asm volatile(LPARX"  %[result]," _Q_VALUE "\n"
--                 "xor.   %[result], %[result], %[expectedValue]\n"
--                 "bne    $+16\n"
--                 STPCX"  %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-16\n"
--                 "isync\n"
--                 : [result] "=&r" (result),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [expectedValue] "r" (expectedValue),
--                   [newValue] "r" (newValue)
--                 : "cc", "memory");
--    return result == 0;
--}
--
--template <typename T>
--Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T *expectedValue, T *newValue)
--{
--    register void *result;
--    asm volatile("eieio\n"
--                 LPARX"  %[result]," _Q_VALUE "\n"
--                 "xor.   %[result], %[result], %[expectedValue]\n"
--                 "bne    $+12\n"
--                 STPCX"  %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-16\n"
--                 : [result] "=&r" (result),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [expectedValue] "r" (expectedValue),
--                   [newValue] "r" (newValue)
--                 : "cc", "memory");
--    return result == 0;
-+    bool val;
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val =  __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue,
-+					false, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
- }
- 
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
- {
--    register T *originalValue;
--    asm volatile(LPARX"  %[originalValue]," _Q_VALUE "\n"
--                 STPCX"  %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-8\n"
--                 : [originalValue] "=&r" (originalValue),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [newValue] "r" (newValue)
--                 : "cc", "memory");
--    return originalValue;
--}
--
--template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
--{
--    register T *originalValue;
--    asm volatile(LPARX"  %[originalValue]," _Q_VALUE "\n"
--                 STPCX"  %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-8\n"
--                 "isync\n"
--                 : [originalValue] "=&r" (originalValue),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [newValue] "r" (newValue)
--                 : "cc", "memory");
--    return originalValue;
--}
--
--template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
--{
--    register T *originalValue;
--    asm volatile("eieio\n"
--                 LPARX"  %[originalValue]," _Q_VALUE "\n"
--                 STPCX"  %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-8\n"
--                 : [originalValue] "=&r" (originalValue),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [newValue] "r" (newValue)
--                 : "cc", "memory");
--    return originalValue;
-+    T *val;
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
- }
- 
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
- {
--    register T *originalValue;
--    register T *newValue;
--    asm volatile(LPARX"  %[originalValue]," _Q_VALUE "\n"
--                 "add    %[newValue], %[originalValue], %[valueToAdd]\n"
--                 STPCX"  %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-12\n"
--                 : [originalValue] "=&r" (originalValue),
--                   [newValue] "=&r" (newValue),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [valueToAdd] "r" (valueToAdd * sizeof(T))
--                 : "cc", "memory");
--    return originalValue;
--}
--
--template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd)
--{
--    register T *originalValue;
--    register T *newValue;
--    asm volatile(LPARX"  %[originalValue]," _Q_VALUE "\n"
--                 "add    %[newValue], %[originalValue], %[valueToAdd]\n"
--                 STPCX"  %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-12\n"
--                 "isync\n"
--                 : [originalValue] "=&r" (originalValue),
--                   [newValue] "=&r" (newValue),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [valueToAdd] "r" (valueToAdd * sizeof(T))
--                 : "cc", "memory");
--    return originalValue;
--}
--
--template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd)
--{
--    register T *originalValue;
--    register T *newValue;
--    asm volatile("eieio\n"
--                 LPARX"  %[originalValue]," _Q_VALUE "\n"
--                 "add    %[newValue], %[originalValue], %[valueToAdd]\n"
--                 STPCX"  %[newValue]," _Q_VALUE "\n"
--                 "bne-   $-12\n"
--                 : [originalValue] "=&r" (originalValue),
--                   [newValue] "=&r" (newValue),
--                   _Q_VALUE_MEMORY_OPERAND
--                 : _Q_VALUE_REGISTER_OPERAND
--                   [valueToAdd] "r" (valueToAdd * sizeof(T))
--                 : "cc", "memory");
--    return originalValue;
--}
--
--#undef LPARX
--#undef STPCX
--#undef _Q_VALUE
--#undef _Q_VALUE_MEMORY_OPERAND
--#undef _Q_VALUE_REGISTER_OPERAND
--
--#else
--
--extern "C" {
--    int q_atomic_test_and_set_int(volatile int *ptr, int expectedValue, int newValue);
--    int q_atomic_test_and_set_acquire_int(volatile int *ptr, int expectedValue, int newValue);
--    int q_atomic_test_and_set_release_int(volatile int *ptr, int expectedValue, int newValue);
--    int q_atomic_test_and_set_ptr(volatile void *ptr, void *expectedValue, void *newValue);
--    int q_atomic_test_and_set_acquire_ptr(volatile void *ptr, void *expectedValue, void *newValue);
--    int q_atomic_test_and_set_release_ptr(volatile void *ptr, void *expectedValue, void *newValue);
--    int q_atomic_increment(volatile int *);
--    int q_atomic_decrement(volatile int *);
--    int q_atomic_set_int(volatile int *, int);
--    int q_atomic_fetch_and_store_acquire_int(volatile int *ptr, int newValue);
--    int q_atomic_fetch_and_store_release_int(volatile int *ptr, int newValue);
--    void *q_atomic_set_ptr(volatile void *, void *);
--    int q_atomic_fetch_and_store_acquire_ptr(volatile void *ptr, void *newValue);
--    int q_atomic_fetch_and_store_release_ptr(volatile void *ptr, void *newValue);
--    int q_atomic_fetch_and_add_int(volatile int *ptr, int valueToAdd);
--    int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int valueToAdd);
--    int q_atomic_fetch_and_add_release_int(volatile int *ptr, int valueToAdd);
--    void *q_atomic_fetch_and_add_ptr(volatile void *ptr, qptrdiff valueToAdd);
--    void *q_atomic_fetch_and_add_acquire_ptr(volatile void *ptr, qptrdiff valueToAdd);
--    void *q_atomic_fetch_and_add_release_ptr(volatile void *ptr, qptrdiff valueToAdd);
--} // extern "C"
--
--
--inline bool QBasicAtomicInt::ref()
--{
--    return q_atomic_increment(&_q_value) != 0;
--}
--
--inline bool QBasicAtomicInt::deref()
--{
--    return q_atomic_decrement(&_q_value) != 0;
--}
--
--inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)
--{
--    return q_atomic_test_and_set_int(&_q_value, expectedValue, newValue) != 0;
-+    T *val;
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
- }
- 
- inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue)
- {
--    return q_atomic_test_and_set_acquire_int(&_q_value, expectedValue, newValue) != 0;
-+    bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)
- {
--    return q_atomic_test_and_set_release_int(&_q_value, expectedValue, newValue) != 0;
-+    Q_DATA_MEMORY_BARRIER;
-+    return testAndSetRelaxed(expectedValue, newValue);
- }
- 
--inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)
-+inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)
- {
--    return q_atomic_set_int(&_q_value, newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue)
- {
--    return q_atomic_fetch_and_store_acquire_int(&_q_value, newValue);
-+    int returnValue = fetchAndStoreRelaxed(newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue)
- {
--    return q_atomic_fetch_and_store_release_int(&_q_value, newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return fetchAndStoreRelaxed(newValue);
- }
- 
--inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)
-+inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)
- {
--    return q_atomic_fetch_and_add_int(&_q_value, valueToAdd);
-+    Q_DATA_MEMORY_BARRIER;
-+    int returnValue = fetchAndStoreRelaxed(newValue);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd)
- {
--    return q_atomic_fetch_and_add_acquire_int(&_q_value, valueToAdd);
-+    int returnValue = fetchAndAddRelaxed(valueToAdd);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)
- {
--    return q_atomic_fetch_and_add_release_int(&_q_value, valueToAdd);
-+    Q_DATA_MEMORY_BARRIER;
-+    return fetchAndAddRelaxed(valueToAdd);
- }
- 
--template <typename T>
--Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue)
-+inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)
- {
--    return q_atomic_test_and_set_ptr(&_q_value, expectedValue, newValue) != 0;
-+    Q_DATA_MEMORY_BARRIER;
-+    int returnValue = fetchAndAddRelaxed(valueToAdd);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- template <typename T>
- Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValue, T *newValue)
- {
--    return q_atomic_test_and_set_acquire_ptr(&_q_value, expectedValue, newValue) != 0;
-+    bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- template <typename T>
- Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T *expectedValue, T *newValue)
- {
--    return q_atomic_test_and_set_release_ptr(&_q_value, expectedValue, newValue) != 0;
-+    Q_DATA_MEMORY_BARRIER;
-+    return testAndSetRelaxed(expectedValue, newValue);
- }
- 
- template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue)
- {
--    return reinterpret_cast<T *>(q_atomic_set_ptr(&_q_value, newValue));
-+    Q_DATA_MEMORY_BARRIER;
-+    bool returnValue = testAndSetAcquire(expectedValue, newValue);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
- {
--    return reinterpret_cast<T *>(q_atomic_fetch_and_store_acquire_ptr(&_q_value, newValue));
-+    T *returnValue = fetchAndStoreRelaxed(newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
- {
--    return reinterpret_cast<T *>(q_atomic_fetch_and_store_release_ptr(&_q_value, newValue));
-+    Q_DATA_MEMORY_BARRIER;
-+    return fetchAndStoreRelaxed(newValue);
- }
- 
- template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
- {
--    return reinterpret_cast<T *>(q_atomic_fetch_and_add_ptr(&_q_value, valueToAdd * sizeof(T)));
-+    Q_DATA_MEMORY_BARRIER;
-+    T *returnValue = fetchAndStoreRelaxed(newValue);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
- }
-+
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd)
- {
--    return reinterpret_cast<T *>(q_atomic_fetch_and_add_acquire_ptr(&_q_value, valueToAdd * sizeof(T)));
-+    T *returnValue = fetchAndAddRelaxed(valueToAdd);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd)
- {
--    return reinterpret_cast<T *>(q_atomic_fetch_and_add_release_ptr(&_q_value, valueToAdd * sizeof(T)));
--}
--
--#endif
--
--inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)
--{
--    return testAndSetAcquire(expectedValue, newValue);
--}
--
--inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)
--{
--    return fetchAndStoreAcquire(newValue);
--}
--
--inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)
--{
--    return fetchAndAddAcquire(valueToAdd);
--}
--
--template <typename T>
--Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue)
--{
--    return testAndSetAcquire(expectedValue, newValue);
--}
--
--template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
--{
--    return fetchAndStoreAcquire(newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return fetchAndAddRelaxed(valueToAdd);
- }
- 
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
- {
--    return fetchAndAddAcquire(valueToAdd);
-+    Q_DATA_MEMORY_BARRIER;
-+    T *returnValue = fetchAndAddRelaxed(valueToAdd);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
-+#undef Q_DATA_MEMORY_BARRIER
-+#undef Q_COMPILER_MEMORY_BARRIER
-+
- QT_END_NAMESPACE
- 
- QT_END_HEADER
---- /dev/null
-+++ qt/src/corelib/arch/powerpc/qatomic_powerpc.cpp
-@@ -0,0 +1,70 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2012, 2013 Digia Plc and/or its subsidiary(-ies).
-+** Contact: http://www.qt-project.org/legal
-+**
-+** This file is part of the QtCore module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and Digia.  For licensing terms and
-+** conditions see http://qt.digia.com/licensing.  For further information
-+** use the contact form at http://qt.digia.com/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU Lesser General Public License version 2.1 requirements
-+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Digia gives you certain additional
-+** rights.  These rights are described in the Digia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3.0 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU General Public License version 3.0 requirements will be
-+** met: http://www.gnu.org/copyleft/gpl.html.
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include <QtCore/qglobal.h>
-+
-+#include <unistd.h>
-+#ifdef _POSIX_PRIORITY_SCHEDULING
-+# include <sched.h>
-+#endif
-+#include <time.h>
-+
-+QT_BEGIN_NAMESPACE
-+
-+QT_USE_NAMESPACE
-+
-+Q_CORE_EXPORT void qt_atomic_yield(int *count)
-+{
-+#ifdef _POSIX_PRIORITY_SCHEDULING
-+    if((*count)++ < 50) {
-+        sched_yield();
-+    } else
-+#endif
-+    {
-+        struct timespec tm;
-+        tm.tv_sec = 0;
-+        tm.tv_nsec = 2000001;
-+        nanosleep(&tm, NULL);
-+        *count = 0;
-+    }
-+}
-+
-+QT_END_NAMESPACE
diff --git a/srcpkgs/qt/patches/qsettings-recursive-global-mutex.patch b/srcpkgs/qt/patches/qsettings-recursive-global-mutex.patch
deleted file mode 100644
index 8c66b7a9fa65..000000000000
--- a/srcpkgs/qt/patches/qsettings-recursive-global-mutex.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Calling qsettings before constructing qapplications causes a dead-lock.
-
-http://sourceforge.net/tracker/?func=detail&aid=3168620&group_id=4932&atid=104932
-http://developer.qt.nokia.com/forums/viewthread/10365
-
-
---- a/src/corelib/io/qsettings.cpp.orig
-+++ b/src/corelib/io/qsettings.cpp
-@@ -122,7 +122,7 @@
- Q_GLOBAL_STATIC(ConfFileCache, unusedCacheFunc)
- Q_GLOBAL_STATIC(PathHash, pathHashFunc)
- Q_GLOBAL_STATIC(CustomFormatVector, customFormatVectorFunc)
--Q_GLOBAL_STATIC(QMutex, globalMutex)
-+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, globalMutex, (QMutex::Recursive))
- static QSettings::Format globalDefaultFormat = QSettings::NativeFormat;
- 
- #ifndef Q_OS_WIN
diff --git a/srcpkgs/qt/patches/qt-clucene-timeb.patch b/srcpkgs/qt/patches/qt-clucene-timeb.patch
deleted file mode 100644
index e3f478fc6316..000000000000
--- a/srcpkgs/qt/patches/qt-clucene-timeb.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/3rdparty/clucene/src/CLucene/util/Misc.cpp.orig
-+++ b/src/3rdparty/clucene/src/CLucene/util/Misc.cpp
-@@ -20,11 +20,11 @@
- # endif
- #endif
- 
--#ifdef _CL_HAVE_SYS_TIMEB_H
-+#ifndef UNDER_CE
-+#ifdef _defined(_CLCOMPILER_MSVC) || defined(__MINGW32__) || defined(__BORLANDC__)
- # include <sys/timeb.h>
- #endif
--
--#ifdef UNDER_CE
-+#else
- #include <QTime>
- #endif
- 
diff --git a/srcpkgs/qt/patches/qt-gtk-theme-fix.patch b/srcpkgs/qt/patches/qt-gtk-theme-fix.patch
deleted file mode 100644
index ee2045ac5022..000000000000
--- a/srcpkgs/qt/patches/qt-gtk-theme-fix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Author: Timo Teräs <timo.teras@iki.fi>
-
-Fix QT GTK style to use GTK API to get the active theme name. This fixes
-things for non-GNOME setups, as well as realtime theme change detection.
-
-It still tries to detect if GTK-Qt is in use and refuse to run with that
-as it would cause obvious recursion, however that might be not always
-possible.
-
---- a/src/gui/styles/qgtkstyle_p.cpp	2013-06-07 05:16:59.000000000 +0000
-+++ b/src/gui/styles/qgtkstyle_p.cpp	2013-09-25 16:37:34.703506640 +0000
-@@ -505,7 +505,7 @@ void QGtkStylePrivate::initGtkWidgets()
- 
-     static QString themeName;
-     if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) {
--        themeName = getThemeName();
-+        themeName = getThemeNameGuess();
- 
-         if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
-             // Due to namespace conflicts with Qt3 and obvious recursion with Qt4,
-@@ -648,7 +648,7 @@ bool QGtkStylePrivate::getGConfBool(cons
-     return retVal;
- }
- 
--QString QGtkStylePrivate::getThemeName()
-+QString QGtkStylePrivate::getThemeNameGuess()
- {
-     QString themeName;
-     // We try to parse the gtkrc file first
-@@ -685,6 +685,19 @@ QString QGtkStylePrivate::getThemeName()
- 
-     return themeName;
- }
-+
-+QString QGtkStylePrivate::getThemeName()
-+{
-+    QString themeName;
-+    gchar *theme_name;
-+
-+    GtkSettings *settings = gtk_settings_get_default();
-+    g_object_get(settings, "gtk-theme-name", &theme_name, NULL);
-+    themeName = QString::fromUtf8(theme_name);
-+    g_free(theme_name);
-+
-+    return themeName;
-+}
- 
- // Get size of the arrow controls in a GtkSpinButton
- int QGtkStylePrivate::getSpinboxArrowSize() const
---- a/src/gui/styles/qgtkstyle_p.h	2013-06-07 05:16:59.000000000 +0000
-+++ b/src/gui/styles/qgtkstyle_p.h	2013-09-25 16:29:11.310167033 +0000
-@@ -338,6 +338,7 @@ public:
-     static bool getGConfBool(const QString &key, bool fallback = 0);
-     static QString getGConfString(const QString &key, const QString &fallback = QString());
- 
-+    static QString getThemeNameGuess();
-     static QString getThemeName();
-     virtual int getSpinboxArrowSize() const;
- 
diff --git a/srcpkgs/qt/patches/qt-musl-iconv-no-bom.patch b/srcpkgs/qt/patches/qt-musl-iconv-no-bom.patch
deleted file mode 100644
index 35380ad6714d..000000000000
--- a/srcpkgs/qt/patches/qt-musl-iconv-no-bom.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp.orig
-+++ qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp
-@@ -62,7 +62,7 @@
- #elif defined(Q_OS_AIX)
- #  define NO_BOM
- #  define UTF16 "UCS-2"
--#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
-+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || (defined(Q_OS_LINUX) && !defined(__GLIBC__))
- #  define NO_BOM
- #  if Q_BYTE_ORDER == Q_BIG_ENDIAN
- #    define UTF16 "UTF-16BE"
diff --git a/srcpkgs/qt/patches/qt-musl.patch b/srcpkgs/qt/patches/qt-musl.patch
deleted file mode 100644
index 90b9ccda08c9..000000000000
--- a/srcpkgs/qt/patches/qt-musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h.orig
-+++ qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h
-@@ -86,11 +86,7 @@
- 
- #undef QT_SOCKLEN_T
- 
--#if defined(__GLIBC__) && (__GLIBC__ >= 2)
- #define QT_SOCKLEN_T            socklen_t
--#else
--#define QT_SOCKLEN_T            int
--#endif
- 
- #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
- #define QT_SNPRINTF		::snprintf
diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template
deleted file mode 100644
index 6f6f9771e120..000000000000
--- a/srcpkgs/qt/template
+++ /dev/null
@@ -1,431 +0,0 @@
-# Template file for 'qt'
-pkgname=qt
-version=4.8.7
-revision=29
-_distname=qt-everywhere-opensource-src
-patch_args="-Np1"
-wrksrc=${_distname}-${version}
-homepage="https://qt.io/"
-short_desc="A cross-platform application and UI framework"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3, LGPL-2.1"
-distfiles="https://download.qt.io/archive/qt/${version%.*}/${version}/${_distname}-${version}.tar.gz"
-checksum=e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
-
-hostmakedepends="perl sqlite pkg-config"
-makedepends="
- MesaLib-devel libressl-devel unixodbc-devel libXv-devel libXinerama-devel
- libXrandr-devel libXcursor-devel glib-devel cups-devel sqlite-devel
- alsa-lib-devel libmng-devel libSM-devel gtk+-devel libnotify-devel
- libmysqlclient-devel postgresql-libs-devel pulseaudio-devel tslib-devel"
-depends="qtchooser hicolor-icon-theme"
-replaces="qt-qtconfig>=0"
-
-CXXFLAGS="-std=gnu++98 -Wno-deprecated -fno-delete-null-pointer-checks -fno-lifetime-dse -Wno-class-memaccess"
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt-qmake qt-host-tools"
-	LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib"
-fi
-case "$XBPS_TARGET_MACHINE" in
-	mips*) broken="Serveral Assembler messages: Error: branch out of range" ;;
-esac
-
-do_configure() {
-	local _opts _spec
-	echo "QMAKE_CXXFLAGS += -std=gnu++98" >> src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
-	echo "QMAKE_CXXFLAGS += -std=gnu++98" >> src/plugins/accessible/qaccessiblebase.pri
-	echo "QMAKE_LFLAGS += -Wl,-rpath-link,${wrksrc}/lib" >> mkspecs/features/help.prf
-
-	_opts+=" -confirm-license"
-	_opts+=" -opensource"
-	_opts+=" -prefix /usr"
-	_opts+=" -sysconfdir /etc"
-	_opts+=" -bindir /usr/lib/qt/bin"
-	_opts+=" -datadir /usr/share/qt"
-	_opts+=" -docdir /usr/share/doc/qt"
-	_opts+=" -plugindir /usr/lib/qt/plugins"
-	_opts+=" -importdir /usr/lib/qt/imports"
-	_opts+=" -translationdir /usr/share/qt/translations"
-
-	if [ -n "$CROSS_BUILD" ]; then
-		_opts+=" -force-pkg-config"
-		_opts+=" -continue"
-		_opts+=" -xplatform ${CXX}"
-		_opts+=" -exceptions"
-		_opts+=" -make libs"
-		_opts+=" -make tools"
-		_opts+=" -make docs"
-		_opts+=" -make translations"
-		_opts+=" -qt3support"
-		case "$XBPS_TARGET_MACHINE" in
-			armv5tel)
-				_opts+=" -arch arm"
-				_spec="arm-linux-gnueabi-c++"
-				;;
-			armv5tel-musl)
-				_opts+=" -arch arm"
-				_spec="arm-linux-musleabi-c++"
-				;;
-			armv6l)
-				_opts+=" -arch arm"
-				_spec="arm-linux-gnueabihf-c++"
-				;;
-			armv6l-musl)
-				_opts+=" -arch arm"
-				_spec="arm-linux-musleabihf-c++"
-				;;
-			armv7l)
-				_opts+=" -arch arm"
-				_spec="armv7l-linux-gnueabihf-c++"
-				;;
-			armv7l-musl)
-				_opts+=" -arch arm"
-				_spec="armv7l-linux-musleabihf-c++"
-				;;
-			aarch64)
-				_opts+=" -arch aarch64"
-				_spec="aarch64-linux-gnu-c++"
-				;;
-			aarch64-musl)
-				_opts+=" -arch aarch64"
-				_spec="aarch64-linux-musl-c++"
-				;;
-			mips-musl)
-				_opts+=" -arch mips"
-				_spec="mips-linux-musl-c++"
-				;;
-			mipshf-musl)
-				_opts+=" -arch mips"
-				_spec="mips-linux-muslhf-c++"
-				;;
-			mipsel-musl)
-				_opts+=" -arch mips"
-				_spec="mipsel-linux-musl-c++"
-				;;
-			mipselhf-musl)
-				_opts+=" -arch mips"
-				_spec="mipsel-linux-muslhf-c++"
-				;;
-			ppc64le)
-				_opts+=" -arch powerpc"
-				_spec="powerpc64le-linux-gnu-c++"
-				;;
-			ppc64le-musl)
-				_opts+=" -arch powerpc"
-				_spec="powerpc64le-linux-musl-c++"
-				;;
-			ppc64)
-				_opts+=" -arch powerpc"
-				_spec="powerpc64-linux-gnu-c++"
-				;;
-			ppc64-musl)
-				_opts+=" -arch powerpc"
-				_spec="powerpc64-linux-musl-c++"
-				;;
-			ppc)
-				_opts+=" -arch powerpc"
-				_spec="powerpc-linux-gnu-c++"
-				;;
-			ppc-musl)
-				_opts+=" -arch powerpc"
-				_spec="powerpc-linux-musl-c++"
-				;;
-			ppcle)
-				_opts+=" -arch powerpc"
-				_spec="powerpcle-linux-gnu-c++"
-				;;
-			ppcle-musl)
-				_opts+=" -arch powerpc"
-				_spec="powerpcle-linux-musl-c++"
-				;;
-			*-musl)
-				_opts+=" -arch arm"
-				_spec="${XBPS_TARGET_MACHINE}-linux-musl-c++"
-				;;
-			*)
-				_opts+=" -arch arm"
-				_spec="${XBPS_TARGET_MACHINE}-linux-gnu-c++"
-				;;
-		esac
-		mkdir -p mkspecs/${_spec}
-		cat > mkspecs/${_spec}/qmake.conf << _EOF
-#
-# qmake specification for ${_spec}
-#
-MAKEFILE_GENERATOR         = UNIX
-TARGET_PLATFORM            = unix
-TEMPLATE                   = app
-CONFIG                     += qt warn_on release incremental link_prl gdb_dwarf_index
-QT                         += core gui
-QMAKE_INCREMENTAL_STYLE    = sublib
-
-include(../common/linux.conf)
-include(../common/gcc-base-unix.conf)
-QMAKE_CC                      = ${CC}
-QMAKE_LINK_C                  = ${CC}
-QMAKE_LINK_C_SHLIB            = ${CC}
-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g
-QMAKE_CXX                     = ${CXX}
-QMAKE_LINK                    = ${CXX}
-QMAKE_LINK_SHLIB              = ${CXX}
-QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g
-QMAKE_PCH_OUTPUT_EXT          = .gch
-QMAKE_CFLAGS_PRECOMPILE       = -x c-header -c \${QMAKE_PCH_INPUT} -o \${QMAKE_PCH_OUTPUT}
-QMAKE_CFLAGS_USE_PRECOMPILE   = -include \${QMAKE_PCH_OUTPUT_BASE}
-QMAKE_CXXFLAGS_PRECOMPILE     = -x c++-header -c \${QMAKE_PCH_INPUT} -o \${QMAKE_PCH_OUTPUT}
-QMAKE_CXXFLAGS_USE_PRECOMPILE = -include \${QMAKE_PCH_OUTPUT_BASE}
-QMAKE_LFLAGS_RELEASE          += -Wl,-O1 -Wl,-rpath,${wrksrc}/lib
-QMAKE_LFLAGS_NOUNDEF          += -Wl,--no-undefined
-
-load(qt_config)
-_EOF
-		cat > mkspecs/${_spec}/qplatformdefs.h << _EOF
-#include "../linux-g++/qplatformdefs.h"
-_EOF
-
-		# Force enable qfilesystemwatcher_{i,d}notify
-		cat >> src/corelib/io/io.pri << _EOF
-SOURCES += io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_dnotify.cpp
-HEADERS += io/qfilesystemwatcher_inotify_p.h io/qfilesystemwatcher_dnotify_p.h
-_EOF
-
-		# qmake CFLAGS/LDFLAGS
-		sed -i configure \
-			-e '/outpath\/qmake\".*\"\$MAKE\")/s/)/ CC=gcc CXX=g++ LINK=g++ QMAKE_CFLAGS="$XBPS_CFLAGS" QMAKE_CXXFLAGS="$XBPS_CXXFLAGS" QMAKE_LFLAGS="$XBPS_LDFLAGS" )/' \
-			-e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \
-			-e 's/5\*\|4\*\|3\.4\*)/8*|7*|6*|&/'
-		export PKG_CONFIG_PATH=${XBPS_CROSS_BASE}/usr/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/share/pkgconfig
-		export PKG_CONFIG_LIBDIR=${XBPS_CROSS_BASE}/usr/lib/pkgconfig
-		export PKG_CONFIG_SYSROOT_DIR=${XBPS_CROSS_BASE}
-
-	else
-		# qmake CFLAGS/LDFLAGS
-		sed -i configure \
-			-e '/outpath\/qmake\".*\"\$MAKE\")/s/)/ QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" )/' \
-			-e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/'
-	fi
-
-	_opts+=" -nomake demos"
-	_opts+=" -nomake examples"
-	_opts+=" -openssl-linked"
-	_opts+=" -xmlpatterns"
-	_opts+=" -no-webkit"
-	_opts+=" -gtkstyle"
-	_opts+=" -system-sqlite"
-	_opts+=" -shared"
-	_opts+=" -graphicssystem raster"
-	_opts+=" -no-icu"
-	_opts+=" -no-openvg"
-	_opts+=" -no-phonon"
-	_opts+=" -no-phonon-backend"
-	_opts+=" -no-pch"
-	_opts+=" -no-rpath"
-	_opts+=" -optimized-qmake"
-	_opts+=" -no-reduce-relocations"
-	_opts+=" -dbus-linked"
-	_opts+=" -silent"
-	# _opts+=" -v"
-
-	echo "=== ./configure ${_opts}"
-	export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}"
-	export LD="$CXX"
-	export QMAKE_CFLAGS="${CFLAGS}"
-	export QMAKE_CXXFLAGS="${CXXFLAGS}"
-	export QMAKE_LFLAGS="${LDFLAGS} -Wl,-rpath,${wrksrc}/lib"
-	./configure ${_opts}
-}
-do_build() {
-	local _f
-	if [ -n "$CROSS_BUILD" ]; then
-		# Replace binaries for host
-		find -name Makefile\* -exec sed -i "{}" -e"s;/builddir/.*/bin/;/usr/lib/qt/bin/;g" \;
-		# Build qmake for the target
-		echo "=== Building qmake for the target ${XBPS_TARGET_MACHINE}"
-		mv bin/qmake{,-host}
-		sed -i qmake/Makefile \
-			-e"s;^\(CC =\).*;\1 ${CC};" \
-			-e"s;^\(CXX =\).*;\1 ${CXX};" \
-			-e"s;^\(QMAKE_CFLAGS =\).*;\1 ${CFLAGS};" \
-			-e"s;^\(QMAKE_CXXFLAGS =\).*;\1 ${CXXFLAGS};" \
-			-e"s;^\(QMAKE_LFLAGS =\).*;\1 ${LDFLAGS};"
-		cd qmake
-		make clean
-		make ${makejobs}
-		cd ${wrksrc}
-		mv bin/qmake{,-target}
-		mv bin/qmake{-host,}
-		cd ${wrksrc}
-	fi
-	export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}"
-	export LD="$CXX"
-	make ${makejobs}
-}
-do_install() {
-	local hicolordir=${DESTDIR}/usr/share/icons/hicolor
-
-	make INSTALL_ROOT=${DESTDIR} install
-
-	# install missing qatomic_aarch64.h
-	# TODO: find better fix (add to install targets?)
-	install -D -m644 src/corelib/arch/qatomic_aarch64.h ${DESTDIR}/usr/include/QtCore/
-	install -D -m644 src/corelib/arch/qatomic_aarch64.h ${DESTDIR}/usr/include/Qt/
-
-	# delete tests
-	rm -rf ${DESTDIR}/usr/tests
-
-	# install missing icons and desktop files
-	for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
-		size=$(echo $(basename ${icon}) | cut -d- -f2)
-		install -D -m644 ${icon} \
-			${hicolordir}/${size}x${size}/apps/linguist.png
-	done
-	install -Dm644 src/gui/dialogs/images/qtlogo-64.png \
-		${hicolordir}/64x64/apps/qtlogo.png
-	install -Dm644 src/gui/dialogs/images/qtlogo-64.png \
-		${DESTDIR}/usr/share/pixmaps/qtlogo.png
-	install -Dm644 tools/assistant/tools/assistant/images/assistant.png \
-		${hicolordir}/32x32/apps/assistant.png
-	install -Dm644 tools/designer/src/designer/images/designer.png \
-		${hicolordir}/128x128/apps/designer.png
-	install -d ${DESTDIR}/usr/share/applications
-	install -m644 ${FILESDIR}/*.desktop \
-		${DESTDIR}/usr/share/applications
-
-	vlicense LGPL_EXCEPTION.txt
-
-	vmkdir usr/bin
-	for f in ${DESTDIR}/usr/lib/qt/bin/*; do
-		ln -s /usr/lib/qt/bin/$(basename $f) ${DESTDIR}/usr/bin/$(basename $f)-qt4
-	done
-
-	# Remove wrong stuff
-	rm -rf ${DESTDIR}/usr/{examples,demos}
-
-	# Clean generated qmake.conf reference to builddir
-	find -name qmake.conf -exec sed -i "{}" -e"s; -Wl,-rpath,/builddir.*;;" \;
-
-	# For a cross build replace qmake with the target binary
-	if [ -f ${wrksrc}/bin/qmake-target ]; then
-		mv ${wrksrc}/bin/qmake-target ${DESTDIR}/usr/lib/qt/bin/qmake
-		ln -s /usr/lib/qt/bin/qmake ${DESTDIR}/usr/bin/qmake-qt4
-	fi
-}
-
-qt-doc_package() {
-	depends="qt-devel-tools>=${version}_${revision}"
-	short_desc+=" - Documentation"
-	pkg_install() {
-		vmove usr/share/doc/qt
-	}
-}
-qt-designer_package() {
-	depends="hicolor-icon-theme qt-designer-libs>=${version}_${revision}"
-	short_desc+=" - GUI designer"
-	pkg_install() {
-		vmove usr/bin/designer-qt4
-		vmove usr/lib/qt/bin/designer
-		vmove usr/lib/qt/plugins/designer
-		vmove "usr/share/icons/hicolor/128x128/apps/designer.*"
-		vmove "usr/share/applications/designer.*"
-		vmove "usr/share/qt/translations/designer*"
-	}
-}
-qt-designer-libs_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - GUI designer libraries"
-	pkg_install() {
-		vmove usr/lib/libQtDesigner.so.*
-		vmove usr/lib/libQtDesignerComponents.so.*
-	}
-}
-qt-designer-devel_package() {
-	depends="qt-designer-libs>=${version}_${revision}"
-	short_desc+=" - GUI designer development"
-	pkg_install() {
-		vmove usr/lib/libQtDesigner.so
-		vmove usr/lib/libQtDesignerComponents.so
-	}
-}
-qt-host-tools_package() {
-	short_desc+=" - host tools"
-	pkg_install() {
-		for f in lrelease lupdate moc qdbuscpp2xml qdbusxml2cpp qt3to4 \
-			rcc uic uic3; do
-			if [ -f "${DESTDIR}/usr/lib/qt/bin/${f}" ]; then
-				vmove usr/lib/qt/bin/${f}
-			fi
-		done
-	}
-}
-qt-devel-tools_package() {
-	depends="hicolor-icon-theme"
-	short_desc+=" - development tools"
-	pkg_install() {
-		for f in assistant lconvert linguist pixeltool qcollectiongenerator \
-			qhelpgenerator qhelpconverter xmlpatterns xmlpatternsvalidator \
-			qttracereplay qdoc3 qmlviewer; do
-			if [ -f "${DESTDIR}/usr/lib/qt/bin/${f}" ]; then
-				vmove usr/bin/${f}-qt4
-				vmove usr/lib/qt/bin/${f}
-			fi
-		done
-		vmove usr/share/icons/hicolor
-		for f in linguist assistant; do
-			vmove usr/share/applications/${f}.desktop
-			[ ! -f ${DESTDIR}/usr/share/pixmaps/${f}.png ] && continue
-			vmove usr/share/pixmaps/${f}.png
-		done
-		vmove usr/share/qt/phrasebooks
-	}
-}
-qt-devel_package() {
-	depends="qt-qmake qt-devel-tools qt-host-tools libX11-devel qt>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		for f in lrelease lupdate moc qdbuscpp2xml qdbusxml2cpp qt3to4 \
-			rcc uic uic3; do
-			if [ -f "${DESTDIR}/usr/bin/${f}-qt4" ]; then
-				vmove usr/bin/${f}-qt4
-			fi
-		done
-		vmove usr/include
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.prl"
-		vmove usr/lib/pkgconfig
-	}
-}
-
-qt-plugin-odbc_package() {
-	short_desc+=" - ODBC plugin"
-	pkg_install() {
-		vmove usr/lib/qt/plugins/sqldrivers/libqsqlodbc.so
-	}
-}
-qt-plugin-pgsql_package() {
-	short_desc+=" - PostgreSQL plugin"
-	pkg_install() {
-		vmove usr/lib/qt/plugins/sqldrivers/libqsqlpsql.so
-	}
-}
-qt-plugin-mysql_package() {
-	short_desc+=" - MySQL plugin"
-	pkg_install() {
-		vmove usr/lib/qt/plugins/sqldrivers/libqsqlmysql.so
-	}
-}
-qt-plugin-sqlite_package() {
-	short_desc+=" - SQLite plugin"
-	pkg_install() {
-		vmove usr/lib/qt/plugins/sqldrivers/libqsqlite.so
-	}
-}
-qt-qmake_package() {
-	short_desc+=" - qmake Makefile generator tool"
-	pkg_install() {
-		vmove usr/bin/qmake-qt4
-		vmove usr/lib/qt/bin/qmake
-		vmove usr/share/qt/mkspecs
-	}
-}

From f8feaf2b390e256561807c92b4d1d23dbf64007f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:11:12 +0100
Subject: [PATCH 0811/3482] removed-packages: add qt and bump

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6486543934a3..f5152ea1fc30 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=16
+revision=17
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -179,6 +179,7 @@ replaces="
  python-pytest-relaxed<=1.1.2_2
  qimageblitz<=0.0.6_4
  qucs<=0.0.19_2
+ qt<=4.8.7_29
  r2-bindings<=1.0.1_2
  reminiscence<=0.4.6_1
  scantailor<=0.9.12.1_2

From 93f1c7c97801f572987519d89122e5866227d105 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:13:58 +0100
Subject: [PATCH 0812/3482] removed-packages: add missing devel/plugin packages
 and bump again

---
 srcpkgs/removed-packages/template | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f5152ea1fc30..aff755a9eaaf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=17
+revision=18
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -14,6 +14,7 @@ replaces="
  arm-mem-git<=20131108_2
  arptables<=0.0.4_3
  avogadro<=1.2.0_8
+ avogadro-devel<=1.2.0_8
  bokken<=1.8_3
  bzr<=2.7.0_1
  bzrtools<=2.6.0_4
@@ -153,6 +154,7 @@ replaces="
  ls++-git<=20140919_3
  luxmark<=3.1_9
  luxrays<=3.1_18
+ luxrays-devel<=3.1_18
  mac<=3.99u4b5s7_3
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
@@ -180,6 +182,18 @@ replaces="
  qimageblitz<=0.0.6_4
  qucs<=0.0.19_2
  qt<=4.8.7_29
+ qt-designer<=4.8.7_29
+ qt-designer-devel<=4.8.7_29
+ qt-designer-libs<=4.8.7_29
+ qt-devel<=4.8.7_29
+ qt-devel-tools<=4.8.7_29
+ qt-doc<=4.8.7_29
+ qt-host-tools<=4.8.7_29
+ qt-plugin-mysql<=4.8.7_29
+ qt-plugin-odbc<=4.8.7_29
+ qt-plugin-pgsql<=4.8.7_29
+ qt-plugin-sqlite<=4.8.7_29
+ qt-qmake<=4.8.7_29
  r2-bindings<=1.0.1_2
  reminiscence<=0.4.6_1
  scantailor<=0.9.12.1_2

From 8763e9ab92aea3716eb36961c99c4fccb26f62a3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:25:59 +0100
Subject: [PATCH 0813/3482] xlennart: remove

upstream dead, depends on gtk2
---
 srcpkgs/xlennart/template | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 srcpkgs/xlennart/template

diff --git a/srcpkgs/xlennart/template b/srcpkgs/xlennart/template
deleted file mode 100644
index 2eb0f3570998..000000000000
--- a/srcpkgs/xlennart/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'xlennart'
-pkgname=xlennart
-version=1.1.1
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="gtk+-devel"
-maintainer="Orphaned <orphan@voidlinux.org>"
-short_desc="XBill game modification"
-homepage="https://github.com/Xylemon/xlennart"
-license="GPL-2"
-distfiles="https://github.com/Xylemon/xlennart/archive/${version}.tar.gz"
-checksum=c614db5e7cc0e64469b7dbf6957170ff14e93b580e7ca1885e94041a5102bd57

From 2204b2e9b8b3517759a0c25349285a1447cfb400 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:27:25 +0100
Subject: [PATCH 0814/3482] removed-packages: add xlennart

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index aff755a9eaaf..225594dc4b8e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -214,6 +214,7 @@ replaces="
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
  libxnoise<=0.2.21_4
+ xlennart<=1.1.1_1
  xnoise<=0.2.21_4
  xnoise-devel<=0.2.21_4
  yt-play<=20140117_2

From df17d722bfd7dc0e83a2cc9c7a17a2ea4be2564a Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Sun, 31 Jan 2021 04:53:23 -0800
Subject: [PATCH 0815/3482] tintin: take ownership

---
 srcpkgs/tintin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tintin/template b/srcpkgs/tintin/template
index 14fadd6d4dab..4bedfe3ab047 100644
--- a/srcpkgs/tintin/template
+++ b/srcpkgs/tintin/template
@@ -7,7 +7,7 @@ build_wrksrc=src
 build_style=gnu-configure
 makedepends="zlib-devel pcre-devel readline-devel gnutls-devel"
 short_desc="Console-based MUD client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michael Taboada <voidpkgs@forwardme.email>"
 license="GPL-2.0-or-later"
 homepage="http://tintin.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/tintin/${pkgname}-${version}.tar.gz"

From 9ec5a515123315d6a8c84ddd0b2deda02ce11b21 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 30 Jan 2021 18:46:07 +0100
Subject: [PATCH 0816/3482] dbeaver: update to 7.3.3.

also add eclipse as dependency, which is required for dbeaver to run.
---
 srcpkgs/dbeaver/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index e09a1fdf757f..b7e988016317 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,16 +1,17 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=7.3.2
+version=7.3.3
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
 hostmakedepends="apache-maven"
+depends="openjdk11" # openjdk11 or later version, when available
 short_desc="Free Universal Database Tool"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=9b37ef875771cfb34507d5423965ce1e79d263a31c245c46a89b44f01c4d9c85
+checksum=8b4cff6a1e172da763373ddc7df554569f53a0c529175e540d4b64ed2b7066d9
 nopie=true
 
 do_build() {

From b737a41ec3fcd495ac8fd22d9a404e1d71b65d6e Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Sat, 30 Jan 2021 11:59:27 +0300
Subject: [PATCH 0817/3482] eiskaltdcpp-qt: update to 2.4.1

+ Drop patches which came from upstream.
+ Static linking with libeiskaltdcpp.
+ Remove build dependency from Boost libraries.
+ Disable usage of Aspell libraries.
+ Enable support of Lua scripts.
+ Enable support of SQLite database.
+ New maintainer of package.
---
 srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch | 65 -------------------
 srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch   | 36 ----------
 srcpkgs/eiskaltdcpp-qt/patches/musl.patch     | 31 ++++++---
 .../eiskaltdcpp-qt/patches/upnpc.cpp.patch    | 30 ---------
 srcpkgs/eiskaltdcpp-qt/template               | 19 +++---
 5 files changed, 32 insertions(+), 149 deletions(-)
 delete mode 100644 srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch
 delete mode 100644 srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch
 delete mode 100644 srcpkgs/eiskaltdcpp-qt/patches/upnpc.cpp.patch

diff --git a/srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch b/srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch
deleted file mode 100644
index 50603313aeb3..000000000000
--- a/srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- dcpp/Util.cpp	2015-04-20 02:57:16.000000000 +0500
-+++ dcpp/Util.cpp.new	2017-10-09 15:00:00.000000000 +0500
-@@ -171,8 +171,8 @@
-     ::GetShortPathName(localePath_.c_str(), buf, sizeof(buf)/sizeof(TCHAR));
-     if (Util::getPath(Util::PATH_LOCALE).empty())
-         paths[PATH_LOCALE] = Text::fromT(buf);
--    if (Util::getPath(Util::PATH_DOWNLOADS).empty())
--        paths[PATH_DOWNLOADS] = getDownloadsPath(paths[PATH_USER_CONFIG]);
-+    //if (Util::getPath(Util::PATH_DOWNLOADS).empty())
-+    //    paths[PATH_DOWNLOADS] = getDownloadsPath(paths[PATH_USER_CONFIG]);
- 
- #else
-     if (Util::getPath(Util::PATH_GLOBAL_CONFIG).empty())
-@@ -704,7 +704,7 @@
- #endif
- }
- 
--vector<string> Util::getLocalIPs() {
-+vector<string> Util::getLocalIPs(unsigned short sa_family) {
-     vector<string> addresses;
- 
- #ifdef HAVE_IFADDRS_H
-@@ -712,6 +712,9 @@
- 
-     if (getifaddrs(&ifap) == 0)
-     {
-+        bool ipv4 = (sa_family == AF_UNSPEC) || (sa_family == AF_INET);
-+        bool ipv6 = (sa_family == AF_UNSPEC) || (sa_family == AF_INET6);
-+
-         for (struct ifaddrs *i = ifap; i != NULL; i = i->ifa_next)
-         {
-             struct sockaddr *sa = i->ifa_addr;
-@@ -723,14 +726,14 @@
-                 socklen_t len;
- 
-                 // IPv4 address
--                if (sa->sa_family == AF_INET)
-+                if (ipv4 && (sa->sa_family == AF_INET))
-                 {
-                     struct sockaddr_in* sai = (struct sockaddr_in*)sa;
-                     src = (void*) &(sai->sin_addr);
-                     len = INET_ADDRSTRLEN;
-                 }
-                 // IPv6 address
--                else if (sa->sa_family == AF_INET6)
-+                else if (ipv6 && (sa->sa_family == AF_INET6))
-                 {
-                     struct sockaddr_in6* sai6 = (struct sockaddr_in6*)sa;
-                     src = (void*) &(sai6->sin6_addr);
-@@ -752,9 +755,13 @@
- 
-     return addresses;
- }
--string Util::getLocalIp() {
-+string Util::getLocalIp(unsigned short as_family) {
- #ifdef HAVE_IFADDRS_H
--    return getLocalIPs().empty() ? "0.0.0.0" : getLocalIPs()[0];
-+    vector<string> addresses = getLocalIPs(as_family);
-+    if (addresses.empty())
-+        return (((as_family == AF_UNSPEC) || (as_family == AF_INET)) ? "0.0.0.0" : "::");
-+
-+    return addresses[0];
- #else
-     string tmp;
- 
diff --git a/srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch b/srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch
deleted file mode 100644
index 615f1b11aa3c..000000000000
--- a/srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- dcpp/Util.h		2015-04-20 02:57:16.000000000 +0500
-+++ dcpp/Util.h.new	2017-10-09 15:00:00.000000000 +0500
-@@ -28,6 +28,13 @@
- 
- #include <sys/stat.h>
- #include <sys/types.h>
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/socket.h>
-+#endif
-+
- #include <unistd.h>
- #include <cstdlib>
- #include <vector>
-@@ -270,7 +270,7 @@
- #ifdef _WIN32
-         return _atoi64(aString.c_str());
- #else
--    #ifndef __HAIKU__
-+    #if !defined(__HAIKU__) && defined(__GLIBC__)
-         return strtoq(aString.c_str(), (char **)NULL, 10);
-     #else
-         return strtoll(aString.c_str(), (char **)NULL, 10);
-@@ -403,8 +410,8 @@
-     }
- 
-     static string encodeURI(const string& /*aString*/, bool reverse = false);
--    static string getLocalIp();
--    static std::vector<string> getLocalIPs();
-+    static string getLocalIp(unsigned short sa_family = AF_UNSPEC);
-+    static std::vector<string> getLocalIPs(unsigned short sa_family = AF_UNSPEC);
-     static bool isPrivateIp(string const& ip);
-     static string formatAdditionalInfo(const std::string& aIp, bool sIp, bool sCC);
-     /**
diff --git a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch b/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
index b26b453b3827..37914871c8b0 100644
--- a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
+++ b/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
@@ -1,20 +1,33 @@
---- eiskaltdcpp-qt/src/main.cpp	2015-04-20 02:57:16.000000000 +0500
-+++ eiskaltdcpp-qt/src/main.cpp.new	2018-01-07 08:47:19.501488838 +0500
-@@ -72,7 +72,7 @@
- #if !defined(Q_WS_WIN)
+https://github.com/eiskaltdcpp/eiskaltdcpp/commit/fc9bc0c2
+
+--- dcpp/Util.h
++++ dcpp/Util.h.new
+@@ -243,7 +243,7 @@ public:
+     static int64_t toInt64(const string& aString) {
+ #ifdef _WIN32
+         return _atoi64(aString.c_str());
+-#elif defined(__HAIKU__)
++#elif defined(__HAIKU__) || !defined(__GLIBC__)
+         return strtoll(aString.c_str(), (char **)NULL, 10);
+ #else
+         return strtoq(aString.c_str(), (char **)NULL, 10);
+--- eiskaltdcpp-qt/src/main.cpp
++++ eiskaltdcpp-qt/src/main.cpp.new
+@@ -86,7 +86,7 @@ void parseCmdLine(const QStringList &);
+ #if !defined(Q_OS_WIN)
  #include <unistd.h>
  #include <signal.h>
--#if !defined (__HAIKU__)
-+#if !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
  #include <execinfo.h>
  
  #ifdef ENABLE_STACKTRACE
-@@ -127,7 +127,7 @@
+@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
          return 0;
      }
  
--#if !defined (Q_WS_WIN) && !defined (__HAIKU__)
-+#if !defined (Q_WS_WIN) && !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_WIN) && !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_WIN) && !defined (Q_OS_HAIKU) && defined (__GLIBC__)
      installHandlers();
  #endif
  
diff --git a/srcpkgs/eiskaltdcpp-qt/patches/upnpc.cpp.patch b/srcpkgs/eiskaltdcpp-qt/patches/upnpc.cpp.patch
deleted file mode 100644
index fa4cd62247af..000000000000
--- a/srcpkgs/eiskaltdcpp-qt/patches/upnpc.cpp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- extra/upnpc.cpp	2015-04-20 02:57:16.000000000 +0500
-+++ extra/upnpc.new	2017-10-09 15:00:00.000000000 +0500
-@@ -41,9 +41,13 @@
- 
- bool UPnPc::init()
- {
--    UPNPDev *devices = upnpDiscover(5000, SettingsManager::getInstance()->isDefault(SettingsManager::BIND_ADDRESS) ? 0 : SETTING(BIND_ADDRESS).c_str(), 0, 0
--#if (MINIUPNPC_API_VERSION == 8 || defined(MINIUPNPC16))
--                                        , 0, 0);
-+    UPNPDev *devices = upnpDiscover(5000, SettingsManager::getInstance()->isDefault(SettingsManager::BIND_ADDRESS) ? 0 : SETTING(BIND_ADDRESS).c_str(), NULL, 0
-+#if (MINIUPNPC_API_VERSION >= 8 || defined(MINIUPNPC16))
-+                                        , 0
-+#if (MINIUPNPC_API_VERSION >= 14)
-+                                        , 2
-+#endif
-+                                        , NULL);
- #else
-                                         );
- #endif
-@@ -63,8 +67,8 @@
-     const string port_ = Util::toString(port);
- 
-     return UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, port_.c_str(), port_.c_str(),
--        Util::getLocalIp().c_str(), description.c_str(), protocols[protocol], NULL
--#if (MINIUPNPC_API_VERSION == 8 || defined(MINIUPNPC16))
-+        Util::getLocalIp(AF_INET).c_str(), description.c_str(), protocols[protocol], NULL
-+#if (MINIUPNPC_API_VERSION >= 8 || defined(MINIUPNPC16))
-                                                                                     , 0) == UPNPCOMMAND_SUCCESS;
- #else
-                                                                                     ) == UPNPCOMMAND_SUCCESS;
diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 39e5a8ad3988..12b4a9aa465a 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,19 +1,20 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
-version=2.2.10
-revision=11
+version=2.4.1
+revision=1
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
-configure_args="-DUSE_MINIUPNP=ON -DUSE_QT5=ON -DUSE_QT=OFF"
+configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel boost-devel
- qt5-devel miniupnpc-devel qt5-multimedia-devel"
-short_desc="EiskaltDC++ is a cross-platform Direct Connect and ADC clent"
-maintainer="samsky72 <samsky72@gmail.com>"
+makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+ miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
+ qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
+short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"
+maintainer="Boris Pek <tehnick-8@yandex.ru>"
 license="GPL-3.0-or-later"
-homepage="https://sourceforge.net/projects/eiskaltdcpp"
+homepage="https://github.com/eiskaltdcpp/eiskaltdcpp"
 distfiles="https://github.com/eiskaltdcpp/eiskaltdcpp/archive/v${version}.tar.gz"
-checksum=e461c8c499e459651d6382a6ded6788e5ac9a9c4ff26386c3cf073d94d606127
+checksum=818f9622ac28d3cf1ae58af0a01e25af702781822b6edeb99c9d05d408a4798f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 7a514210c0d41802ce2877ce3c37c9a321295666 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 31 Jan 2021 20:54:14 +0100
Subject: [PATCH 0818/3482] libXpresent: remove presentproto dependency

presentproto no longer exists as standalone but is contained in xorgproto.
---
 srcpkgs/libXpresent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libXpresent/template b/srcpkgs/libXpresent/template
index 201b01a18430..b68957b445f6 100644
--- a/srcpkgs/libXpresent/template
+++ b/srcpkgs/libXpresent/template
@@ -14,7 +14,7 @@ checksum=92f1bdfb67ae2ffcdb25ad72c02cac5e4912dc9bc792858240df1d7f105946fa
 
 libXpresent-devel_package() {
 	depends="${sourcepkg}-${version}_${revision} libX11-devel libXext-devel
-	 libXfixes-devel libXrandr-devel presentproto xorgproto xproto"
+	 libXfixes-devel libXrandr-devel xorgproto xproto"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 10bfff5b4d8cac4f035471641b2f269da05c1cfc Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 30 Jan 2021 23:36:05 +0200
Subject: [PATCH 0819/3482] dnsmasq: update to 2.84.

Closes: #28344 [via git-merge-pr]
---
 srcpkgs/dnsmasq/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index 884ea0557b3d..b680b2ad7fae 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -1,6 +1,6 @@
 # Template file for 'dnsmasq'
 pkgname=dnsmasq
-version=2.83
+version=2.84
 revision=1
 conf_files="/etc/dnsmasq.conf"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 changelog="http://www.thekelleys.org.uk/dnsmasq/CHANGELOG"
 distfiles="http://www.thekelleys.org.uk/dnsmasq/dnsmasq-${version}.tar.gz"
-checksum=6b67955873acc931bfff61a0a1e0dc239f8b52e31df50e9164d3a4537571342f
+checksum=4caf385376f34fae5c55244a1f870dcf6f90e037bb7c4487210933dc497f9c36
 system_accounts="dnsmasq"
 dnsmasq_homedir="/var/chroot"
 

From 2319da1841953c2d5d8780b461d52a2b5cb30d0a Mon Sep 17 00:00:00 2001
From: lambdagolem <31174944+lambdagolem@users.noreply.github.com>
Date: Sun, 31 Jan 2021 21:03:46 +0100
Subject: [PATCH 0820/3482] pmbootstrap: update to 1.29.1.

---
 srcpkgs/pmbootstrap/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 4d6f34921002..0f486a2dd23f 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
-version=1.27.0
-revision=2
+version=1.29.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools coreutils procps-ng libressl git"
@@ -10,7 +10,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://postmarketos.org"
 distfiles="https://gitlab.com/postmarketOS/pmbootstrap/-/archive/${version}/pmbootstrap-${version}.tar.gz"
-checksum=0f99436c5af39fa90d1c5cd8cb3794bc234d087402f262a35d7856d0135b5230
+checksum=d3608be5db1dedfa150c90248aadbc72211274802cfe2c0b87427b8cf91a73b4
 
 do_check() {
 	# tests require chroot

From 744dc145d526f14a80d49216408583664ad09bb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 31 Jan 2021 22:54:39 +0100
Subject: [PATCH 0821/3482] clisp: fix ftbfs; xlintify

---
 srcpkgs/clisp/template | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/clisp/template b/srcpkgs/clisp/template
index d0576f7c9861..0bd8d107d041 100644
--- a/srcpkgs/clisp/template
+++ b/srcpkgs/clisp/template
@@ -1,30 +1,35 @@
 # Template file for 'clisp'
 pkgname=clisp
 version=2.49
-revision=4
+revision=5
 # possibly works elsewhere but not in an ancient 2010 release
 archs="x86_64* i686*"
 build_style=configure
-configure_args="--prefix=/usr --disable-mmap --without-dynamic-modules
- $(vopt_with readline)"
+configure_args="--prefix=/usr --disable-mmap --disable-rpath
+ --without-dynamic-modules $(vopt_with readline)"
+hostmakedepends="ffcall"
+makedepends="libsigsegv-devel $(vopt_if readline readline-devel)"
 short_desc="ANSI Common Lisp Interpreter, Compiler and Debugger"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://clisp.cons.org"
-makedepends="ffcall libsigsegv-devel $(vopt_if readline readline-devel)"
 distfiles="${SOURCEFORGE_SITE}/clisp/clisp-${version}.tar.bz2"
 checksum=8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890
-
-case "${XBPS_TARGET_MACHINE}" in
-	i686*) CFLAGS="-falign-functions=4" ;;
-esac
-
 nopie=yes
 nocross=yes
 lib32disabled=yes
 disable_parallel_build=yes
 build_options="readline"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686-musl) broken="*** - MULTIPLE-VALUE-SETQ: variable EXTRA-FILE-TYPES has no value";;
+esac
+
+CFLAGS="-mtune=generic"
+if [ "$XBPS_TARGET_WORDSIZE" == 32 ]; then
+	CFLAGS+=" -falign-functions=4"
+fi
+
 do_build() {
 	# Need to increase the Limit
 	ulimit -s 16384

From 7827ead0655d9b9862b39faed0237f3ec85b0c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 1 Feb 2021 08:11:46 +0700
Subject: [PATCH 0822/3482] passff-host: remove update file

---
 srcpkgs/passff-host/update | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 srcpkgs/passff-host/update

diff --git a/srcpkgs/passff-host/update b/srcpkgs/passff-host/update
deleted file mode 100644
index d012a166fd17..000000000000
--- a/srcpkgs/passff-host/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://api.github.com/repos/passff/passff-host/tags
-pattern="v\K[^\d]*([\d\.]+)"

From 6009f70f3f6333679d78f10d0e3a6cc41dd7f478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 31 Jan 2021 22:30:44 -0300
Subject: [PATCH 0823/3482] nwg-launchers: update to 0.4.4.

---
 srcpkgs/nwg-launchers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nwg-launchers/template b/srcpkgs/nwg-launchers/template
index 700dfed46763..776fd408d7a1 100644
--- a/srcpkgs/nwg-launchers/template
+++ b/srcpkgs/nwg-launchers/template
@@ -1,6 +1,6 @@
 # Template file for 'nwg-launchers'
 pkgname=nwg-launchers
-version=0.4.3
+version=0.4.4
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/nwg-piotr/nwg-launchers"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=59ca116a23210278f481bd5754d242455737e929aa2e5cc91a5a8fb1fcd2b2e6
+checksum=c8a0efdfdcad764bea08c677b9ee81d46a723815a005bc8b88bb5b726d0231cc

From cbcfa478469477c04b0588939b69a041c277e6a3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 01:33:16 +0200
Subject: [PATCH 0824/3482] mtpaint: update to 3.50.03.

---
 srcpkgs/mtpaint/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mtpaint/template b/srcpkgs/mtpaint/template
index a799ea000c41..1d623607c11d 100644
--- a/srcpkgs/mtpaint/template
+++ b/srcpkgs/mtpaint/template
@@ -1,15 +1,15 @@
 # Template file for 'mtpaint'
 pkgname=mtpaint
-version=3.50.02
+version=3.50.03
 revision=1
-_commit=f6e8058c117cc11ae4cd5b1b11391d20de7f06cf
+_commit=40bde4557c254188b2924c90f4a35eef784b0a12
 wrksrc="mtPaint-${_commit}"
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man
- imagick cflags GIF jpeg jp2v2 tiff lcms2 man gtk3 webp
+ imagick cflags jpeg jp2v2 tiff lcms2 man gtk3 webp
  intl release"
 hostmakedepends="pkg-config gettext"
-makedepends="giflib-devel gtk+3-devel libmagick-devel libopenjpeg2-devel
+makedepends="gtk+3-devel libmagick-devel libopenjpeg2-devel
  libwebp-devel gettext-devel"
 depends="desktop-file-utils"
 short_desc="Simple GTK painting program"
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="http://mtpaint.sourceforge.net/"
 changelog="https://raw.githubusercontent.com/wjaguar/mtPaint/master/NEWS"
 distfiles="https://github.com/wjaguar/mtPaint/archive/${_commit}.tar.gz"
-checksum=728265164534b07895f6bf70d5e546581dbd6bddd727bf83d2784eea374d7e35
+checksum=96622c392652478abb6cd29ffcc10885d8ed0007ec45bd8841f45f9dcff8bb31
 
 post_install() {
 	vdoc doc/vcode.t2t

From a19db2dc4255cc41f168790026c7eff2f0817cff Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 31 Jan 2021 19:00:55 +0100
Subject: [PATCH 0825/3482] shfmt: update to 3.2.2.

---
 srcpkgs/shfmt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index a897f227fb52..b4e1ec13a27f 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.2.1
+version=3.2.2
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=a1470285e04b69ee7a2bb3948b64e1da9cabe59658997b50aac7c64465f330bd
+checksum=e990aed5bb167f5cfc6790243ec3cc5e18508a64e8c9609ed5015634ba053b16
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1

From 34b0f37b700ae30a068597bb94818cba26fbd411 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 01:59:01 +0200
Subject: [PATCH 0826/3482] font-sarasa-gothic: update to 0.17.0.

---
 srcpkgs/font-sarasa-gothic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 960ac449d194..25a9648e4641 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.16.3
+version=0.17.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=9019ba649400239db8331044f1dae5c6624c19a24d8a202bb193177d89005acc
+checksum=56b693d54ec185acb704d19640daa5bd1f4a98a1bdec5f1d447b9def5f4d6210
 
 font_dirs="/usr/share/fonts/TTF"
 

From 6e16db36833149a08265a99249d879248306da75 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 01:52:37 +0200
Subject: [PATCH 0827/3482] kdiff3: update to 1.8.5.

---
 srcpkgs/kdiff3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdiff3/template b/srcpkgs/kdiff3/template
index c488570332ed..5ff9543f44f2 100644
--- a/srcpkgs/kdiff3/template
+++ b/srcpkgs/kdiff3/template
@@ -1,6 +1,6 @@
 # Template file for 'kdiff3'
 pkgname=kdiff3
-version=1.8.2
+version=1.8.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Ben Sung Hsu <pobetiger+kdiff3@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/development/kdiff3"
 distfiles="${KDE_SITE}/kdiff3/kdiff3-${version}.tar.xz"
-checksum=fb7154778491dc11b9bd38465164ce1a7c2d1810f70a57cd4268ffad42d5bb68
+checksum=bc92f7d04eb123f9c56dbe3047af67bf715240fa99487ac1d1ccf2a45e0854c1
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 6041f96bef58174255e6db66428a3c866e59dab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 31 Jan 2021 00:50:04 -0300
Subject: [PATCH 0828/3482] bind: fix named service.

When used with the -f option, it can crash, likely due to a lack of
syslog. Using -g makes it work but still keeps it in the foreground, by
logging directly to stderr. By adding a logger to it, we follow the
pattern of most other services.

Fixes #18961.
---
 srcpkgs/bind/files/named/log/run | 2 ++
 srcpkgs/bind/files/named/run     | 3 ++-
 srcpkgs/bind/template            | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/bind/files/named/log/run

diff --git a/srcpkgs/bind/files/named/log/run b/srcpkgs/bind/files/named/log/run
new file mode 100644
index 000000000000..142fbd4af3f9
--- /dev/null
+++ b/srcpkgs/bind/files/named/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -t named
diff --git a/srcpkgs/bind/files/named/run b/srcpkgs/bind/files/named/run
index 9b510127a300..b6bf67c39e9e 100755
--- a/srcpkgs/bind/files/named/run
+++ b/srcpkgs/bind/files/named/run
@@ -1,4 +1,5 @@
 #!/bin/sh
+exec 2>&1
 mkdir -p /var/run/named || exit 1
 chown named:named /var/run/named || exit 1
-exec named -u named -f -c /etc/named/named.conf
+exec named -u named -g -c /etc/named/named.conf
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f0744606e44e..57243a23f4fc 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.7
-revision=2
+revision=3
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure

From 939f1c6b619a24fba71a5e3f0e3ce85f3facf285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 01:19:15 -0300
Subject: [PATCH 0829/3482] wayland: update to 0.19.0, adopt.

Also fix ndebug mode with meson options instead of CFLAGS. Disabling
NDEBUG is necessary for the test suite to work correctly.

Thanks ifreund for pointing me in this direction.
---
 srcpkgs/wayland/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template
index be69b35852df..624441d48a86 100644
--- a/srcpkgs/wayland/template
+++ b/srcpkgs/wayland/template
@@ -1,19 +1,18 @@
 # Template file for 'wayland'
 pkgname=wayland
-version=1.18.0
-revision=3
+version=1.19.0
+revision=1
 build_style=meson
-configure_args="-Ddocumentation=false"
+# "Tests must not be built with NDEBUG defined, they rely on assert()."
+configure_args="-Ddocumentation=false -Db_ndebug=false"
 hostmakedepends="flex pkg-config"
 makedepends="expat-devel libffi-devel libfl-devel libxml2-devel"
 short_desc="Wayland protocol compositor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayland.freedesktop.org/"
 distfiles="https://wayland.freedesktop.org/releases/wayland-${version}.tar.xz"
-checksum=4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d
-
-CFLAGS="-UNDEBUG"
+checksum=baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From f18b2e50d15403ea132ba8d7d6373fda2e313fd8 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Sun, 31 Jan 2021 20:22:13 -0500
Subject: [PATCH 0830/3482] oragono: update to 2.5.0.

---
 srcpkgs/oragono/patches/paths.patch | 16 ++++++++--------
 srcpkgs/oragono/template            |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/oragono/patches/paths.patch b/srcpkgs/oragono/patches/paths.patch
index c06f9fe21705..22ecab8b1b1c 100644
--- a/srcpkgs/oragono/patches/paths.patch
+++ b/srcpkgs/oragono/patches/paths.patch
@@ -1,5 +1,5 @@
---- default.yaml.orig	2020-07-26 08:57:19.471641788 -0400
-+++ default.yaml	2020-07-26 08:59:56.772839651 -0400
+--- default.yaml.orig	2021-01-30 22:19:08.000000000 -0500
++++ default.yaml	2021-01-31 20:20:33.092293843 -0500
 @@ -50,8 +50,8 @@
          # The standard SSL/TLS port for IRC is 6697. This will listen on all interfaces:
          ":6697":
@@ -8,10 +8,10 @@
 -                key: privkey.pem
 +                cert: /var/lib/oragono/fullchain.pem
 +                key: /var/lib/oragono/privkey.pem
-                 # 'proxy' should typically be false. It's only for Kubernetes-style load
-                 # balancing that does not terminate TLS, but sends an initial PROXY line
-                 # in plaintext.
-@@ -159,7 +159,7 @@
+             # 'proxy' should typically be false. It's for cloud load balancers that
+             # always send a PROXY protocol header ahead of the connection. See the
+             # manual ("Reverse proxies") for more details.
+@@ -166,7 +166,7 @@
  
      # motd filename
      # if you change the motd, you should move it to ircd.motd
@@ -20,7 +20,7 @@
  
      # motd formatting codes
      # if this is true, the motd is escaped using formatting codes like $c, $b, and $i
-@@ -671,7 +671,7 @@
+@@ -714,7 +714,7 @@
  # datastore configuration
  datastore:
      # path to the datastore
@@ -29,7 +29,7 @@
  
      # if the database schema requires an upgrade, `autoupgrade` will attempt to
      # perform it automatically on startup. the database will be backed
-@@ -700,7 +700,7 @@
+@@ -743,7 +743,7 @@
      default: en
  
      # which directory contains our language files
diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
index 7e64061e2895..da7230580421 100644
--- a/srcpkgs/oragono/template
+++ b/srcpkgs/oragono/template
@@ -1,6 +1,6 @@
 # Template file for 'oragono'
 pkgname=oragono
-version=2.4.0
+version=2.5.0
 revision=1
 build_style=go
 go_import_path="github.com/oragono/oragono"
@@ -10,7 +10,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="MIT"
 homepage="https://oragono.io/"
 distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=7740b77dac399c595c810a70b094c41f3933eb2e31a582a602caada8a96b83c7
+checksum=b954b20a19a3cfbc0c76febc6277217b275b355e0989edbd6d1a80a1accb6ded
 conf_files="/etc/oragono.conf"
 system_accounts="_oragono"
 _oragono_homedir="/var/lib/oragono"

From cccef0dd214dd1de23761ecc066d87d9fe69733d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 31 Jan 2021 21:22:18 -0500
Subject: [PATCH 0831/3482] python3-pyzmq: update to 22.0.2.

---
 srcpkgs/python3-pyzmq/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 162a999f7a74..db236716fa03 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=21.0.2
+version=22.0.2
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=098c13c6198913c2a0690235fa74d2e49161755f66b663beaec89651554cc79c
+checksum=d7b82a959e5e22d492f4f5a1e650e909a6c8c76ede178f538313ddb9d1e92963
 
 pre_build() {
 	cat > setup.cfg <<-EOF

From 73531c5d9171f38a27c57c3fa2d545e62cc535bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 31 Jan 2021 21:22:21 -0500
Subject: [PATCH 0832/3482] python3-matplotlib: update to 3.3.4.

---
 srcpkgs/python3-matplotlib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 189cc2ac711f..095a661d60ca 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.3.3
-revision=2
+version=3.3.4
+revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
 build_helper="numpy"
@@ -14,7 +14,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=12c8a48373b7e46d4c9b84629a8964341357d9a56ac2ac1f2475669bf3102f94
+checksum=ce7cebd3df11a032fff9b3a32029f49f0fc7c322f556f26ea9ef812d6e43cb21
 replaces="python3-matplotlib-data>=0"
 
 pre_build() {

From 7885f1cd9cc1c4ca7ef95831eedb9bc41b5ed306 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 31 Jan 2021 21:22:28 -0500
Subject: [PATCH 0833/3482] python-Jinja2: update to 2.11.3.

---
 srcpkgs/python-Jinja2/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-Jinja2/template b/srcpkgs/python-Jinja2/template
index 88dd81f12667..d447aebca8c9 100644
--- a/srcpkgs/python-Jinja2/template
+++ b/srcpkgs/python-Jinja2/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Jinja2'
 pkgname=python-Jinja2
-version=2.11.2
-revision=2
+version=2.11.3
+revision=1
 wrksrc="Jinja2-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="http://jinja.pocoo.org/"
 changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0
+checksum=a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6
 
 do_check() {
 	PYTHONPATH=src python2 -m pytest

From b88994292bd515f9295e4b0207114512c068aceb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 31 Jan 2021 21:27:35 -0500
Subject: [PATCH 0834/3482] python3-pyopencl: update to 2021.1.1.

---
 srcpkgs/python3-pyopencl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 2ceffe9836fd..326632e9778d 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
-version=2021.1
+version=2021.1.1
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11, Apache-2.0, BSD-3-Clause"
 homepage="https://mathema.tician.de/software/pyopencl"
 distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz"
-checksum=262a29708a5465bd12b75d838f8d1107cd9321f54cb1c553c0064db10f3d5041
+checksum=ee78d2696a4bb62c6def2678d662d67d27c103621b8c00e21158d16ccbf5c346
 
 do_configure() {
 	./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \

From ce5ab1f9a6a6a5ef6e7459a33b7fc20f085a0657 Mon Sep 17 00:00:00 2001
From: Byl3x <mbilek06@gmail.com>
Date: Thu, 28 Jan 2021 15:58:46 +0100
Subject: [PATCH 0835/3482] qutebrowser: update to 2.0.1

Closes: #28286 [via git-merge-pr]
---
 srcpkgs/qutebrowser/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 3ff0c7da5f0d..32a464e07e70 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,19 +1,18 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=1.14.1
+version=2.0.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
-depends="python3-PyQt5-quick python3-Jinja2 python3-Pygments python3-pyPEG2
- python3-yaml python3-attrs python3-PyQt5-opengl python3-PyQt5-sql
- qt5-plugin-sqlite python3-setuptools"
+depends="python3-PyQt5-quick python3-Jinja2 python3-yaml
+ python3-PyQt5-opengl python3-PyQt5-sql qt5-plugin-sqlite"
 short_desc="Keyboard-focused browser with a minimal GUI"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=554c145ff64b1a92d4f53e3c624aaad51baafb7cb5b469bc815ae2e0e1958796
+checksum=aa988d61f1a396d7e7101054851291cf57e7cf19e7fc0eeffd30b672570ab242
 nostrip=yes
 
 build_options="webengine"
@@ -36,6 +35,12 @@ pre_build() {
 	a2x -f manpage doc/qutebrowser.1.asciidoc
 }
 
+do_check() {
+	# testing requires unpackaged plugins:
+	# pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
+	:
+}
+
 post_install() {
 	vman doc/qutebrowser.1
 	vinstall misc/org.qutebrowser.qutebrowser.desktop 644 usr/share/applications

From c5489f0400f2c2c5b210ae3d8e1e3cbc61f1442d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 31 Jan 2021 21:33:59 -0500
Subject: [PATCH 0836/3482] python3-pyPEG2: remove package

Upstream package hasn't been touched in more than five years, its
Bitbucket repository is dead, and the only dependant (qutebrowser)
dropped its dependency.
---
 srcpkgs/python3-pyPEG2/template   | 15 ---------------
 srcpkgs/removed-packages/template |  3 ++-
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/python3-pyPEG2/template

diff --git a/srcpkgs/python3-pyPEG2/template b/srcpkgs/python3-pyPEG2/template
deleted file mode 100644
index d936155e7bb4..000000000000
--- a/srcpkgs/python3-pyPEG2/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python3-pyPEG2'
-pkgname=python3-pyPEG2
-version=2.15.2
-revision=7
-wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3-lxml"
-short_desc="Intrinsic PEG Parser-Interpreter for Python3"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only"
-homepage="http://fdik.org/pyPEG/"
-distfiles="${PYPI_SITE}/p/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
-checksum=2b2d4f80d8e1a9370b2a91f4a25f4abf7f69b85c8da84cd23ec36451958a1f6d
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 225594dc4b8e..7ccbf1963720 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=18
+revision=19
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -179,6 +179,7 @@ replaces="
  python-pyenet<=1.3.13.post7_2
  python-pyside<=1.2.2_7
  python-pytest-relaxed<=1.1.2_2
+ python3-pyPEG2<=2.15.2_7
  qimageblitz<=0.0.6_4
  qucs<=0.0.19_2
  qt<=4.8.7_29

From fb1736e406391e69ff8e654e638e1ee42872e43a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 31 Jan 2021 21:52:16 -0500
Subject: [PATCH 0837/3482] python3-packaging: update to 20.9.

---
 srcpkgs/python3-packaging/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-packaging/template b/srcpkgs/python3-packaging/template
index b5639817dd9b..0f5e75f7275e 100644
--- a/srcpkgs/python3-packaging/template
+++ b/srcpkgs/python3-packaging/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-packaging'
 pkgname=python3-packaging
-version=20.8
+version=20.9
 revision=1
 wrksrc="packaging-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, BSD-2-Clause"
 homepage="https://github.com/pypa/packaging"
 distfiles="${PYPI_SITE}/p/packaging/packaging-${version}.tar.gz"
-checksum=78598185a7008a470d64526a8059de9aaa449238f280fc9eb6b13ba6c4109093
+checksum=5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5
 
 do_check() {
 	: provides no tests

From 707c0cda46329e6805e5479c27913c341cf10674 Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 17:51:32 -0800
Subject: [PATCH 0838/3482] cargo: added patch for #28372

---
 srcpkgs/cargo/patches/fix-serde.diff | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/cargo/patches/fix-serde.diff

diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
new file mode 100644
index 000000000000..d76499f5cd9f
--- /dev/null
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -0,0 +1,14 @@
+This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
+diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
+index 758f5c23f1..a70cd0dce8 100644
+--- src/cargo/util/config/de.rs
++++ src/cargo/util/config/de.rs
+@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> {
+                 seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy()))
+             }
+             Definition::Environment(env) => {
+-                seed.deserialize(Tuple2Deserializer(1i32, env.as_ref()))
++                seed.deserialize(Tuple2Deserializer(1i32, env.as_str()))
+             }
+             Definition::Cli => seed.deserialize(Tuple2Deserializer(2i32, "")),
+         }

From e604665ea2273b7646cda1c888c814edf52d1870 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:41:41 +0200
Subject: [PATCH 0839/3482] skalibs: update to 2.10.0.1.

---
 common/shlibs            | 2 +-
 srcpkgs/skalibs/template | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2f298ff9ad30..563a2b91b8cc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2303,7 +2303,7 @@ libgnunettransport.so.2 gnunet-0.12.2_1
 libgnunettransportapplication.so.0 gnunet-0.12.2_1
 libgnunettransportcore.so.0 gnunet-0.12.2_1
 libgnunettransportcommunicator.so.0 gnunet-0.12.2_1
-libskarnet.so.2.9 skalibs-2.9.0.0_1
+libskarnet.so.2.10 skalibs-2.10.0.1_1
 libKF5BalooWidgets.so.5 baloo-widgets5-17.04.3_1
 libtidy.so.5 libtidy5-5.1.25_1
 libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1
diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template
index f8e5b43977cf..cd1ff83ced91 100644
--- a/srcpkgs/skalibs/template
+++ b/srcpkgs/skalibs/template
@@ -1,8 +1,7 @@
 # Template file for 'skalibs'
 pkgname=skalibs
-version=2.9.3.0
+version=2.10.0.1
 revision=1
-_sysdepspkg=skaware-void-sysdeps
 build_style=configure
 configure_args="--libdir=/usr/lib --enable-static --enable-shared
  --enable-force-devr
@@ -10,12 +9,12 @@ configure_args="--libdir=/usr/lib --enable-static --enable-shared
  --bindir=/usr/bin --dynlibdir=/usr/lib
  --with-sysdep-devurandom=yes"
 short_desc="General purpose libraries for building software from skarnet.org"
-maintainer="bougyman <bougyman@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://skarnet.org/software/skalibs/"
 changelog="https://skarnet.org/software/skalibs/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=f01a07049d384097864410f9251447ad899db0d17f82cd8ebc6b7000d7783b44
+checksum=4ffbae8fdcd5108916bbea8eb6f795106d2c3189039e331bcd4b8e00e9971cb2
 
 post_install() {
 	vlicense COPYING LICENSE

From ce3fa2ad332fdf9aee1dee44f6f0220e9afb2176 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:44:10 +0200
Subject: [PATCH 0840/3482] New package: s6-man-pages-2.10.0.1.1.

---
 srcpkgs/s6-man-pages/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/s6-man-pages/template

diff --git a/srcpkgs/s6-man-pages/template b/srcpkgs/s6-man-pages/template
new file mode 100644
index 000000000000..7b26862c1d18
--- /dev/null
+++ b/srcpkgs/s6-man-pages/template
@@ -0,0 +1,20 @@
+# Template file for 's6-man-pages'
+pkgname=s6-man-pages
+version=2.10.0.1.1
+revision=1
+build_style=gnu-makefile
+hostmakedepends="mdocml"
+short_desc="Ports of the HTML documentation for the s6 supervision suite to mdoc(7)"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="ISC"
+homepage="https://github.com/flexibeast/s6-man-pages"
+distfiles="https://github.com/flexibeast/s6-man-pages/archive/v${version}.tar.gz"
+checksum=de85efead2548166df4450286abbae4f9450dcff49e300ffba2b8e34a362078e
+
+
+do_install() {
+	vmkdir usr/share/man/man1
+	vmkdir usr/share/man/man7
+	make MANPATH="${DESTDIR}/usr/share/man"  install-man
+	vlicense LICENSE
+}

From 7e86044d4446cb3e09c12a7188a68baa9644b514 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:44:20 +0200
Subject: [PATCH 0841/3482] s6: update to 2.10.0.1.

---
 srcpkgs/s6/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template
index da6adbf90157..1dd9bd9c9879 100644
--- a/srcpkgs/s6/template
+++ b/srcpkgs/s6/template
@@ -1,7 +1,7 @@
 # Template file for 's6'
 pkgname=s6
-version=2.9.2.0
-revision=2
+version=2.10.0.1
+revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
@@ -14,7 +14,7 @@ license="ISC"
 homepage="http://skarnet.org/software/s6/"
 changelog="https://skarnet.org/software/s6/upgrade.html"
 distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz"
-checksum=363db72af8fffba764b775c872b0749d052805b893b07888168f59a841e9dddd
+checksum=d0026f0fb4790febbd45f66bdcded54fab4a27ac2f579c075267a21154a0d1f5
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -31,7 +31,7 @@ post_install() {
 
 s6-doc_package() {
 	short_desc="Documentation for s6"
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} s6-man-pages"
 	pkg_install() {
 		vmove usr/share/doc
 	}

From 9cb6825d1bdd1418fbec128b30840c71ff530ce0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:44:45 +0200
Subject: [PATCH 0842/3482] s6-rc: update to 0.5.2.1.

---
 srcpkgs/s6-rc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-rc/template b/srcpkgs/s6-rc/template
index 23744d4df96e..31cce8d8e956 100644
--- a/srcpkgs/s6-rc/template
+++ b/srcpkgs/s6-rc/template
@@ -1,6 +1,6 @@
 # Template file for 's6-rc'
 pkgname=s6-rc
-version=0.5.2.0
+version=0.5.2.1
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-rc/"
 changelog="https://skarnet.org/software/s6-rc/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1ab21a9bdde61b50e3d9deab867e01f808064dce653b0ebf8e5f5125d57cfee2
+checksum=2842fa55e2bddb65573d78d2c475c4a2f2b26b9258a18b457f8a0342e2fafa0a
 
 post_install() {
 	vlicense COPYING

From e96acd844c4bf61348aa1fe4dcf90b1e057c1771 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:44:50 +0200
Subject: [PATCH 0843/3482] s6-portable-utils: update to 2.2.3.1.

---
 srcpkgs/s6-portable-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template
index c0e19c6085a4..24572e52d36f 100644
--- a/srcpkgs/s6-portable-utils/template
+++ b/srcpkgs/s6-portable-utils/template
@@ -1,6 +1,6 @@
 # Template file for 's6-portable-utils'
 pkgname=s6-portable-utils
-version=2.2.3.0
+version=2.2.3.1
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
@@ -13,7 +13,7 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-portable-utils/"
 changelog="https://skarnet.org/software/s6-portable-utils/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=29baab7ca8d5c97cb5f311f4ad359ecee4ed13249fb51e351f4bbc175de47f18
+checksum=43e68a9abec873b337baeee92075a1c2e22cdfffd595cb91475fdcb10b6441cf
 
 post_install() {
 	vlicense COPYING

From fdfcd48b3f1af5e40a42a7765a70e4220197713b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:44:57 +0200
Subject: [PATCH 0844/3482] s6-networking: update to 2.4.0.0.

---
 srcpkgs/s6-networking/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index d3a33e7b7efa..75ac1c3aa1f1 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -1,7 +1,7 @@
 # Template file for 's6-networking'
 pkgname=s6-networking
-version=2.3.2.0
-revision=2
+version=2.4.0.0
+revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
  $(vopt_if bearssl --enable-ssl=bearssl)
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-networking"
 changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=bbe36a8460d90f3bff56c934811876186f7224ced5bdc15c2c96d49b4e917d12
+checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
 build_options="bearssl libressl"
 build_options_default="bearssl"

From 75f79a15d0170041684facdb9f1264066575b298 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:05 +0200
Subject: [PATCH 0845/3482] s6-linux-utils: update to 2.5.1.4.

---
 srcpkgs/s6-linux-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template
index 9e4cf9d4ff73..32e443a6cb0e 100644
--- a/srcpkgs/s6-linux-utils/template
+++ b/srcpkgs/s6-linux-utils/template
@@ -1,6 +1,6 @@
 # Template file for 's6-linux-utils'
 pkgname=s6-linux-utils
-version=2.5.1.3
+version=2.5.1.4
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --includedir=/usr/include
@@ -13,7 +13,7 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-linux-utils"
 changelog="https://skarnet.org/software/s6-linux-utils/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=4471511c9ce995c5ac61e0714def5a05fcabe730ef0bb93a42b12ad5bf007b71
+checksum=d8ad8dcc8d805646b655971ddcaabcd50094d8347bd49d859ba2c51713fbfd09
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

From c5c100c6248f71bccc2715a92b4e34d4d4d72a4d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:10 +0200
Subject: [PATCH 0846/3482] s6-dns: update to 2.3.5.0.

---
 srcpkgs/s6-dns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template
index c192e6286a20..e3258cbd684c 100644
--- a/srcpkgs/s6-dns/template
+++ b/srcpkgs/s6-dns/template
@@ -1,6 +1,6 @@
 # Template file for 's6-dns'
 pkgname=s6-dns
-version=2.3.3.0
+version=2.3.5.0
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib
@@ -12,7 +12,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="ISC"
 homepage="https://skarnet.org/software/s6-dns"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=2ac75918ff5eb4d6dabe33f7e55fa70cf3e6a9062ff87de5a35029ea22238716
+checksum=9f0b71c82cb51e9b7f998978d94c44e5e896fa60105f7233544db539572bb740
 
 post_install() {
 	vlicense COPYING

From 59dd658afc319c501668afb09405fcb456da1608 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:16 +0200
Subject: [PATCH 0847/3482] nsss: update to 0.1.0.0.

---
 srcpkgs/nsss/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nsss/template b/srcpkgs/nsss/template
index 0e9e472eef6d..bf23155fd7a5 100644
--- a/srcpkgs/nsss/template
+++ b/srcpkgs/nsss/template
@@ -1,7 +1,7 @@
 # Template file for 'nsss'
 pkgname=nsss
-version=0.0.2.2
-revision=2
+version=0.1.0.0
+revision=1
 # Only available for musl
 archs="*-musl"
 build_style=configure
@@ -10,12 +10,12 @@ configure_args="--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --bindir=/usr/bin --dynlibdir=/usr/lib --includedir=/usr/include/nsss"
 makedepends="skalibs-devel"
 short_desc="Minimal competing implementation of glibc's Name Switch Service"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://skarnet.org/software/nsss/"
 changelog="https://skarnet.org/software/nsss/upgrade.html"
 distfiles="https://skarnet.org/software/nsss/nsss-${version}.tar.gz"
-checksum=3345d76155b6a5d55b13b30cfecb0b9a21fd1264164f5f48b1c3eca57849a12a
+checksum=b88a389264a76893ef3ad9c086ea694f32b688ed22fb7480a2a172131c5f3d97
 
 do_check() {
 	: #checkdepends=s6, creates dependency cycle

From e8289a822f8ff56e1e885175b6b1bbd67155ceb7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:21 +0200
Subject: [PATCH 0848/3482] oblibs: update to 0.1.2.0.

---
 srcpkgs/oblibs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oblibs/template b/srcpkgs/oblibs/template
index f2e2aa0b53f1..c0e2f13f4477 100644
--- a/srcpkgs/oblibs/template
+++ b/srcpkgs/oblibs/template
@@ -1,6 +1,6 @@
 # Template file for 'oblibs'
 pkgname=oblibs
-version=0.1.1.1
+version=0.1.2.0
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=configure
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://framagit.org/Obarun/oblibs"
 distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.bz2"
-checksum=7b19fab4c1e3926c6f5dad6cc7373f250ac4bf9a1541ac01737e169b46dc765a
+checksum=0009cbe48d786bca14e8e973a5092de5270713db1940d538f38d6dfaa9e75e0a
 
 post_install() {
 	vlicense LICENSE

From 93115f5902dc420efacf5de074957cd5a974bf77 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:28 +0200
Subject: [PATCH 0849/3482] mdevd: update to 0.1.3.0.

---
 srcpkgs/mdevd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mdevd/template b/srcpkgs/mdevd/template
index a5c97a0dffa3..ef6e7d21553b 100644
--- a/srcpkgs/mdevd/template
+++ b/srcpkgs/mdevd/template
@@ -1,6 +1,6 @@
 # Template file for 'mdevd'
 pkgname=mdevd
-version=0.1.2.0
+version=0.1.3.0
 revision=1
 build_style=configure
 configure_args="--includedir=/usr/include --bindir=/usr/bin --libdir=/usr/lib
@@ -8,12 +8,12 @@ configure_args="--includedir=/usr/include --bindir=/usr/bin --libdir=/usr/lib
  --with-lib=${XBPS_CROSS_BASE}/usr/lib"
 makedepends="skalibs-devel"
 short_desc="Small mdev-compatible kernel hotplug daemon similar to udevd"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://skarnet.org/software/mdevd/"
 changelog="https://skarnet.org/software/mdevd/upgrade.html"
 distfiles="https://skarnet.org/software/mdevd/mdevd-${version}.tar.gz"
-checksum=952af443bc61b3694432f7799ba8182824083726872f47f45467c1a5b24796c1
+checksum=be89ab072c4de822a06e26579dcca10e85ae5fd5be23ba903415b4de8fe0fb6a
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

From 163863db813a55db446f17c6e18854e44291754c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:39 +0200
Subject: [PATCH 0850/3482] execline: update to 2.7.0.1.

---
 srcpkgs/execline/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template
index 71280116e889..7fc5dfbfc897 100644
--- a/srcpkgs/execline/template
+++ b/srcpkgs/execline/template
@@ -1,6 +1,6 @@
 # Template file for 'execline'
 pkgname=execline
-version=2.6.1.1
+version=2.7.0.1
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -8,12 +8,12 @@ configure_args="--libdir=/usr/lib --bindir=/usr/bin
  --with-lib=${XBPS_CROSS_BASE}/usr/lib"
 makedepends="skalibs-devel"
 short_desc="Non-interactive scripting language"
-maintainer="bougyman <bougyman@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://skarnet.org/software/execline/"
 changelog="https://skarnet.org/software/execline/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=394308f0349f962086a9695ca2bb5ef32cd38e5be6b7cec0b3d0cf35a2b2ba56
+checksum=cdf61164f97f764a06aba36986d549159df56f2d1a4b3bbf5467ee91ad8fdcdd
 
 CFLAGS="-fPIC"
 

From c44a05f68fb78d12541604bdaba885e4802c7a2f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:45 +0200
Subject: [PATCH 0851/3482] 66: update to 0.6.0.1.

---
 srcpkgs/66/INSTALL.msg | 7 ++++---
 srcpkgs/66/template    | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/66/INSTALL.msg b/srcpkgs/66/INSTALL.msg
index b9115b8ebe12..4eb62e16d376 100644
--- a/srcpkgs/66/INSTALL.msg
+++ b/srcpkgs/66/INSTALL.msg
@@ -1,3 +1,4 @@
-CAUTION: upgrading 66 to a new major version may require manual intervention!
-You may need to run the `66-update` utility or otherwise update your trees.
-For details, refer to https://framagit.org/Obarun/66/raw/master/NEWS.md
+CAUTION: 66 v0.6.0.0 has changes to the way the log and env options
+are handled in the frontend service file. Please consult the 
+documentation and make the appropriate changes before restarting
+or enabling your services, especially complex module services.
diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index 05d032bb8a58..e53d54b9801c 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,7 +1,7 @@
 # Template file for '66'
 pkgname=66
-version=0.5.1.1
-revision=2
+version=0.6.0.1
+revision=1
 wrksrc="66-v${version}"
 build_style=configure
 configure_args="--prefix=/usr
@@ -17,7 +17,7 @@ license="ISC"
 homepage="http://web.obarun.org/software/"
 changelog="https://framagit.org/Obarun/66/raw/master/NEWS.md"
 distfiles="https://framagit.org/Obarun/66/-/archive/v${version}/66-v${version}.tar.bz2"
-checksum=7a0db00186f1c2111d07cbcc082f769c806820607d7ba5f49e505abf06687e0c
+checksum=6267e6b51fa6a5c56ef10f385f89bbbf87dca51ff397be32a7dac161cbc25a9b
 
 conf_files="/etc/66/init /etc/66/init.conf"
 
@@ -25,7 +25,7 @@ system_accounts="_s6log"
 
 post_install() {
 	vdoc README.md
-	vlicense COPYING
+	vlicense LICENSE
 }
 
 66-doc_package() {

From f4edf61c18a9e06f7fb1a5bd0bc32aba01861217 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:49 +0200
Subject: [PATCH 0852/3482] 66-tools: update to 0.0.7.1.

---
 srcpkgs/66-tools/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/66-tools/template b/srcpkgs/66-tools/template
index 4fe5daae0758..4aa2674cca2f 100644
--- a/srcpkgs/66-tools/template
+++ b/srcpkgs/66-tools/template
@@ -1,7 +1,7 @@
 # Template file for '66-tools'
 pkgname=66-tools
-version=0.0.6.2
-revision=2
+version=0.0.7.1
+revision=1
 wrksrc=${pkgname}-v${version}
 build_style=configure
 configure_args="--prefix=/usr
@@ -16,8 +16,8 @@ license="ISC"
 homepage="http://web.obarun.org/software/index.html"
 changelog="https://framagit.org/Obarun/66-tools/-/raw/master/NEWS.md"
 distfiles="https://framagit.org/Obarun/66-tools/-/archive/v${version}/66-tools-v${version}.tar.gz"
-checksum=2b9617cf4101cc1a9f4877358ab73dfaa7a7dd8ea5f20409205645784eaef121
+checksum=370fda8d10254bfece86cbeabf7b4d48d8b47e91bd57fe5bae12e18b5a032547
 
 post_install() {
-	vlicense COPYING
+	vlicense LICENSE
 }

From e22592478359aed13b6591cacde4ad45e0e884b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Feb 2021 01:02:17 -0300
Subject: [PATCH 0853/3482] babl: update to 0.1.84.

- fix vala detection for cross
- remove manual disabling of build options, now that the meson build
style defaults features to "auto" instead of "enabled"
---
 srcpkgs/babl/template | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template
index 747bad3e40c8..4f3c155c995b 100644
--- a/srcpkgs/babl/template
+++ b/srcpkgs/babl/template
@@ -1,27 +1,19 @@
 # Template file for 'babl'
 pkgname=babl
-version=0.1.78
+version=0.1.84
 revision=1
 build_style=meson
 build_helper=gir
-configure_args="-Dwith-docs=false"
+configure_args="-Dwith-docs=false -Denable-gir=true"
 hostmakedepends="pkg-config vala-devel gobject-introspection"
-makedepends="lcms2-devel"
+makedepends="lcms2-devel vala-devel"
 short_desc="Dynamic pixel format translation library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-only"
 homepage="http://gegl.org/babl/"
 changelog="https://raw.githubusercontent.com/GNOME/babl/master/NEWS"
 distfiles="https://download.gimp.org/pub/babl/${version%.*}/babl-${version}.tar.xz"
-checksum=17d5493633bff5585d9f375bc4df5925157cd1c70ccd7c22a635be75c172523a
-
-case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*) ;;
-	*)
-		configure_args+=" -Denable-sse=false -Denable-sse2=false
-		 -Denable-sse3=false -Denable-sse4_1=false -Denable-avx2=false
-		 -Denable-f16c=false -Denable-mmx=false";;
-esac
+checksum=e7e38b8441f77feb9dc8231cb434a86190a21f2f3692c281457e99d35e9c34ea
 
 babl-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 2386d68b883a115f9c0755b70fe86b7a74ac1d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 30 Dec 2020 14:43:50 -0300
Subject: [PATCH 0854/3482] gegl: update to 0.4.28.

Introspection should always be enabled, since other packages depend on
it.
---
 srcpkgs/gegl/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index 961686af6b9f..417a91034a58 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,10 +1,10 @@
 # Template file for 'gegl'
 pkgname=gegl
-version=0.4.24
+version=0.4.28
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Ddocs=false -Dintrospection=$(vopt_if gir true false)
+configure_args="-Ddocs=false -Dintrospection=true
  -Dlibspiro=disabled -Dlibv4l=disabled -Dlibv4l2=disabled -Dlua=disabled
  -Dmrg=disabled -Dopenexr=disabled -Dsdl2=disabled -Dvapigen=disabled
  -Dlibav=disabled -Dumfpack=disabled"
@@ -18,10 +18,7 @@ license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://www.gimp.org"
 changelog="https://gitlab.gnome.org/GNOME/gegl/raw/master/docs/NEWS.txt"
 distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.xz"
-checksum=7765499f27341b0d16032e665319cbc12876483ff6a944fcdf24a9c58e3e254a
-
-build_options="gir"
-build_options_default="gir"
+checksum=1d110d8577d54cca3b34239315bd37c57ccb27dd4355655074a2d2b3fd897900
 
 gegl-devel_package() {
 	depends="json-glib-devel babl-devel gegl>=${version}_${revision}"

From 9022cae01a9a169f004a6f73d368e6a95ba5030e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 28 Dec 2020 19:50:50 -0300
Subject: [PATCH 0855/3482] gimp: update to 2.10.22, add HEIF support, locale
 data in /usr/share/locale.

Their gettext version check tries to link _nl_msg_cat_cntr, which is
available only in GNU gettext. This breaks when using musl's built-in
gettext impl, and leads to DATADIRNAME=lib being set, which is then used
to set gimplocaledir to /usr/lib/locale.

Update and HEIF based on
https://github.com/anddam/void-packages/commit/9202f62e3c9925fbdbbfc1e5415327afbd728c2a
---
 srcpkgs/gimp/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 61ae1ad17526..332fb0b12e42 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,16 +1,17 @@
 # Template file for 'gimp'
 pkgname=gimp
-version=2.10.20
-revision=3
+version=2.10.22
+revision=1
 build_style=gnu-configure
-configure_args="--disable-check-update"
+configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
  libtool pkg-config pygtk-devel perl-XML-Parser gtk-doc iso-codes"
 makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
  ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
  libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
  libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
- poppler-glib-devel pygtk-devel glib-networking libwebp-devel"
+ poppler-glib-devel pygtk-devel glib-networking libwebp-devel
+ libheif-devel libopenjpeg2-devel x265-devel"
 depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
 short_desc="GNU image manipulation program"
 conf_files="/etc/gimp/${version%%.*}.0/*"
@@ -18,7 +19,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-3.0-only"
 homepage="https://www.gimp.org"
 distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
-checksum=e12f9f874b1a007c4277b60aa81e0b67330be7e6153e5749ead839b902fc7b3c
+checksum=2db84b57f3778d80b3466d7c21a21d22e315c7b062de2883cbaaeda9a0f618bb
 python_version=2
 lib32disabled=yes
 no_generic_pkgconfig_link=yes
@@ -28,6 +29,8 @@ pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
 	fi
+	# don't allow configure to set DATADIRNAME=lib
+	vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
 }
 
 libgimp_package() {

From d0538bfd218807ae7fd4dcd3151f475474506636 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 1 Feb 2021 09:32:41 +0100
Subject: [PATCH 0856/3482] python3-llfuse: update to 1.4.1.

---
 srcpkgs/python3-llfuse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-llfuse/template b/srcpkgs/python3-llfuse/template
index 0902174ecda3..1d4d0c7e7837 100644
--- a/srcpkgs/python3-llfuse/template
+++ b/srcpkgs/python3-llfuse/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-llfuse'
 pkgname=python3-llfuse
-version=1.4.0
+version=1.4.1
 revision=1
 wrksrc="llfuse-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/python-llfuse/python-llfuse"
 distfiles="${PYPI_SITE}/l/llfuse/llfuse-${version}.tar.gz"
-checksum=cb5dc6052bdd9c19dd15d44cd2876520007029a7733e7b9f0c2022c768e3ca52
+checksum=c29c79d96a5aeab51608cae12594a1bf83576d86232f97341c7f779d413a4ec9

From d74e6e841d14c74a2dd9c1a1937042a2612aa1a8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 30 Jan 2021 08:47:52 +0100
Subject: [PATCH 0857/3482] vpnc: change upstream to fork

fixes #26798.

* Changes upstream to https://github.com/streambinder/vpnc/. That's a fork
  that's a fork which is at least used in alpine.
* Depends on vpnc-scripts. New upstream doesn't ship those files anymore
* Add wrapper script to stay backwards compatible
* Switch to build_style=gnu-makefile instead of manually calling make.
---
 srcpkgs/vpnc/files/vpnc-script            |  3 +
 srcpkgs/vpnc/patches/00-fix-fritzbox.diff | 81 -----------------------
 srcpkgs/vpnc/patches/2-fix-musl.patch     | 33 ---------
 srcpkgs/vpnc/template                     | 33 +++++----
 4 files changed, 23 insertions(+), 127 deletions(-)
 create mode 100644 srcpkgs/vpnc/files/vpnc-script
 delete mode 100644 srcpkgs/vpnc/patches/00-fix-fritzbox.diff
 delete mode 100644 srcpkgs/vpnc/patches/2-fix-musl.patch

diff --git a/srcpkgs/vpnc/files/vpnc-script b/srcpkgs/vpnc/files/vpnc-script
new file mode 100644
index 000000000000..c2b9f65bd170
--- /dev/null
+++ b/srcpkgs/vpnc/files/vpnc-script
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/libexec/vpnc-scripts/vpnc-script "$@"
diff --git a/srcpkgs/vpnc/patches/00-fix-fritzbox.diff b/srcpkgs/vpnc/patches/00-fix-fritzbox.diff
deleted file mode 100644
index 5f6c7a63cb91..000000000000
--- a/srcpkgs/vpnc/patches/00-fix-fritzbox.diff
+++ /dev/null
@@ -1,81 +0,0 @@
-Description: Fixes AVM's FritzBoxes not being able to connect
-Upstream: Yes
-Index: vpnc.c
-===================================================================
---- vpnc.c	(revision 466)
-+++ vpnc.c	(revision 469)
-@@ -88,6 +88,10 @@
- 	0x90, 0xCB, 0x80, 0x91, 0x3E, 0xBB, 0x69, 0x6E,
- 	0x08, 0x63, 0x81, 0xB5, 0xEC, 0x42, 0x7B, 0x1F
- };
-+const unsigned char VID_NATT_03[] = { /* "draft-ietf-ipsec-nat-t-ike-03" */
-+	0x7d, 0x94, 0x19, 0xa6, 0x53, 0x10, 0xca, 0x6f,
-+	0x2c, 0x17, 0x9d, 0x92, 0x15, 0x52, 0x9d, 0x56
-+};
- const unsigned char VID_NATT_RFC[] = { /* "RFC 3947" */
- 	0x4A, 0x13, 0x1C, 0x81, 0x07, 0x03, 0x58, 0x45,
- 	0x5C, 0x57, 0x28, 0xF2, 0x0E, 0x95, 0x45, 0x2F
-@@ -141,6 +145,7 @@
- 	{ VID_NATT_01,		sizeof(VID_NATT_01),	"Nat-T 01" },
- 	{ VID_NATT_02,		sizeof(VID_NATT_02),	"Nat-T 02" },
- 	{ VID_NATT_02N,		sizeof(VID_NATT_02N),	"Nat-T 02N" },
-+	{ VID_NATT_03,		sizeof(VID_NATT_03),	"Nat-T 03" },
- 	{ VID_NATT_RFC,		sizeof(VID_NATT_RFC),	"Nat-T RFC" },
- 	{ VID_DWR,		sizeof(VID_DWR),	"Delete With Reason" },
- 	{ VID_CISCO_FRAG,	sizeof(VID_CISCO_FRAG),	"Cisco Fragmentation" },
-@@ -1156,8 +1161,11 @@
- 		value = a->next->u.attr_16;
- 	else if (a->next->af == isakmp_attr_lots && a->next->u.lots.length == 4)
- 		value = ntohl(*((uint32_t *) a->next->u.lots.data));
--	else
--		assert(0);
-+	else {
-+		DEBUG(2, printf("got unknown ike lifetime attributes af %d len %d\n",
-+					a->next->af, a->next->u.lots.length));
-+		return;
-+	}
- 
- 	DEBUG(2, printf("got ike lifetime attributes: %d %s\n", value,
- 		(a->u.attr_16 == IKE_LIFE_TYPE_SECONDS) ? "seconds" : "kilobyte"));
-@@ -1267,6 +1275,8 @@
- 			l = l->next = new_isakmp_data_payload(ISAKMP_PAYLOAD_VID,
- 				VID_NATT_RFC, sizeof(VID_NATT_RFC));
- 			l = l->next = new_isakmp_data_payload(ISAKMP_PAYLOAD_VID,
-+				VID_NATT_03, sizeof(VID_NATT_03));
-+			l = l->next = new_isakmp_data_payload(ISAKMP_PAYLOAD_VID,
- 				VID_NATT_02N, sizeof(VID_NATT_02N));
- 			l = l->next = new_isakmp_data_payload(ISAKMP_PAYLOAD_VID,
- 				VID_NATT_02, sizeof(VID_NATT_02));
-@@ -1501,6 +1511,12 @@
- 					seen_natt_vid = 1;
- 					if (natt_draft < 1) natt_draft = 2;
- 					DEBUG(2, printf("peer is NAT-T capable (RFC 3947)\n"));
-+				} else if (rp->u.vid.length == sizeof(VID_NATT_03)
-+					&& memcmp(rp->u.vid.data, VID_NATT_03,
-+						sizeof(VID_NATT_03)) == 0) {
-+					seen_natt_vid = 1;
-+					if (natt_draft < 1) natt_draft = 2;
-+					DEBUG(2, printf("peer is NAT-T capable (draft-03)\n"));
- 				} else if (rp->u.vid.length == sizeof(VID_NATT_02N)
- 					&& memcmp(rp->u.vid.data, VID_NATT_02N,
- 						sizeof(VID_NATT_02N)) == 0) {
-@@ -1582,6 +1598,19 @@
- 						seen_natd_them = 1;
- 				}
- 				break;
-+			case ISAKMP_PAYLOAD_N:
-+				if (rp->u.n.type == ISAKMP_N_IPSEC_RESPONDER_LIFETIME) {
-+					if (rp->u.n.protocol == ISAKMP_IPSEC_PROTO_ISAKMP)
-+						lifetime_ike_process(s, rp->u.n.attributes);
-+					else if (rp->u.n.protocol == ISAKMP_IPSEC_PROTO_IPSEC_ESP)
-+						lifetime_ipsec_process(s, rp->u.n.attributes);
-+					else
-+						DEBUG(2, printf("got unknown lifetime notice, ignoring..\n"));
-+				} else {
-+					DEBUG(1, printf("rejecting ISAKMP_PAYLOAD_N, type is not lifetime\n"));
-+					reject = ISAKMP_N_INVALID_PAYLOAD_TYPE;
-+				}
-+				break;
- 			default:
- 				DEBUG(1, printf("rejecting invalid payload type %d\n", rp->type));
- 				reject = ISAKMP_N_INVALID_PAYLOAD_TYPE;
diff --git a/srcpkgs/vpnc/patches/2-fix-musl.patch b/srcpkgs/vpnc/patches/2-fix-musl.patch
deleted file mode 100644
index 9485c006bd7d..000000000000
--- a/srcpkgs/vpnc/patches/2-fix-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git sysdep.c sysdep.c
-index ff07753..43fdb74 100644
---- sysdep.c
-+++ sysdep.c
-@@ -59,7 +59,9 @@
- #if defined(__DragonFly__)
- #include <net/tun/if_tun.h>
- #elif defined(__linux__)
-+#ifdef __GLIBC__
- #include <linux/if_tun.h>
-+#endif
- #elif defined(__APPLE__)
- /* no header for tun */
- #elif defined(__CYGWIN__)
-diff --git sysdep.h sysdep.h
-index a5eafd6..af34e94 100644
---- sysdep.h
-+++ sysdep.h
-@@ -38,11 +38,13 @@ int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr);
- 
- /***************************************************************************/
- #if defined(__linux__) || defined(__GLIBC__)
-+#ifdef __GLIBC__
- #include <error.h>
-+#define HAVE_ERROR     1
-+#endif
- 
- #define HAVE_VASPRINTF 1
- #define HAVE_ASPRINTF  1
--#define HAVE_ERROR     1
- #define HAVE_GETLINE   1
- #define HAVE_UNSETENV  1
- #define HAVE_SETENV    1
diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 51e2f2998a68..84f434690cde 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,17 +1,22 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=7
+revision=8
+_githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
+wrksrc="vpnc-$_githash"
+build_style=gnu-makefile
+make_use_env=yes
+make_build_args="SBINDIR=/usr/bin"
+make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel"
-depends="net-tools"
+makedepends="libgcrypt-devel libressl-devel"
+depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.unix-ag.uni-kl.de/~massar/vpnc/"
-distfiles="https://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-${version}.tar.gz"
-checksum=46cea3bd02f207c62c7c6f2f22133382602baeda1dc320747809e94881414884
-
+distfiles="https://github.com/streambinder/vpnc/archive/$_githash.tar.gz"
+checksum=190493d792c8d5b2f7ba6a621fa14daf5602b2dcfcf31c202255fd08b1a943a4
 conf_files="
  /etc/vpnc/default.conf
  /etc/vpnc/vpnc-script"
@@ -20,14 +25,16 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" vpnc"
 fi
 
-do_configure() {
+post_patch() {
+	vsed -e 's/^#OPENSSL/OPENSSL/' -i Makefile
+	vsed -e 's/^install:.*/install: install-common/' -i Makefile
+	vsed -e 's#^SBINDIR=.*#SBINDIR=/$(PREFIX)/bin#' -i Makefile
 	if [ "$CROSS_BUILD" ]; then
-		sed -i 's%^my \$vpnc = .*;%my \$vpnc = "/usr/bin/vpnc";%' makeman.pl
+		vsed -e 's%^my \$vpnc = .*;%my \$vpnc = "/usr/bin/vpnc";%' -i src/makeman.pl
 	fi
 }
-do_build() {
-	make CC=$CC ${makejobs}
-}
-do_install() {
-	make PREFIX=/usr SBINDIR=/usr/bin DESTDIR=${DESTDIR} install
+
+post_install() {
+	rm -r $DESTDIR/usr/lib/systemd/system
+	vinstall $FILESDIR/vpnc-script 755 etc/vpnc
 }

From 79261e79a770b425187ffba8e7123432dbf7319a Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sun, 31 Jan 2021 13:38:57 +0300
Subject: [PATCH 0858/3482] fuzzel: update to 1.5.0.

---
 srcpkgs/fuzzel/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 9223ef9976c2..50ed52259393 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,18 +1,18 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.4.2
+version=1.5.0
 revision=1
 wrksrc="$pkgname"
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
-makedepends="cairo-devel fcft-devel librsvg-devel libxkbcommon-devel
- pixman-devel tllist wayland-devel wayland-protocols"
+makedepends="cairo-devel fcft-devel librsvg-devel libpng-devel
+ libxkbcommon-devel pixman-devel tllist wayland-devel wayland-protocols"
 short_desc="Application launcher for wlroots based Wayland compositors"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=e4acd9afa299abd0a1995f85ffd13b05648178d71326aa1c749187f113de4817
+checksum=a67d6c56c9de465ce777b091163034a594a19d3c1cf411cccdca4a40a11a2410
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"

From 2e0a1473babf027ab2bdadd956079b9fa8d196f6 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Sun, 31 Jan 2021 17:54:16 +0100
Subject: [PATCH 0859/3482] synapse: update to 1.26.0.

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 5b7c62bfb055..1258ebbd7d6a 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.25.0
+version=1.26.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=0ae31c1e59d531ef20d232c2c9ef9f3a87ba9733d5b3061d96e0a1a645975185
+checksum=8e9c9aaf8fb89ca74b10fb4f2d1db61973c1d34c659939b16971417c8603e1ec
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From da14d6e489fcaf16d314bd9f38ed21b3e5caf6e9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 31 Jan 2021 23:45:53 +0100
Subject: [PATCH 0860/3482] inadyn: update to 2.8.

---
 srcpkgs/inadyn/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index fb16b0faba4f..010cc6a3a276 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,7 +1,7 @@
 # Template file for 'inadyn'
 pkgname=inadyn
-version=2.7
-revision=2
+version=2.8
+revision=1
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
@@ -10,8 +10,9 @@ short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://troglobit.com/inadyn.html"
+changelog="https://github.com/troglobit/inadyn/raw/master/ChangeLog.md"
 distfiles="https://github.com/troglobit/inadyn/releases/download/v${version}/inadyn-${version}.tar.xz"
-checksum=eb03bc9d9c09dfbbc651b43a2eb5a967d0454a8293576df23784710dac50c6a4
+checksum=820696b6227abfd1f8666317bf25e24f13ff6fd2aaa1d136c405d36b32f905f7
 
 system_accounts="inadyn"
 inadyn_homedir="/var/empty"

From 593fea426fc98c1c9ae0e4ef9c092e9f1982bb33 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 1 Feb 2021 14:13:52 +0100
Subject: [PATCH 0861/3482] firejail: update to 0.9.64.2.

---
 srcpkgs/firejail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firejail/template b/srcpkgs/firejail/template
index 08d1e5f8c40e..498e89961c85 100644
--- a/srcpkgs/firejail/template
+++ b/srcpkgs/firejail/template
@@ -1,6 +1,6 @@
 # Template file for 'firejail'
 pkgname=firejail
-version=0.9.64
+version=0.9.64.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-apparmor"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://firejail.wordpress.com"
 changelog="https://github.com/netblue30/firejail/raw/master/RELNOTES"
 distfiles="https://github.com/netblue30/firejail/archive/${version}.tar.gz"
-checksum=b261ccf4b40a8c282db1542cf5f574c1c92b0bdf7cbce09267262dde047286aa
+checksum=fa4113ccdf74694eeeb3d223017c1ade92bb104232df9340d30873816856f61c
 conf_files="/etc/firejail/* /etc/apparmor.d/local/firejail-default"
 
 nocross=yes

From 63f110b5c606967ff3f167302aee0c58975fca9c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 1 Feb 2021 14:13:55 +0100
Subject: [PATCH 0862/3482] inadyn: update to 2.8.1.

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 010cc6a3a276..1dfb82c0be65 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,6 +1,6 @@
 # Template file for 'inadyn'
 pkgname=inadyn
-version=2.8
+version=2.8.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-openssl"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://troglobit.com/inadyn.html"
 changelog="https://github.com/troglobit/inadyn/raw/master/ChangeLog.md"
 distfiles="https://github.com/troglobit/inadyn/releases/download/v${version}/inadyn-${version}.tar.xz"
-checksum=820696b6227abfd1f8666317bf25e24f13ff6fd2aaa1d136c405d36b32f905f7
+checksum=1185a9fb165bfc5f5b5f66f0dd8a695c9bd78d4b20cd162273eeea77f2d2e685
 
 system_accounts="inadyn"
 inadyn_homedir="/var/empty"

From 35a032a00a64fe06d50e158761a1b0fb8517b797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 27 Jan 2021 08:48:38 +0700
Subject: [PATCH 0863/3482] nss: update to 3.61.

---
 srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch | 12 ++++++++++++
 srcpkgs/nss/template                                 |  6 ++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch

diff --git a/srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch b/srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch
new file mode 100644
index 000000000000..72fc5252cde3
--- /dev/null
+++ b/srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch
@@ -0,0 +1,12 @@
+Index: nss/gtests/manifest.mn
+===================================================================
+--- nss/gtests/manifest.mn.orig
++++ nss/gtests/manifest.mn
+@@ -41,6 +41,7 @@ certdb_gtest: common
+ certhigh_gtest: common
+ cryptohi_gtest: common
+ der_gtest: common
++freebl_gtest: common
+ pk11_gtest: common pkcs11testmodule
+ smime_gtest: common
+ softoken_gtest: common
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index b203db3b956a..fbcdc67dc585 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.29
 
 pkgname=nss
-version=3.60.1
+version=3.61
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=2051c20b61112df24bad533ac37f6c66c1bc0d6ea70bb9d9cad102d20324279d
+checksum=312e2d804b34ccf0fec70b57cf8cd6ac853f8ced60df53e30ebb0a7bcd0e1370
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
@@ -55,6 +55,8 @@ do_build() {
 	make ${makejobs} LD=$BUILD_LD LDFLAGS="$BUILD_LDFLAGS" ${_native_use64} -C coreconf
 
 	if [ "$CROSS_BUILD" ]; then
+		# We don't run test in cross build
+		export NSS_DISABLE_GTESTS=1
 		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
 			CFLAGS+=" -DNS_PTR_GT_32"
 			_target_use64="USE_64=1"

From 79d27f79a53b79f2bdccfbef62b8b8124776bb48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Feb 2021 01:22:57 -0300
Subject: [PATCH 0864/3482] gegl3: remove package.

No longer used by anything, modern version is gegl.
---
 common/shlibs                     |  3 ---
 srcpkgs/gegl3-devel               |  1 -
 srcpkgs/gegl3/patches/ftbfs.patch | 10 ---------
 srcpkgs/gegl3/template            | 36 -------------------------------
 srcpkgs/removed-packages/template |  1 +
 5 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 120000 srcpkgs/gegl3-devel
 delete mode 100644 srcpkgs/gegl3/patches/ftbfs.patch
 delete mode 100644 srcpkgs/gegl3/template

diff --git a/common/shlibs b/common/shlibs
index 563a2b91b8cc..dd8a7019ee39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2244,9 +2244,6 @@ libgedacairo.so.1 geda-1.10.2_1
 libxornstorage.so.0 geda-1.10.2_1
 libclutter-gst-3.0.so.0 clutter-gst3-3.0.4_1
 libgsound.so.0 gsound-1.0.1_1
-libgegl-0.3.so.0 gegl3-0.3.0_1
-libgegl-npd-0.3.so gegl3-0.3.0_1
-libgegl-sc-0.3.so gegl3-0.3.0_1
 libprocps.so.8 procps-ng-3.3.16_1
 libgegl-0.4.so.0 gegl-0.4.16_1
 libgegl-npd-0.4.so gegl-0.4.16_1
diff --git a/srcpkgs/gegl3-devel b/srcpkgs/gegl3-devel
deleted file mode 120000
index 662574737197..000000000000
--- a/srcpkgs/gegl3-devel
+++ /dev/null
@@ -1 +0,0 @@
-gegl3
\ No newline at end of file
diff --git a/srcpkgs/gegl3/patches/ftbfs.patch b/srcpkgs/gegl3/patches/ftbfs.patch
deleted file mode 100644
index 5de553d735ff..000000000000
--- a/srcpkgs/gegl3/patches/ftbfs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/exp_combine.cpp
-+++ tools/exp_combine.cpp
-@@ -10,6 +10,7 @@
- 
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
-+#include <exiv2/error.hpp>
- 
- using namespace std;
- 
diff --git a/srcpkgs/gegl3/template b/srcpkgs/gegl3/template
deleted file mode 100644
index 64d644fcf2ac..000000000000
--- a/srcpkgs/gegl3/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'gegl3'
-pkgname=gegl3
-version=0.3.28
-revision=2
-wrksrc="gegl-${version}"
-build_style=gnu-configure
-configure_args="--disable-docs --without-sdl
- --without-libavformat --without-graphviz --without-lua --without-libspiro
- --without-umfpack --with-exiv2 --without-libv4l --disable-introspection"
-hostmakedepends="pkg-config intltool"
-makedepends="libglib-devel libpng-devel babl-devel jasper-devel
- libjpeg-turbo-devel librsvg-devel gtk+-devel exiv2-devel json-glib-devel
- libraw-devel"
-short_desc="Graph based image processing framework (v0.3)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3, LGPL-3"
-homepage="https://www.gimp.org/"
-distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.bz2"
-checksum=152f87604a5a191775329dfb63764efa1d5c32403d1438da68e242f96b7d23ff
-
-CFLAGS="-fcommon"
-
-post_install() {
-	# Resolves conflict with gegl
-	mv ${DESTDIR}/usr/bin/gegl ${DESTDIR}/usr/bin/gegl3
-}
-
-gegl3-devel_package() {
-	depends="libglib-devel gegl3>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/libgegl-0.3.so
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7ccbf1963720..fc5eb68bd49b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -33,6 +33,7 @@ replaces="
  enventor<=1.0.0_2
  epstopdf<=2.27_3
  fontmatrix<=0.6.0.20171228_2
+ gegl3<=0.3.28_2
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  go1.4-bootstrap<=20171003_2

From 8c45672e0eb8c739086aabc01a70e8206d8b5106 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 31 Jan 2021 14:50:33 +0100
Subject: [PATCH 0865/3482] cozy: update to 0.8.1.

---
 srcpkgs/cozy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 0a921c4f4ab8..646f6049a13e 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,6 +1,6 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=0.7.8
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
@@ -15,4 +15,4 @@ maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=4eabffe6df7702a00fcf52f802a3839b0a05d8f423facf26157703e76c2c53bc
+checksum=16fdb225ee24a1e1acff62c3e3c3eb7bf8fd602350f4aa66508ee741ae13d030

From ffd7611f03728b0b0962eb21d2b49d491e6f0b16 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 31 Jan 2021 16:19:24 +0100
Subject: [PATCH 0866/3482] smenu: update to 0.9.17.

---
 srcpkgs/smenu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/smenu/template b/srcpkgs/smenu/template
index 4a8316bc9577..fed55aeabbee 100644
--- a/srcpkgs/smenu/template
+++ b/srcpkgs/smenu/template
@@ -1,6 +1,6 @@
 # Template file for 'smenu'
 pkgname=smenu
-version=0.9.16
+version=0.9.17
 revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
@@ -9,6 +9,6 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/p-gen/smenu"
 distfiles="https://github.com/p-gen/smenu/archive/v${version}.tar.gz"
-checksum=8db8026a8d95f01b9a4b775834432b15cfd248868ef2a2ec1232bd534d26dc09
+checksum=f9d174af52d92725710dbcfe3905d511901f810849d81d3f6fc6c51c30bebc7f
 
 LDFLAGS="-lncurses"

From 26793bfdd4c0749ab31060b7941fe9e7eca813d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Feb 2021 15:08:55 +0100
Subject: [PATCH 0867/3482] vde2: add patch to support OpenSSL-1.1

---
 ...yptcab-compile-against-openssl-1.1.0.patch | 97 +++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 srcpkgs/vde2/patches/vde_cryptcab-compile-against-openssl-1.1.0.patch

diff --git a/srcpkgs/vde2/patches/vde_cryptcab-compile-against-openssl-1.1.0.patch b/srcpkgs/vde2/patches/vde_cryptcab-compile-against-openssl-1.1.0.patch
new file mode 100644
index 000000000000..92dd0b7969b7
--- /dev/null
+++ b/srcpkgs/vde2/patches/vde_cryptcab-compile-against-openssl-1.1.0.patch
@@ -0,0 +1,97 @@
+Reason: doesn't compile with openssl-1.1.0
+Source: Taken from Arch repo
+ https://raw.githubusercontent.com/archlinux/svntogit-packages/e4ea86ebebfc446113d858542cf23723f1b2a891/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch
+ edited wto also support LIBRESSL
+
+--- src/vde_cryptcab/cryptcab.c	2011-11-23 16:41:17.000000000 +0000
++++ src/vde_cryptcab/cryptcab.c	2017-03-20 22:54:20.452975075 +0000
+@@ -22,7 +22,7 @@
+ 	exit(1);
+ }
+ 	
+-static EVP_CIPHER_CTX ctx;
++static EVP_CIPHER_CTX *ctx;
+ static int ctx_initialized = 0;
+ static int encryption_disabled = 0;
+ static int nfd;
+@@ -30,6 +30,10 @@
+ static struct vde_open_args open_args={.port=0,.group=NULL,.mode=0700};
+ static int verbose = 0;
+ 
++#if OPENSSL_VERSION_NUMBER < 0x1010000 || defined LIBRESSL_VERSION_NUMBER
++#define EVP_CIPHER_CTX_reset(x)	EVP_CIPHER_CTX_cleanup(x)
++#endif
++
+ void vc_printlog(int priority, const char *format, ...)
+ {
+ 	va_list arg;
+@@ -103,19 +107,21 @@
+ 	}
+ 
+ 	if (!ctx_initialized) {
+-		EVP_CIPHER_CTX_init (&ctx);
++		ctx = EVP_CIPHER_CTX_new ();
++		if (!ctx)
++			return -1;
+ 		ctx_initialized = 1;
+ 	}
+ 	
+-	EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
+-	if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1)
++	EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
++	if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1)
+ 	{
+ 		fprintf (stderr,"error in encrypt update\n");
+ 		olen = -1;
+ 		goto cleanup;
+ 	}
+ 
+-	if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1)
++	if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1)
+ 	{
+ 		fprintf (stderr,"error in encrypt final\n");
+ 		olen = -1;
+@@ -124,7 +130,7 @@
+ 	olen += tlen;
+ 
+ cleanup:
+-	EVP_CIPHER_CTX_cleanup(&ctx);	
++	EVP_CIPHER_CTX_reset(ctx);
+ 	return olen;
+ }
+ 
+@@ -138,19 +144,21 @@
+ 	}
+ 	
+ 	if (!ctx_initialized) {
+-		EVP_CIPHER_CTX_init (&ctx);
++		ctx = EVP_CIPHER_CTX_new ();
++		if (!ctx)
++			return -1;
+ 		ctx_initialized = 1;
+ 	}
+ 
+-	EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
+-	if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1)
++	EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
++	if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1)
+ 	{
+ 		fprintf (stderr,"error in decrypt update\n");
+ 		olen = -1;
+ 		goto cleanup;
+ 	}
+ 
+-	if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1)
++	if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1)
+ 	{
+ 		fprintf (stderr,"error in decrypt final\n");
+ 		olen = -1;
+@@ -159,7 +167,7 @@
+ 	olen += tlen;
+ 
+ cleanup:
+-	EVP_CIPHER_CTX_cleanup(&ctx);	
++	EVP_CIPHER_CTX_reset (ctx);
+ 	return olen;
+ }
+ 

From 71897332c27fced2172b7c6bb96b0dd4b4ed27f4 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 1 Feb 2021 07:47:38 -0600
Subject: [PATCH 0868/3482] aide: update to 0.17.1.

---
 srcpkgs/aide/patches/fix-errorh-include.patch | 11 -----------
 srcpkgs/aide/template                         |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/aide/patches/fix-errorh-include.patch

diff --git a/srcpkgs/aide/patches/fix-errorh-include.patch b/srcpkgs/aide/patches/fix-errorh-include.patch
deleted file mode 100644
index efc4f883c54a..000000000000
--- a/srcpkgs/aide/patches/fix-errorh-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/aide.h.orig
-+++ include/aide.h
-@@ -33,7 +33,6 @@
- #if HAVE_FCNTL_H
- # include <fcntl.h>
- #endif
--#include "error.h"
- 
- #ifndef TEMP_FAILURE_RETRY
- /* Evaluate EXPRESSION, and repeat as long as it returns -1 with errno'
-
diff --git a/srcpkgs/aide/template b/srcpkgs/aide/template
index e376acbbaad4..53631c15530c 100644
--- a/srcpkgs/aide/template
+++ b/srcpkgs/aide/template
@@ -1,6 +1,6 @@
 # Template file for 'aide'
 pkgname=aide
-version=0.17
+version=0.17.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-mhash --with-posix-acl --with-prelink --with-xattr
@@ -15,7 +15,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://aide.github.io/"
 distfiles="https://github.com/aide/aide/releases/download/v${version}/aide-${version}.tar.gz"
-checksum=4fd88d1d5ddc70c698c6519ebbc05c8d32c3f6d8137bbfdefeaebaafd6db867b
+checksum=a401c951938f1169ceaec868ce3594736e89c5c881578c263d8a824a06b0002d
 
 post_configure() {
 	vsed -i config.h -e 's/cross/ino_t/g'

From 5f593b4d2a3fcdc2e49f3cb3710fd0c188c380ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Feb 2021 15:41:58 +0100
Subject: [PATCH 0869/3482] sssd: update patch to work for both LibreSSL and
 OpenSSL

---
 srcpkgs/sssd/patches/libressl.patch | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/sssd/patches/libressl.patch b/srcpkgs/sssd/patches/libressl.patch
index 8c3a3aa18d83..495a1066bea1 100644
--- a/srcpkgs/sssd/patches/libressl.patch
+++ b/srcpkgs/sssd/patches/libressl.patch
@@ -1,11 +1,3 @@
-diff -Naurp0 a/lib/certmap/sss_cert_content_crypto.c b/lib/certmap/sss_cert_content_crypto.c
---- src/lib/certmap/sss_cert_content_crypto.c	2020-09-06 16:39:47.669132066 +0200
-+++ src/lib/certmap/sss_cert_content_crypto.c	2020-09-06 16:39:51.923060279 +0200
-@@ -774,2 +774,2 @@ int sss_cert_get_content(TALLOC_CTX *mem
--    if ((X509_get_extension_flags(cert) & EXFLAG_KUSAGE)) {
--        cont->key_usage = X509_get_key_usage(cert);
-+    if (cert->ex_flags & EXFLAG_KUSAGE) {
-+        cont->key_usage = cert->ex_kusage;
 diff -Naurp0 a/p11_child/p11_child_openssl.c b/p11_child/p11_child_openssl.c
 --- src/p11_child/p11_child_openssl.c	2020-09-06 16:39:47.663132167 +0200
 +++ src/p11_child/p11_child_openssl.c	2020-09-06 16:39:51.887060887 +0200
@@ -16,3 +8,19 @@ diff -Naurp0 a/util/crypto/libcrypto/crypto_hmac_sha1.c b/util/crypto/libcrypto/
 +++ src/util/crypto/libcrypto/crypto_hmac_sha1.c	2020-09-06 16:39:51.870061174 +0200
 @@ -19,0 +20 @@
 +#include <limits.h>
+--- src/lib/certmap/sss_cert_content_crypto.c	2020-10-12 12:16:19.000000000 +0200
++++ -	2021-02-01 15:35:14.968899293 +0100
+@@ -771,8 +771,13 @@
+         ret = EIO;
+         goto done;
+     }
++#ifdef LIBRESSL_VERSION_NUMBER
++    if (cert->ex_flags & EXFLAG_KUSAGE) {
++        cont->key_usage = cert->ex_kusage;
++#else
+     if ((X509_get_extension_flags(cert) & EXFLAG_KUSAGE)) {
+         cont->key_usage = X509_get_key_usage(cert);
++#endif
+     } else {
+         /* According to X.509 https://www.itu.int/rec/T-REC-X.509-201610-I
+          * section 13.3.2 "Certificate match" "keyUsage matches if all of the

From bb32be991be0e7caa6a7becee973fa6afec13f49 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 1 Feb 2021 08:48:55 -0600
Subject: [PATCH 0870/3482] evtx: update to 0.6.9.

---
 srcpkgs/evtx/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/evtx/template b/srcpkgs/evtx/template
index 33f1d5db188b..c873ebec570d 100644
--- a/srcpkgs/evtx/template
+++ b/srcpkgs/evtx/template
@@ -1,11 +1,11 @@
 # Template file for 'evtx'
 pkgname=evtx
-version=0.6.8
+version=0.6.9
 revision=1
 build_style=cargo
 short_desc="Parser for the Windows XML Event Log (EVTX) format"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/omerbenamram/evtx"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=839ca62854efb59b9c09e3061d4d52937c45bf539504fb36e2aec63898986dd6
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=7ebbac7d442adbfdf00783f243b0746067a3d9f1c8f8dbd261b34bd85f3a4af4

From fafc7f1aaf8482496c726b04e6a29f6157883624 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 1 Feb 2021 09:17:37 -0600
Subject: [PATCH 0871/3482] python3-aniso8601: update to 8.1.1.

---
 srcpkgs/python3-aniso8601/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-aniso8601/template b/srcpkgs/python3-aniso8601/template
index 29c9ca5ac214..436adeedfa94 100644
--- a/srcpkgs/python3-aniso8601/template
+++ b/srcpkgs/python3-aniso8601/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-aniso8601'
 pkgname=python3-aniso8601
-version=8.1.0
+version=8.1.1
 revision=1
 wrksrc="aniso8601-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://bitbucket.org/nielsenb/aniso8601"
 distfiles="${PYPI_SITE}/a/aniso8601/aniso8601-$version.tar.gz"
-checksum=246bf8d3611527030889e6df970878969d3a2f760ba3eb694fa1fb10e6ce53f9
+checksum=be08b19c19ca527af722f2d4ba4dc569db292ec96f7de963746df4bb0bff9250
 
 post_install() {
 	vlicense LICENSE

From eb38c9c5b3585f9dfe78538e3edd1721b7792bbc Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 1 Feb 2021 09:10:08 -0600
Subject: [PATCH 0872/3482] libredwg: update to 0.12.1.

---
 srcpkgs/libredwg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libredwg/template b/srcpkgs/libredwg/template
index cd4cb0c322b3..ed71218f8dd8 100644
--- a/srcpkgs/libredwg/template
+++ b/srcpkgs/libredwg/template
@@ -1,6 +1,6 @@
 # Template file for 'libredwg'
 pkgname=libredwg
-version=0.12
+version=0.12.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-bindings"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/libredwg/"
 distfiles="https://github.com/LibreDWG/libredwg/releases/download/${version}/libredwg-${version}.tar.xz"
-checksum=24cdcdf511909ec41500d265258a528c72dd046982906d475738748ea221fdf8
+checksum=f9fcdc6f66417c091a5887925b10cdc651403d323754b9196c52b5968fba0fdc
 
 post_install() {
 	rm ${DESTDIR}/usr/share/{dwgadd.example,load_dwg.py}

From 571b5c1bfbabb68fb95202fabcc6203a0e0894b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Feb 2021 14:25:09 -0300
Subject: [PATCH 0873/3482] gimp: fix launch failure.

For some reason, gegl doesn't report the gegl:introspect operation as
available unless graphviz is installed. Since gegl:introspect isn't
necessarily required by other gegl dependants, add graphviz as a gimp
dependency instead.

Without this, if the user doesn't have graphviz installed, gimp will
fail to launch and complain that gegl doesn't support gegl:introspect.
---
 srcpkgs/gimp/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 332fb0b12e42..0378ad139c6e 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.22
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -12,7 +12,8 @@ makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
  libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
  poppler-glib-devel pygtk-devel glib-networking libwebp-devel
  libheif-devel libopenjpeg2-devel x265-devel"
-depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
+# graphviz is necessary to enable gegl:introspect
+depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1 graphviz"
 short_desc="GNU image manipulation program"
 conf_files="/etc/gimp/${version%%.*}.0/*"
 maintainer="fosslinux <fosslinux@aussies.space>"

From 0dbfb810f33a22def3dc5c6929c5b3696e311e40 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 28 Jan 2021 19:44:02 +0200
Subject: [PATCH 0874/3482] xfce4-panel: update to 4.16.1.

---
 srcpkgs/xfce4-panel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index f96808ecb102..2df7a5c04a8b 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
-version=4.16.0
-revision=2
+version=4.16.1
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-locales-dir=/usr/share/locale
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=5e979aeeb37d306d72858b1bc67448222ea7a68de01409055b846cd31f3cc53d
+checksum=fa099bc6be6592dbb828747a473c2e1b0e7f85afd945a98002b475bb6f975991
 
 # Package build options
 build_options="gir"

From 699dee575afda380411755aca38e51355e411e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 1 Feb 2021 21:24:08 +0100
Subject: [PATCH 0875/3482] libnumbertext: update to 1.0.7

Move static library to -devel subpkg.
---
 srcpkgs/libnumbertext/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnumbertext/template b/srcpkgs/libnumbertext/template
index 58ca03e2194a..ad68e52442ed 100644
--- a/srcpkgs/libnumbertext/template
+++ b/srcpkgs/libnumbertext/template
@@ -1,6 +1,6 @@
 # Template file for 'libnumbertext'
 pkgname=libnumbertext
-version=1.0.6
+version=1.0.7
 revision=1
 build_style=gnu-configure
 short_desc="Language-neutral NUMBERTEXT and MONEYTEXT for LibreOffice Calc"
@@ -8,7 +8,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Numbertext/libnumbertext"
 distfiles="http://dev-www.libreoffice.org/src/${pkgname}-${version}.tar.xz"
-checksum=739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57
+checksum=17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc
 
 libnumbertext-devel_package() {
 	short_desc+=" - development files"
@@ -16,6 +16,7 @@ libnumbertext-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
 		vmove usr/lib/pkgconfig
 	}
 }

From 807dafc716a03a47034ba109b6b3515ccd117c2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 1 Feb 2021 21:41:39 +0100
Subject: [PATCH 0876/3482] lollypop: update to 1.4.15

---
 srcpkgs/lollypop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 054ae6e240f4..69993862d1a4 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,6 +1,6 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.4.14
+version=1.4.15
 revision=1
 build_style=meson
 hostmakedepends="cmake git glib-devel gobject-introspection intltool itstool pkg-config"
@@ -13,4 +13,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/${pkgname}-${version}.tar.xz"
-checksum=18d1c3d733bf7ba855064a68183215f1d5717a6162aaca5df482b60c429347b1
+checksum=084f3e731eb6002940ba13e9d1592e5e1de923d8cc623d7fe3f77d861626826d

From 40f3f74c0899da2ae7785ee51d9991f4786ca42d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Feb 2021 22:07:28 +0100
Subject: [PATCH 0877/3482] libguestfs: unbreak, enable musl

---
 srcpkgs/libguestfs/patches/conf.patch | 19 +++++++++++++++++++
 srcpkgs/libguestfs/template           |  8 ++------
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libguestfs/patches/conf.patch

diff --git a/srcpkgs/libguestfs/patches/conf.patch b/srcpkgs/libguestfs/patches/conf.patch
new file mode 100644
index 000000000000..6e59e74a9084
--- /dev/null
+++ b/srcpkgs/libguestfs/patches/conf.patch
@@ -0,0 +1,19 @@
+--- configure	2021-01-06 11:07:19.837834801 +0100
++++ -	2021-02-01 21:59:49.975607517 +0100
+@@ -63266,7 +63266,7 @@
+         else
+             as_fn_error $? "/etc/os-release not available, please specify the distro using --with-distro=DISTRO" "$LINENO" 5
+         fi
+-
++fi
+      if case $DISTRO in #(
+   REDHAT | SUSE | OPENMANDRIVA | MAGEIA ) :
+     true ;; #(
+@@ -63313,7 +63313,6 @@
+ fi
+ 
+ 
+-fi
+ 
+ 
+ 
diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 339bdafce663..8fd4f17921af 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,5 +1,3 @@
-broken="https://build.voidlinux.org/builders/x86_64_builder/builds/29937/steps/shell_3/logs/stdio"
-
 # Template file for 'libguestfs'
 pkgname=libguestfs
 version=1.44.0
@@ -17,7 +15,7 @@ hostmakedepends="cpio gperf cdrtools flex pkg-config automake libtool qemu git
  ocaml ocaml-findlib perl-Module-Build perl hivex supermin
  $(vopt_if ruby ruby) $(vopt_if python python3) $(vopt_if go go) $(vopt_if php php) $(vopt_if lua lua53)"
 makedepends="ncurses-devel pcre-devel augeas-devel libxml2-devel gettext-devel file-devel jansson-devel
- yajl-devel perl $(vopt_if ruby ruby-devel) $(vopt_if python python3-devel)
+ yajl-devel perl libtirpc-devel $(vopt_if ruby ruby-devel) $(vopt_if python python3-devel)
  $(vopt_if php php-devel) $(vopt_if lua lua53-devel) $(vopt_if fuse fuse-devel)"
 short_desc="Access and modify virtual machine disk image"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -31,9 +29,7 @@ conf_files="etc/libguestfs-tools.conf
  etc/xdg/virt-builder/repos.d/libguestfs.gpg"
 
 nocross=yes
-disable_parallel_build=yes
-
-archs="i686 x86_64 ppc64le"
+archs="i686* x86_64* ppc64le*"
 
 build_options="ruby python go php lua fuse"
 build_options_default="ruby fuse"

From a8e37ec669c93f0be311b2f00b6ec95e094156b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Feb 2021 23:18:54 +0100
Subject: [PATCH 0878/3482] albert: remove package

The licensing is nonfree and potentially violates copyright of other contributors

Ref: https://github.com/void-linux/void-packages/issues/28394
https://bugs.archlinux.org/task/69366
https://github.com/albertlauncher/albert/issues/765#issuecomment-771086409

closes #28394
---
 .../0002_FindPythonLibsNew.cmake.patch        | 14 --------
 srcpkgs/albert/template                       | 35 -------------------
 srcpkgs/albert/update                         |  2 --
 srcpkgs/removed-packages/template             |  3 +-
 4 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/albert/patches/0002_FindPythonLibsNew.cmake.patch
 delete mode 100644 srcpkgs/albert/template
 delete mode 100644 srcpkgs/albert/update

diff --git a/srcpkgs/albert/patches/0002_FindPythonLibsNew.cmake.patch b/srcpkgs/albert/patches/0002_FindPythonLibsNew.cmake.patch
deleted file mode 100644
index 40ad846536a4..000000000000
--- a/srcpkgs/albert/patches/0002_FindPythonLibsNew.cmake.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- plugins/python/pybind11/tools/FindPythonLibsNew.cmake
-+++ plugins/python/pybind11/tools/FindPythonLibsNew.cmake
-@@ -57,9 +57,9 @@ endif()
- 
- # Use the Python interpreter to find the libs.
- if(PythonLibsNew_FIND_REQUIRED)
--    find_package(PythonInterp ${PythonLibsNew_FIND_VERSION} REQUIRED)
-+	find_package(PythonLibs ${PythonLibsNew_FIND_VERSION} REQUIRED)
- else()
--    find_package(PythonInterp ${PythonLibsNew_FIND_VERSION})
-+	find_package(PythonLibs ${PythonLibsNew_FIND_VERSION})
- endif()
- 
- if(NOT PYTHONINTERP_FOUND)
diff --git a/srcpkgs/albert/template b/srcpkgs/albert/template
deleted file mode 100644
index b08a0320f4ff..000000000000
--- a/srcpkgs/albert/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'albert'
-pkgname=albert
-version=0.16.1
-revision=3
-_plugins_hash=029bd8ccb58c4452bd82ab42be8739f1639e42d4
-_pybind_version=2.2.4
-build_style=cmake
-configure_args="-DBUILD_VIRTUALBOX=OFF"
-makedepends="libqalculate-devel muparser-devel python3-devel qt5-declarative-devel
- qt5-svg-devel qt5-x11extras-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
- qt5-plugin-sqlite qt5-plugin-tds qt5-charts-devel"
-depends="qt5-plugin-sqlite qt5-quickcontrols qt5-graphicaleffects"
-short_desc="Lightweight desktop environment agnostic launcher"
-maintainer="Nemh <nemh@protonmail.com>"
-license="GPL-3.0-or-later, BSD-3-Clause"
-homepage="https://github.com/albertlauncher/albert"
-distfiles="https://github.com/albertlauncher/albert/archive/v${version}.tar.gz
- https://github.com/albertlauncher/plugins/archive/${_plugins_hash}.tar.gz
- https://github.com/pybind/pybind11/archive/v${_pybind_version}.tar.gz"
-checksum="e244b5825ef453221b221d76df30f8496c2e176ec6b9c26db21735d8e809956a
- 1986041e464c87e7ccc4f01b0eb4302f101aa3d62f5b02929fc97f68b3a38623
- b69e83658513215b8d1443544d0549b7d231b9f201f6fc787a2b2218b408181e"
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-qmake"
-fi
-
-post_extract() {
-	cp -rup ../plugins-${_plugins_hash}/* plugins
-	cp -rup ../pybind11-${_pybind_version}/* plugins/python/pybind11
-}
-
-post_install() {
-	vlicense ../pybind11-${_pybind_version}/LICENSE
-}
diff --git a/srcpkgs/albert/update b/srcpkgs/albert/update
deleted file mode 100644
index 0d01fc3e74f4..000000000000
--- a/srcpkgs/albert/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://github.com/albertlauncher/albert/releases
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fc5eb68bd49b..03d6c4399a2e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=19
+revision=20
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -10,6 +10,7 @@ homepage="https://voidlinux.org"
 
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
+ albert<=0.16.1_4
  apg<=2.2.3_5
  arm-mem-git<=20131108_2
  arptables<=0.0.4_3

From 38076242e5e7f7808b7770d1ea19b75e7aada36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Feb 2021 01:25:46 +0100
Subject: [PATCH 0879/3482] common/build-profile/i686-musl: fix triplet

---
 common/build-profiles/i686-musl.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-profiles/i686-musl.sh b/common/build-profiles/i686-musl.sh
index 7b9e232723c0..e76ab89d6ae3 100644
--- a/common/build-profiles/i686-musl.sh
+++ b/common/build-profiles/i686-musl.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-mtune=i686"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TRIPLET="i686-pc-linux-musl"
+XBPS_TRIPLET="i686-linux-musl"
 XBPS_RUST_TARGET="i686-unknown-linux-musl"

From 15e9a7c4aa23f3e936ef42328c51f5b0141c78e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 1 Feb 2021 21:55:56 +0700
Subject: [PATCH 0880/3482] fcitx: enable gir on cross

While we're at it, build with -O2
---
 srcpkgs/fcitx/template | 43 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template
index 8373cf9ff972..8163dee0ca5e 100644
--- a/srcpkgs/fcitx/template
+++ b/srcpkgs/fcitx/template
@@ -1,8 +1,9 @@
 # Template file for 'fcitx'
 pkgname=fcitx
 version=4.2.9.8
-revision=2
+revision=3
 build_style=cmake
+build_helper=gir
 short_desc="Flexible Context-aware Input Tool with eXtension"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
@@ -10,14 +11,15 @@ homepage="https://fcitx-im.org/"
 distfiles="http://download.fcitx-im.org/fcitx/fcitx-${version}_dict.tar.xz"
 checksum=bc3515cba0561546fe02dae81391d4a03e0e79a2d668aa794cd3a377284033c6
 
-hostmakedepends="pkg-config doxygen gobject-introspection extra-cmake-modules"
+hostmakedepends="pkg-config doxygen extra-cmake-modules glib-devel"
 makedepends="iso-codes gettext-devel enchant-devel libxml2-devel
  json-c-devel opencc-devel
  libxkbfile-devel icu-devel dbus-devel gtk+-devel gtk+3-devel"
 lib32disabled=yes
-configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF
+configure_args="-DCMAKE_BUILD_TYPE=None
+ -DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF
  -DENABLE_GTK2_IM_MODULE=ON -DENABLE_GTK3_IM_MODULE=ON -DENABLE_QT=OFF
- -DFORCE_ENCHANT=ON -DENABLE_TEST=ON"
+ -DFORCE_ENCHANT=ON -DENABLE_TEST=ON -DENABLE_GIR=$(vopt_if gir ON OFF)"
 
 # Warning: do NOT enable backtrace for musl, do NOT add libexecinfo-devel
 case "$XBPS_TARGET_MACHINE" in
@@ -25,10 +27,12 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DENABLE_GIR=OFF"
-	hostmakedepends+=" glib-devel fcitx"
+	hostmakedepends+=" fcitx"
 fi
 
+build_options="gir"
+build_options_default="gir"
+
 pre_configure() {
 	# include FcitxMacro.cmake without invoking fcitx4-config
 	vsed -i -e 's;INCLUDE(${FCITX4_PREFIX}/share/cmake/fcitx;INCLUDE(${CMAKE_CURRENT_LIST_DIR};' \
@@ -46,17 +50,17 @@ pre_configure() {
 	fi
 }
 
+pre_build() {
+	LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/lib/fcitx-utils"
+}
+
 libfcitx_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {
-		for i in config core gclient utils; do
-			vmove "usr/lib/libfcitx-${i}.so.*"
-		done
+		vmove "usr/lib/*.so.*"
 		vmove "usr/lib/fcitx/fcitx-*.so"
-		for i in comp-spell-dict fcitx-{po-parser,scanner}; do
-			vmove usr/lib/fcitx/libexec/${i}
-		done
-		if [ -z "$CROSS_BUILD" ]; then
+		vmove usr/lib/fcitx/libexec
+		if [ "$build_option_gir" ]; then
 			vmove usr/lib/girepository-1.0
 		fi
 		vlicense COPYING.LIBS
@@ -67,17 +71,12 @@ fcitx-devel_package() {
 	depends="libfcitx-${version}_${revision} glib-devel"
 	short_desc+=" - development files"
 	pkg_install() {
-		for i in config gclient utils; do
-			vmove usr/include/fcitx-${i}
-			vmove usr/lib/pkgconfig/fcitx-${i}.pc
-			vmove usr/lib/libfcitx-${i}.so
-		done
 		vmove usr/bin/fcitx4-config
-		vmove usr/include/fcitx
-		vmove usr/lib/pkgconfig/fcitx.pc
-		vmove usr/lib/libfcitx-core.so
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		vmove usr/share/cmake
-		if [ -z "$CROSS_BUILD" ]; then
+		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
 	}

From 5333d426efdff5584a4592eb3e418f5c86887479 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 1 Feb 2021 14:50:29 +0100
Subject: [PATCH 0881/3482] disorderfs: update to 0.5.11.

---
 srcpkgs/disorderfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/disorderfs/template b/srcpkgs/disorderfs/template
index 479514b962c4..2eebbb374cf3 100644
--- a/srcpkgs/disorderfs/template
+++ b/srcpkgs/disorderfs/template
@@ -1,6 +1,6 @@
 # Template file for 'disorderfs'
 pkgname=disorderfs
-version=0.5.10
+version=0.5.11
 revision=1
 build_style=gnu-makefile
 make_check_target=test
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://reproducible-builds.org/tools/"
 #changelog="https://salsa.debian.org/reproducible-builds/disorderfs/raw/master/NEWS"
 distfiles="https://salsa.debian.org/reproducible-builds/disorderfs/-/archive/${version}/disorderfs-${version}.tar.bz2"
-checksum=f268a9c743a7b7f7b9d3e506d0454230a4fccce2e35850f772cae98eade07df6
+checksum=e13935220dccb13e6e3dbaf1c2f7b22015e3ac90083e00b35573b756050d9481
 
 CXXFLAGS="-std=c++11 -Wno-unused-parameter -D_FILE_OFFSET_BITS=64 -I/usr/include/fuse -DFUSE_USE_VERSION=26"
 

From 069b274bad17b0180f268e51ba886d06c15b644a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Feb 2021 12:20:44 +0100
Subject: [PATCH 0882/3482] ccache: update to 4.2

---
 srcpkgs/ccache/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 8b46fdd4686f..25e948cf79e9 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,7 +1,7 @@
 # Template file for 'ccache'
 pkgname=ccache
-version=4.1
-revision=2
+version=4.2
+revision=1
 bootstrap=yes
 build_style=cmake
 configure_args="-DENABLE_TESTING=OFF"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://ccache.samba.org/"
 changelog="https://ccache.dev/releasenotes.html"
 distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=5fdc804056632d722a1182e15386696f0ea6c59cb4ab4d65a54f0b269ae86f99
+checksum=2f14b11888c39778c93814fc6843fc25ad60ff6ba4eeee3dff29a1bad67ba94f
 
 if [ -z "$CHROOT_READY" ]; then
 	hostmakedepends="cmake-bootstrap"

From 6a20769ec601b7870834f1975b2848dad19f00e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 2 Feb 2021 13:07:46 +0100
Subject: [PATCH 0883/3482] doomretro: update to 4.0.

---
 srcpkgs/doomretro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 89ebd6c6b415..2ec38c3449a6 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=3.6.1
+version=4.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=9d1becb85944c3426f8bbb3af8eb8980d423af033f065ff2e150c56364f5b3a5
+checksum=b98871010b0c3287e9f4482931fe678a6d087b73afcdbdbd51c9653512ac1305

From f2c5495e132acc8fa76aad144e4eefd2191a95e6 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 2 Feb 2021 11:21:06 +0100
Subject: [PATCH 0884/3482] fuzzel: update to 1.5.1.

---
 srcpkgs/fuzzel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 50ed52259393..84ea6b87c339 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.5.0
+version=1.5.1
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=a67d6c56c9de465ce777b091163034a594a19d3c1cf411cccdca4a40a11a2410
+checksum=8a7394a32664638c91e865d63cf5d5a34d8caf4594854ed4867afae1a6f38eb7
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"

From 2a0100e47f9ee7baf6ee0f0f7c4f9a9fe6003d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Feb 2021 14:02:53 +0100
Subject: [PATCH 0885/3482] linux-tools: fix i686-musl

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 9514eafc31f1..8c46de1e1ead 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -192,7 +192,7 @@ perf_package() {
 		vmove usr/lib/perf
 		vmove usr/libexec/perf-core
 		vmove usr/share/bash-completion/completions/perf
-		if ! [ "$XBPS_TARGET_MACHINE" = i686 ]; then
+		if ! [ "${XBPS_TARGET_MACHINE/-musl/}" = i686 ]; then
 			vmove usr/share/perf-core
 		fi
 		vmove /usr/share/doc/perf-tip

From 692d32953174234e5d5d043f98afcfe4790c9bfc Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 2 Feb 2021 14:23:43 +0200
Subject: [PATCH 0886/3482] anydesk: update to 6.1.0, - also drop i686 -
 upstream has ended support for 32bit.

---
 srcpkgs/anydesk/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 29cd8825fde6..65f573bcf989 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -1,8 +1,8 @@
 # Template file for 'anydesk'
 pkgname=anydesk
-version=6.0.1
-revision=3
-archs="i686 x86_64"
+version=6.1.0
+revision=1
+archs="x86_64"
 create_wrksrc=yes
 hostmakedepends="patchelf rpmextract w3m"
 short_desc="Fast remote desktop application"
@@ -13,12 +13,9 @@ homepage="https://anydesk.com/remote-desktop"
 nopie=yes
 restricted=yes
 
-distfiles="https://download.anydesk.com/linux/anydesk_$version-1_$XBPS_TARGET_MACHINE.rpm"
-if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ] ; then
-	checksum=df029878486944bf0400e90746fe738eee0fc3f849e7f47f19d432fcb357c03e
-elif [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then
-	checksum=b92a366a8233be44f556c81f274bdce3e527591987cc4c8d2b490fcd410305ed
-fi
+distfiles="https://download.anydesk.com/linux/anydesk_$version-1_x86_64.rpm"
+checksum=35772d898afa8cba0f410775fdd7e1e8e7b753130c906db94801895c0ea74754
+
 _eula_digest=f6386c15e187b6eac0ccd2564d3a873ae07d4b46a6b61dda13464caf5d54a319
 
 post_extract() {

From 32f96a19894a9e0a89f30f5766e9336111604efe Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 2 Feb 2021 07:56:29 -0600
Subject: [PATCH 0887/3482] plantuml: update to 1.2021.0.

---
 srcpkgs/plantuml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index d922c1def873..201a3258ce4e 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2020.17
+version=1.2021.0
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-jar-gplv2-${version}.zip"
-checksum=8aaa3a7ece83522d4ab036bb234e42524eb6443e905f5d435268b4a85a6ce8b1
+checksum=8825fd153063765f76c6039d131940cbf720e1599089ac9ad5e5814ec8ca9e99
 
 do_build() {
 	mv ${pkgname}.jar ${pkgname}-${version}.jar

From b9477eaa3377bc9b35c63db26a0fc31e1683c970 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 31 Jan 2021 16:55:35 +0100
Subject: [PATCH 0888/3482] gammu: update to 1.42.0.

---
 srcpkgs/gammu/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gammu/template b/srcpkgs/gammu/template
index 869d4d6d35d6..bb5d54bcfe90 100644
--- a/srcpkgs/gammu/template
+++ b/srcpkgs/gammu/template
@@ -1,6 +1,6 @@
 # Template file for 'gammu'
 pkgname=gammu
-version=1.40.0
+version=1.42.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Jakub Skrzypnik <jakub.skrzypnik@interia.pl>"
 license="GPL-2.0-or-later"
 homepage="https://wammu.eu"
 distfiles="https://dl.cihar.com/gammu/releases/gammu-${version}.tar.bz2"
-checksum=07691cfbf082038b6d8d4ad418ac34c983de551902b1cbd777f09350657b8a9f
+checksum=6197f8b4d35746d31567e61880121def676f225eba05276648410eaa6ce60c9f
 
 gammu-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -32,4 +32,3 @@ gammu-smsd_package() {
 		vmove "usr/lib/libgsmsd*"
 	}
 }
-

From f6c53b64e6dbace1e4ce82208344f95fddcaa85a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 2 Feb 2021 08:35:33 -0600
Subject: [PATCH 0889/3482] i3-gaps: update to 4.19.1.

---
 srcpkgs/i3-gaps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i3-gaps/template b/srcpkgs/i3-gaps/template
index 916ef6729c2a..0f6f3ae61ff3 100644
--- a/srcpkgs/i3-gaps/template
+++ b/srcpkgs/i3-gaps/template
@@ -1,6 +1,6 @@
 # Template file for 'i3-gaps'
 pkgname=i3-gaps
-version=4.19
+version=4.19.1
 revision=1
 wrksrc="i3-${version}"
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="ian c. <ian@airmail.cc>"
 license="BSD-3-Clause"
 homepage="https://github.com/Airblader/i3"
 distfiles="${homepage}/archive/${version}.tar.gz>${version}.tar.gz"
-checksum=dbd739dae5c16a94763dac0a7407d0307f0814f7bf48b99591b772820c874b4f
+checksum=97f33544f0a64a325b7b98cd4ad17dcf6f2c8ead1350d378154b76af1798e8fc
 
 provides="i3-${version}_${revision}"
 replaces="i3>=0"

From 57c9c71d621c2e90905a61b34770a07f7389d7e0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 2 Feb 2021 16:26:03 +0200
Subject: [PATCH 0890/3482] skype: update to 8.68.0.100.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 188bd20d8e90..b90602697801 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the debian package.
 pkgname=skype
-version=8.67.0.96
+version=8.68.0.100
 revision=1
 archs="x86_64"
 depends="elogind"
@@ -10,7 +10,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement"
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
-checksum=ea138f3241e27549b05173c638efdc029cf5e0030c534085872703263584b0c7
+checksum=8078e041174d0013be47e7dc0eeac70c042d6697242312db38333a4f1cfe2c7e
 repository="nonfree"
 nostrip="yes"
 

From 39a62db3c2462d0d56da727d93576b62dad93977 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 2 Feb 2021 17:02:28 +0100
Subject: [PATCH 0891/3482] wps-office: revbump to "fix" some shlib problems

the package did list qt4 as a dependencie, even so it ships with qt4 itself
just revbump to make it obvious to users that they need to update
---
 srcpkgs/wps-office/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 68180a6e4f52..fdb9a6b2120e 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,7 +1,7 @@
 # Template file for 'wps-office'
 pkgname=wps-office
 version=11.1.0.10161
-revision=1
+revision=2
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"

From 5b322c44c465510f077aa0d8f0dc45bc57f34567 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 2 Feb 2021 11:53:03 -0600
Subject: [PATCH 0892/3482] mongo-c-driver: update to 1.17.4.

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 03488bc2cd09..e360a5c65b1a 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.17.3
+version=1.17.4
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=6594cbae17389005bcac5a8d4091af3be4894d5314a519504d4b4509effcc0df
+checksum=9ec8fe7fb54d636886fa823460658ccf660e3d82520d10810fb7c9d302ac974f
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From 10af2306b15c1ab4229dcbd852426c8bfab25e1b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Feb 2021 12:41:19 -0500
Subject: [PATCH 0893/3482] python3-numpy: update to 1.20.0.

---
 srcpkgs/python3-numpy/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index ae5a0d095328..752fb593e483 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.19.5
-revision=2
+version=1.20.0
+revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython gcc-fortran"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=43fe3bcdf27a2eb27196a1d140385aeece71c8b1a6eda18d2c6365239e50c60f
+checksum=f30566b4a0d168a6869bef55b5843a2c8ed743f136fc80b305d6b8604828aea0
 alternatives="numpy:f2py:/usr/bin/f2py3"
 
 build_options="openblas"
@@ -37,6 +37,13 @@ post_patch() {
 	if [ "$XBPS_TARGET_LIBC" = musl ] ; then
 		vsed -i 's|"backtrace",||' numpy/core/setup_common.py
 	fi
+
+	if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+		# When host/target word sizes disagree, this $werror header
+		# triggers -Werror failures about redefining SIZEOF_OFF_T from
+		# the wrong host size to the correct target size
+		vsed -e 's/\$werror//' -i numpy/core/src/_simd/_simd.dispatch.c.src
+	fi
 }
 
 pre_build() {

From b4551abe1975f955ac40fa8fb23d51f3def6bde0 Mon Sep 17 00:00:00 2001
From: Artem Zhurikhin <ashpool@xecut.net>
Date: Tue, 2 Feb 2021 20:42:11 +0300
Subject: [PATCH 0894/3482] qalculate: update to 3.16.1.

---
 srcpkgs/qalculate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index d581a74bf40a..ec81d9cf9fd1 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
 pkgname=qalculate
-version=3.14.0
+version=3.16.1
 revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=ef422aa54eac7c711ece65dd3a5cbc66370d3e17173465313201897c201e7d3e
+checksum=bbe837073bf0d1995fe7ead4aae2b2e24260351048f6a513a9ca210342ce8e59
 
 libqalculate_package() {
 	short_desc+=" - library files"

From c014f68a51c36c0c5983ce2ee25b889d19fdd5c4 Mon Sep 17 00:00:00 2001
From: Artem Zhurikhin <ashpool@xecut.net>
Date: Tue, 2 Feb 2021 20:42:18 +0300
Subject: [PATCH 0895/3482] qalculate-gtk: update to 3.16.0.

---
 srcpkgs/qalculate-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 1938fb85c195..8d31b0842187 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
 pkgname=qalculate-gtk
-version=3.14.0
+version=3.16.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=704dd3a98b47e0a84eb61b80c50cd6c445b37a1d28c1b1c271d7aef3592657e7
+checksum=79cbdb9705921cbe5fe9593fb798cb68c455596bc20584c6d4c930c28137655f

From 3056472b7b52f1f148cc293d1dcaab58c4339c1e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 2 Feb 2021 20:02:24 +0100
Subject: [PATCH 0896/3482] syncthing: update to 1.13.0.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 8c9dc67fbfeb..1d27cf82139c 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.12.1
+version=1.13.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -18,7 +18,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=5751365374e03c32f731aeb1d07f7df0984eca30e14878d636b91cd35f0db1c3
+checksum=b31d4a323c6c970c580ecab3fd2327c5ba2709286b766b157139a5e393795bc2
 
 pre_build() {
 	GOARCH= go generate \

From 9ee82f36f6aca552d9f4980a4cb9a4411b3b6fd2 Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Mon, 11 Jan 2021 16:26:38 -0700
Subject: [PATCH 0897/3482] New package: jamulus-3.6.2

---
 srcpkgs/jamulus/template | 20 ++++++++++++++++++++
 srcpkgs/jamulus/update   |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/jamulus/template
 create mode 100644 srcpkgs/jamulus/update

diff --git a/srcpkgs/jamulus/template b/srcpkgs/jamulus/template
new file mode 100644
index 000000000000..1df45532ce14
--- /dev/null
+++ b/srcpkgs/jamulus/template
@@ -0,0 +1,20 @@
+# Template file for 'jamulus'
+pkgname=jamulus
+version=3.6.2
+revision=1
+_version=r${version//./_}
+wrksrc=${pkgname}-${_version}
+build_style=qmake
+configure_args="Jamulus.pro"
+hostmakedepends="pkg-config"
+makedepends="qt5-declarative-devel jack-devel"
+short_desc="Play music online. With friends. For free"
+maintainer="KawaiiAmber <japaneselearning101@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://jamulus.io"
+distfiles="https://github.com/corrados/jamulus/archive/${_version}.tar.gz"
+checksum=6bea992f0e4b6a9d08104f8ad9d42b630d523da258e201f70418cecda1c11dac
+
+if [ "${CROSS_BUILD}" ]; then
+	hostmakedepends+=" qt5-devel"
+fi
diff --git a/srcpkgs/jamulus/update b/srcpkgs/jamulus/update
new file mode 100644
index 000000000000..bf1d58d1e62e
--- /dev/null
+++ b/srcpkgs/jamulus/update
@@ -0,0 +1 @@
+pattern="r\K[0-9_]+_[0-9_]+"

From 3b030aa945f1b2e5f3e0cc38623df5beaa34f865 Mon Sep 17 00:00:00 2001
From: John Sullivan <jsullivan@csumb.edu>
Date: Mon, 1 Feb 2021 15:00:56 -0800
Subject: [PATCH 0898/3482] pinephone-kernel: update to 5.10.12.

---
 .../files/{config => pinephone-dotconfig}     | 569 +++++++++---------
 srcpkgs/pinephone-kernel/template             |  61 +-
 2 files changed, 334 insertions(+), 296 deletions(-)
 rename srcpkgs/pinephone-kernel/files/{config => pinephone-dotconfig} (93%)

diff --git a/srcpkgs/pinephone-kernel/files/config b/srcpkgs/pinephone-kernel/files/pinephone-dotconfig
similarity index 93%
rename from srcpkgs/pinephone-kernel/files/config
rename to srcpkgs/pinephone-kernel/files/pinephone-dotconfig
index f3338771c767..f112f3ebe650 100644
--- a/srcpkgs/pinephone-kernel/files/config
+++ b/srcpkgs/pinephone-kernel/files/pinephone-dotconfig
@@ -1,12 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.8.10 Kernel Configuration
+# Linux/arm64 5.10.12 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 9.3.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=232000000
+CONFIG_GCC_VERSION=100201
+CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
+CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
@@ -49,6 +50,7 @@ CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
+CONFIG_GENERIC_IRQ_IPI=y
 CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_IRQ_MSI_IOMMU=y
@@ -106,13 +108,12 @@ CONFIG_TREE_RCU=y
 CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RUDE_RCU=y
+CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
 # end of RCU Subsystem
 
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
+# CONFIG_IKCONFIG is not set
 # CONFIG_IKHEADERS is not set
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
@@ -137,40 +138,42 @@ CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_CFS_BANDWIDTH is not set
-# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_PIDS=y
 # CONFIG_CGROUP_RDMA is not set
-# CONFIG_CGROUP_FREEZER is not set
+CONFIG_CGROUP_FREEZER=y
 CONFIG_CPUSETS=y
 # CONFIG_PROC_PID_CPUSET is not set
 CONFIG_CGROUP_DEVICE=y
-# CONFIG_CGROUP_CPUACCT is not set
+CONFIG_CGROUP_CPUACCT=y
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
 CONFIG_SOCK_CGROUP_DATA=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
+CONFIG_TIME_NS=y
 CONFIG_IPC_NS=y
 CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 # CONFIG_CHECKPOINT_RESTORE is not set
-# CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_LZMA is not set
-# CONFIG_RD_XZ is not set
-# CONFIG_RD_LZO is not set
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
+CONFIG_RD_ZSTD=y
 CONFIG_BOOT_CONFIG=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_LD_ORPHAN_WARN=y
 CONFIG_SYSCTL=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
@@ -199,12 +202,13 @@ CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
-# CONFIG_BPF_JIT_ALWAYS_ON is not set
+CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
+CONFIG_USERMODE_DRIVER=y
+# CONFIG_BPF_PRELOAD is not set
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_RSEQ=y
@@ -215,7 +219,6 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # end of Kernel Performance Events And Counters
 
 CONFIG_VM_EVENT_COUNTERS=y
@@ -230,14 +233,14 @@ CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 # CONFIG_PROFILING is not set
-CONFIG_TRACEPOINTS=y
 # end of General setup
 
 CONFIG_ARM64=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
 CONFIG_ARM64_PAGE_SHIFT=12
-CONFIG_ARM64_CONT_SHIFT=4
+CONFIG_ARM64_CONT_PTE_SHIFT=4
+CONFIG_ARM64_CONT_PMD_SHIFT=4
 CONFIG_ARCH_MMAP_RND_BITS_MIN=18
 CONFIG_ARCH_MMAP_RND_BITS_MAX=24
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
@@ -276,10 +279,12 @@ CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_BITMAIN is not set
 # CONFIG_ARCH_BRCMSTB is not set
 # CONFIG_ARCH_EXYNOS is not set
+# CONFIG_ARCH_SPARX5 is not set
 # CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_LAYERSCAPE is not set
 # CONFIG_ARCH_LG1K is not set
 # CONFIG_ARCH_HISI is not set
+# CONFIG_ARCH_KEEMBAY is not set
 # CONFIG_ARCH_MEDIATEK is not set
 # CONFIG_ARCH_MESON is not set
 # CONFIG_ARCH_MVEBU is not set
@@ -298,6 +303,7 @@ CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_THUNDER2 is not set
 # CONFIG_ARCH_UNIPHIER is not set
 # CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_VISCONTI is not set
 # CONFIG_ARCH_XGENE is not set
 # CONFIG_ARCH_ZX is not set
 # CONFIG_ARCH_ZYNQMP is not set
@@ -316,17 +322,17 @@ CONFIG_ARM64_ERRATUM_827319=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_819472=y
 # CONFIG_ARM64_ERRATUM_832075 is not set
-# CONFIG_ARM64_ERRATUM_834220 is not set
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
 # CONFIG_ARM64_ERRATUM_1024718 is not set
-CONFIG_ARM64_ERRATUM_1418040=y
+# CONFIG_ARM64_ERRATUM_1418040 is not set
 # CONFIG_ARM64_ERRATUM_1165522 is not set
 # CONFIG_ARM64_ERRATUM_1319367 is not set
 # CONFIG_ARM64_ERRATUM_1530923 is not set
 # CONFIG_ARM64_ERRATUM_1286807 is not set
 # CONFIG_ARM64_ERRATUM_1463225 is not set
 # CONFIG_ARM64_ERRATUM_1542419 is not set
+CONFIG_ARM64_ERRATUM_1508412=y
 # CONFIG_CAVIUM_ERRATUM_22375 is not set
 # CONFIG_CAVIUM_ERRATUM_23154 is not set
 # CONFIG_CAVIUM_ERRATUM_27456 is not set
@@ -374,8 +380,7 @@ CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_SECCOMP=y
-CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT is not set
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 # CONFIG_KEXEC is not set
 # CONFIG_KEXEC_FILE is not set
@@ -383,9 +388,6 @@ CONFIG_PARAVIRT=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
-CONFIG_HARDEN_EL2_VECTORS=y
-CONFIG_ARM64_SSBD=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
@@ -396,46 +398,51 @@ CONFIG_KUSER_HELPERS=y
 #
 # ARMv8.1 architectural features
 #
-CONFIG_ARM64_HW_AFDBM=y
-CONFIG_ARM64_PAN=y
-CONFIG_ARM64_LSE_ATOMICS=y
-CONFIG_ARM64_USE_LSE_ATOMICS=y
-CONFIG_ARM64_VHE=y
+# CONFIG_ARM64_HW_AFDBM is not set
+# CONFIG_ARM64_PAN is not set
+# CONFIG_ARM64_USE_LSE_ATOMICS is not set
+# CONFIG_ARM64_VHE is not set
 # end of ARMv8.1 architectural features
 
 #
 # ARMv8.2 architectural features
 #
-CONFIG_ARM64_UAO=y
+# CONFIG_ARM64_UAO is not set
 # CONFIG_ARM64_PMEM is not set
 # CONFIG_ARM64_RAS_EXTN is not set
-CONFIG_ARM64_CNP=y
+# CONFIG_ARM64_CNP is not set
 # end of ARMv8.2 architectural features
 
 #
 # ARMv8.3 architectural features
 #
+# CONFIG_ARM64_PTR_AUTH is not set
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
 CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
 CONFIG_AS_HAS_PAC=y
+CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y
 # end of ARMv8.3 architectural features
 
 #
 # ARMv8.4 architectural features
 #
-CONFIG_ARM64_AMU_EXTN=y
+# CONFIG_ARM64_AMU_EXTN is not set
+CONFIG_AS_HAS_ARMV8_4=y
+# CONFIG_ARM64_TLB_RANGE is not set
 # end of ARMv8.4 architectural features
 
 #
 # ARMv8.5 architectural features
 #
-CONFIG_ARM64_BTI=y
+# CONFIG_ARM64_BTI is not set
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
-CONFIG_ARM64_E0PD=y
-CONFIG_ARCH_RANDOM=y
+# CONFIG_ARM64_E0PD is not set
+# CONFIG_ARCH_RANDOM is not set
+CONFIG_ARM64_AS_HAS_MTE=y
+CONFIG_ARM64_MTE=y
 # end of ARMv8.5 architectural features
 
-CONFIG_ARM64_SVE=y
+# CONFIG_ARM64_SVE is not set
 CONFIG_ARM64_MODULE_PLTS=y
 # CONFIG_ARM64_PSEUDO_NMI is not set
 CONFIG_RELOCATABLE=y
@@ -460,7 +467,7 @@ CONFIG_SUSPEND_FREEZER=y
 # CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
+CONFIG_PM_AUTOSLEEP=y
 CONFIG_PM_WAKELOCKS=y
 CONFIG_PM_WAKELOCKS_LIMIT=100
 CONFIG_PM_WAKELOCKS_GC=y
@@ -499,6 +506,7 @@ CONFIG_DT_IDLE_STATES=y
 #
 CONFIG_ARM_CPUIDLE=y
 CONFIG_ARM_PSCI_CPUIDLE=y
+CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
 # end of ARM CPU Idle Drivers
 # end of CPU Idle
 
@@ -539,11 +547,11 @@ CONFIG_ARM_SCPI_PROTOCOL=y
 CONFIG_ARM_SCPI_POWER_DOMAIN=y
 # CONFIG_ARM_SDE_INTERFACE is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
-CONFIG_EFI_EARLYCON=y
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_HAVE_ARM_SMCCC=y
 CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
+# CONFIG_ARM_SMCCC_SOC_ID is not set
 
 #
 # Tegra firmware driver
@@ -551,51 +559,35 @@ CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
 # end of Tegra firmware driver
 # end of Firmware Drivers
 
-CONFIG_IRQ_BYPASS_MANAGER=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_MMIO=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
-CONFIG_KVM_ARM_PMU=y
-CONFIG_KVM_INDIRECT_VECTORS=y
+# CONFIG_VIRTUALIZATION is not set
 CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64_CE=y
-CONFIG_CRYPTO_SHA3_ARM64=y
-CONFIG_CRYPTO_SM3_ARM64_CE=y
-CONFIG_CRYPTO_SM4_ARM64_CE=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CHACHA20_NEON=y
-CONFIG_CRYPTO_POLY1305_NEON=y
+CONFIG_CRYPTO_SHA256_ARM64=m
+CONFIG_CRYPTO_SHA512_ARM64=m
+CONFIG_CRYPTO_SHA1_ARM64_CE=m
+CONFIG_CRYPTO_SHA2_ARM64_CE=m
+CONFIG_CRYPTO_SHA512_ARM64_CE=m
+CONFIG_CRYPTO_SHA3_ARM64=m
+CONFIG_CRYPTO_SM3_ARM64_CE=m
+CONFIG_CRYPTO_SM4_ARM64_CE=m
+CONFIG_CRYPTO_GHASH_ARM64_CE=m
+CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64=m
+CONFIG_CRYPTO_AES_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
+CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
+CONFIG_CRYPTO_CHACHA20_NEON=m
+CONFIG_CRYPTO_POLY1305_NEON=m
 # CONFIG_CRYPTO_NHPOLY1305_NEON is not set
-CONFIG_CRYPTO_AES_ARM64_BS=y
+CONFIG_CRYPTO_AES_ARM64_BS=m
 
 #
 # General architecture-dependent options
 #
+CONFIG_SET_FS=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
@@ -626,15 +618,17 @@ CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
 CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
 # CONFIG_STACKPROTECTOR is not set
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PMD=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
@@ -645,7 +639,6 @@ CONFIG_ARCH_MMAP_RND_BITS=18
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
@@ -658,9 +651,9 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
 CONFIG_HAVE_ARCH_COMPILER_H=y
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
 
 #
 # GCOV-based kernel profiling
@@ -692,10 +685,9 @@ CONFIG_BLOCK=y
 CONFIG_BLK_RQ_ALLOC_TIME=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_CGROUP_RWSTAT=y
-CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_BSGLIB is not set
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=m
+# CONFIG_BLK_DEV_INTEGRITY is not set
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
@@ -746,7 +738,6 @@ CONFIG_BFQ_GROUP_IOSCHED=y
 # CONFIG_BFQ_CGROUP_DEBUG is not set
 # end of IO Schedulers
 
-CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=y
 CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y
@@ -834,7 +825,6 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
@@ -849,7 +839,6 @@ CONFIG_MIGRATION=y
 CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
-CONFIG_MMU_NOTIFIER=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
@@ -858,20 +847,19 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 # CONFIG_CLEANCACHE is not set
 # CONFIG_FRONTSWAP is not set
 CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_DEBUGFS=y
 CONFIG_CMA_AREAS=7
 CONFIG_ZPOOL=y
 CONFIG_ZBUD=y
 CONFIG_Z3FOLD=y
 CONFIG_ZSMALLOC=y
-# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_FRAME_VECTOR=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
@@ -908,6 +896,7 @@ CONFIG_IP_ADVANCED_ROUTER=y
 # CONFIG_IP_MULTIPLE_TABLES is not set
 # CONFIG_IP_ROUTE_MULTIPATH is not set
 # CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_ROUTE_CLASSID=y
 # CONFIG_IP_PNP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE_DEMUX is not set
@@ -943,7 +932,6 @@ CONFIG_IPV6=y
 # CONFIG_IPV6_RPL_LWTUNNEL is not set
 CONFIG_MPTCP=y
 CONFIG_MPTCP_IPV6=y
-# CONFIG_MPTCP_HMAC_TEST is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
@@ -1112,7 +1100,81 @@ CONFIG_HAVE_NET_DSA=y
 # CONFIG_PHONET is not set
 # CONFIG_6LOWPAN is not set
 # CONFIG_IEEE802154 is not set
-# CONFIG_NET_SCHED is not set
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+# CONFIG_NET_SCH_HFSC is not set
+# CONFIG_NET_SCH_PRIO is not set
+# CONFIG_NET_SCH_MULTIQ is not set
+# CONFIG_NET_SCH_RED is not set
+# CONFIG_NET_SCH_SFB is not set
+# CONFIG_NET_SCH_SFQ is not set
+# CONFIG_NET_SCH_TEQL is not set
+# CONFIG_NET_SCH_TBF is not set
+# CONFIG_NET_SCH_CBS is not set
+# CONFIG_NET_SCH_ETF is not set
+# CONFIG_NET_SCH_TAPRIO is not set
+# CONFIG_NET_SCH_GRED is not set
+# CONFIG_NET_SCH_DSMARK is not set
+# CONFIG_NET_SCH_NETEM is not set
+# CONFIG_NET_SCH_DRR is not set
+# CONFIG_NET_SCH_MQPRIO is not set
+# CONFIG_NET_SCH_SKBPRIO is not set
+# CONFIG_NET_SCH_CHOKE is not set
+# CONFIG_NET_SCH_QFQ is not set
+# CONFIG_NET_SCH_CODEL is not set
+# CONFIG_NET_SCH_FQ_CODEL is not set
+# CONFIG_NET_SCH_CAKE is not set
+# CONFIG_NET_SCH_FQ is not set
+# CONFIG_NET_SCH_HHF is not set
+# CONFIG_NET_SCH_PIE is not set
+# CONFIG_NET_SCH_INGRESS is not set
+# CONFIG_NET_SCH_PLUG is not set
+# CONFIG_NET_SCH_ETS is not set
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+# CONFIG_NET_CLS_TCINDEX is not set
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+# CONFIG_NET_CLS_U32 is not set
+# CONFIG_NET_CLS_RSVP is not set
+# CONFIG_NET_CLS_RSVP6 is not set
+# CONFIG_NET_CLS_FLOW is not set
+CONFIG_NET_CLS_CGROUP=m
+# CONFIG_NET_CLS_BPF is not set
+# CONFIG_NET_CLS_FLOWER is not set
+# CONFIG_NET_CLS_MATCHALL is not set
+# CONFIG_NET_EMATCH is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+# CONFIG_GACT_PROB is not set
+CONFIG_NET_ACT_MIRRED=m
+# CONFIG_NET_ACT_SAMPLE is not set
+# CONFIG_NET_ACT_NAT is not set
+# CONFIG_NET_ACT_PEDIT is not set
+# CONFIG_NET_ACT_SIMP is not set
+# CONFIG_NET_ACT_SKBEDIT is not set
+# CONFIG_NET_ACT_CSUM is not set
+# CONFIG_NET_ACT_MPLS is not set
+# CONFIG_NET_ACT_VLAN is not set
+# CONFIG_NET_ACT_BPF is not set
+# CONFIG_NET_ACT_SKBMOD is not set
+# CONFIG_NET_ACT_IFE is not set
+# CONFIG_NET_ACT_TUNNEL_KEY is not set
+# CONFIG_NET_ACT_CT is not set
+# CONFIG_NET_ACT_GATE is not set
+# CONFIG_NET_TC_SKB_EXT is not set
+CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
 # CONFIG_DNS_RESOLVER is not set
 # CONFIG_BATMAN_ADV is not set
@@ -1141,7 +1203,6 @@ CONFIG_NET_FLOW_LIMIT=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
 # end of Network testing
 # end of Networking options
 
@@ -1160,8 +1221,6 @@ CONFIG_BT_LE=y
 CONFIG_BT_LEDS=y
 # CONFIG_BT_MSFTEXT is not set
 CONFIG_BT_DEBUGFS=y
-# CONFIG_BT_SELFTEST is not set
-# CONFIG_BT_FEATURE_DEBUG is not set
 
 #
 # Bluetooth device drivers
@@ -1260,16 +1319,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_EXTRA_FIRMWARE_DIR is not set
 # CONFIG_FW_LOADER_USER_HELPER is not set
 # CONFIG_FW_LOADER_COMPRESS is not set
 CONFIG_FW_CACHE=y
 # end of Firmware loader
 
 CONFIG_ALLOW_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
@@ -1350,6 +1405,7 @@ CONFIG_BLK_DEV_NBD=m
 # CONFIG_SRAM is not set
 # CONFIG_XILINX_SDFEC is not set
 # CONFIG_PVPANIC is not set
+# CONFIG_HISI_HIKEY_USB is not set
 CONFIG_MODEM_POWER=m
 # CONFIG_C2PORT is not set
 
@@ -1372,13 +1428,6 @@ CONFIG_MODEM_POWER=m
 
 # CONFIG_SENSORS_LIS3_I2C is not set
 # CONFIG_ALTERA_STAPL is not set
-
-#
-# Intel MIC & related support
-#
-# CONFIG_VOP_BUS is not set
-# end of Intel MIC & related support
-
 # CONFIG_ECHO is not set
 # CONFIG_MISC_RTSX_USB is not set
 # CONFIG_UACCE is not set
@@ -1459,6 +1508,7 @@ CONFIG_NET_CORE=y
 CONFIG_WIREGUARD=m
 # CONFIG_WIREGUARD_DEBUG is not set
 # CONFIG_EQUALIZER is not set
+# CONFIG_IFB is not set
 # CONFIG_NET_TEAM is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_IPVLAN is not set
@@ -1479,8 +1529,14 @@ CONFIG_VETH=m
 # end of Distributed Switch Architecture drivers
 
 # CONFIG_ETHERNET is not set
-# CONFIG_MDIO_DEVICE is not set
 # CONFIG_PHYLIB is not set
+# CONFIG_MDIO_DEVICE is not set
+
+#
+# PCS device drivers
+#
+# end of PCS device drivers
+
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_DEFLATE=m
@@ -1543,6 +1599,7 @@ CONFIG_WLAN=y
 # CONFIG_WLAN_VENDOR_INTERSIL is not set
 # CONFIG_WLAN_VENDOR_MARVELL is not set
 # CONFIG_WLAN_VENDOR_MEDIATEK is not set
+# CONFIG_WLAN_VENDOR_MICROCHIP is not set
 # CONFIG_WLAN_VENDOR_RALINK is not set
 # CONFIG_WLAN_VENDOR_REALTEK is not set
 # CONFIG_WLAN_VENDOR_RSI is not set
@@ -1682,6 +1739,7 @@ CONFIG_TOUCHSCREEN_GOODIX=m
 # CONFIG_TOUCHSCREEN_ZFORCE is not set
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
 # CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_ZINITIX is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
@@ -1785,6 +1843,7 @@ CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_HVC_DCC is not set
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
+# CONFIG_VIRTIO_CONSOLE is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_DEVMEM=y
@@ -1793,7 +1852,6 @@ CONFIG_DEVMEM=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
 # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
 
 #
@@ -1886,13 +1944,18 @@ CONFIG_PINMUX=y
 CONFIG_GENERIC_PINMUX_FUNCTIONS=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_AXP209=y
 # CONFIG_PINCTRL_MCP23S08 is not set
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_OCELOT is not set
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
 CONFIG_PINCTRL_SUNXI=y
 # CONFIG_PINCTRL_SUN4I_A10 is not set
 # CONFIG_PINCTRL_SUN5I is not set
@@ -1910,14 +1973,17 @@ CONFIG_PINCTRL_SUNXI=y
 # CONFIG_PINCTRL_SUN9I_A80_R is not set
 CONFIG_PINCTRL_SUN50I_A64=y
 CONFIG_PINCTRL_SUN50I_A64_R=y
+CONFIG_PINCTRL_SUN50I_A100=y
+CONFIG_PINCTRL_SUN50I_A100_R=y
 # CONFIG_PINCTRL_SUN50I_H5 is not set
 # CONFIG_PINCTRL_SUN50I_H6 is not set
 # CONFIG_PINCTRL_SUN50I_H6_R is not set
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
-# CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
 
 #
 # Memory mapped GPIO drivers
@@ -1950,6 +2016,7 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCA9570 is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_TPIC2810 is not set
 # end of I2C GPIO expanders
@@ -1967,7 +2034,6 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_AGGREGATOR is not set
 # CONFIG_GPIO_MOCKUP is not set
 # CONFIG_W1 is not set
-# CONFIG_POWER_AVS is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_BRCMSTB is not set
 # CONFIG_POWER_RESET_GPIO is not set
@@ -1989,7 +2055,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_MANAGER_SBS is not set
@@ -2011,7 +2076,9 @@ CONFIG_AXP20X_POWER=y
 # CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_BQ24257 is not set
 # CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_BQ2515X is not set
 # CONFIG_CHARGER_BQ25890 is not set
+# CONFIG_CHARGER_BQ25980 is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_CHARGER_RT9455 is not set
@@ -2019,6 +2086,7 @@ CONFIG_AXP20X_POWER=y
 # CONFIG_CHARGER_BD99954 is not set
 # CONFIG_HWMON is not set
 CONFIG_THERMAL=y
+# CONFIG_THERMAL_NETLINK is not set
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_OF=y
@@ -2033,7 +2101,6 @@ CONFIG_THERMAL_GOV_BANG_BANG=y
 # CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
 CONFIG_CPU_THERMAL=y
 CONFIG_CPU_FREQ_THERMAL=y
-# CONFIG_CLOCK_THERMAL is not set
 # CONFIG_DEVFREQ_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
 # CONFIG_THERMAL_MMIO is not set
@@ -2137,7 +2204,6 @@ CONFIG_MFD_AXP20X_RSB=y
 # CONFIG_MFD_SI476X_CORE is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SKY81452 is not set
-# CONFIG_MFD_SMSC is not set
 # CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_STMPE is not set
 CONFIG_MFD_SUN6I_PRCM=y
@@ -2193,6 +2259,7 @@ CONFIG_REGULATOR_AXP20X=y
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
 # CONFIG_REGULATOR_FAN53555 is not set
+# CONFIG_REGULATOR_FAN53880 is not set
 CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_ISL9305 is not set
 # CONFIG_REGULATOR_ISL6271A is not set
@@ -2214,14 +2281,19 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_MP886X is not set
 # CONFIG_REGULATOR_MPQ7920 is not set
 # CONFIG_REGULATOR_MT6311 is not set
+# CONFIG_REGULATOR_PCA9450 is not set
 # CONFIG_REGULATOR_PFUZE100 is not set
 # CONFIG_REGULATOR_PV88060 is not set
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
 # CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+# CONFIG_REGULATOR_RT4801 is not set
+# CONFIG_REGULATOR_RTMV20 is not set
 # CONFIG_REGULATOR_SLG51000 is not set
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
+# CONFIG_REGULATOR_SY8827N is not set
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
@@ -2261,6 +2333,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FLASH_LED_CLASS=m
 CONFIG_V4L2_FWNODE=m
 # end of Video4Linux options
 
@@ -2355,6 +2428,7 @@ CONFIG_VIDEO_SUN8I_ROTATE=m
 # CONFIG_VIDEO_TW9906 is not set
 # CONFIG_VIDEO_TW9910 is not set
 # CONFIG_VIDEO_VPX3220 is not set
+# CONFIG_VIDEO_MAX9286 is not set
 
 #
 # Video and audio decoders
@@ -2420,7 +2494,6 @@ CONFIG_VIDEO_SUN8I_ROTATE=m
 # CONFIG_VIDEO_OV2659 is not set
 # CONFIG_VIDEO_OV2680 is not set
 # CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV2740 is not set
 CONFIG_VIDEO_OV5640=m
 # CONFIG_VIDEO_OV5645 is not set
 # CONFIG_VIDEO_OV5647 is not set
@@ -2450,6 +2523,7 @@ CONFIG_VIDEO_OV5640=m
 # CONFIG_VIDEO_SR030PC30 is not set
 # CONFIG_VIDEO_NOON010PC30 is not set
 # CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_RDACM20 is not set
 # CONFIG_VIDEO_RJ54N1 is not set
 # CONFIG_VIDEO_S5K6AA is not set
 # CONFIG_VIDEO_S5K6A3 is not set
@@ -2467,6 +2541,7 @@ CONFIG_VIDEO_GC2145=m
 # CONFIG_VIDEO_AD5820 is not set
 # CONFIG_VIDEO_AK7375 is not set
 # CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9768 is not set
 # CONFIG_VIDEO_DW9807_VCM is not set
 # end of Lens drivers
 
@@ -2491,7 +2566,6 @@ CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 # CONFIG_DRM_DEBUG_MM is not set
-# CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
@@ -2525,7 +2599,6 @@ CONFIG_DRM_SCHED=m
 # CONFIG_DRM_UDL is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
-CONFIG_DRM_RCAR_WRITEBACK=y
 CONFIG_DRM_SUN4I=y
 # CONFIG_DRM_SUN4I_HDMI is not set
 # CONFIG_DRM_SUN4I_BACKEND is not set
@@ -2547,13 +2620,14 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
 # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
+CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
+# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
 # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
 # CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
@@ -2565,6 +2639,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
@@ -2588,6 +2663,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_CDNS_DSI is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_DISPLAY_CONNECTOR is not set
+# CONFIG_DRM_LONTIUM_LT9611 is not set
 # CONFIG_DRM_LVDS_CODEC is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 # CONFIG_DRM_NWL_MIPI_DSI is not set
@@ -2599,15 +2675,18 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_SII9234 is not set
 # CONFIG_DRM_SIMPLE_BRIDGE is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
+# CONFIG_DRM_TOSHIBA_TC358762 is not set
 # CONFIG_DRM_TOSHIBA_TC358764 is not set
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
 # CONFIG_DRM_TOSHIBA_TC358768 is not set
+# CONFIG_DRM_TOSHIBA_TC358775 is not set
 # CONFIG_DRM_TI_TFP410 is not set
 # CONFIG_DRM_TI_SN65DSI86 is not set
 # CONFIG_DRM_TI_TPD12S015 is not set
 # CONFIG_DRM_ANALOGIX_ANX6345 is not set
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
+# CONFIG_DRM_CDNS_MHDP8546 is not set
 CONFIG_DRM_DW_HDMI=y
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
@@ -2666,7 +2745,7 @@ CONFIG_FB_SIMPLE=y
 #
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
+# CONFIG_BACKLIGHT_KTD253 is not set
 CONFIG_BACKLIGHT_PWM=y
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
@@ -2839,6 +2918,7 @@ CONFIG_SND_SOC_BT_SCO=m
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
+# CONFIG_SND_SOC_CS4234 is not set
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -2851,19 +2931,19 @@ CONFIG_SND_SOC_BT_SCO=m
 # CONFIG_SND_SOC_DA7213 is not set
 # CONFIG_SND_SOC_DMIC is not set
 CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_EC25=m
 # CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES7241 is not set
 # CONFIG_SND_SOC_ES8316 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
 # CONFIG_SND_SOC_GTM601 is not set
-CONFIG_SND_SOC_EC25=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98088 is not set
 # CONFIG_SND_SOC_MAX98357A is not set
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9867 is not set
 # CONFIG_SND_SOC_MAX98927 is not set
-# CONFIG_SND_SOC_MAX98373 is not set
+# CONFIG_SND_SOC_MAX98373_I2C is not set
 # CONFIG_SND_SOC_MAX98390 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
@@ -2889,6 +2969,7 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_STI_SAS is not set
 # CONFIG_SND_SOC_TAS2552 is not set
 # CONFIG_SND_SOC_TAS2562 is not set
+# CONFIG_SND_SOC_TAS2764 is not set
 # CONFIG_SND_SOC_TAS2770 is not set
 # CONFIG_SND_SOC_TAS5086 is not set
 # CONFIG_SND_SOC_TAS571X is not set
@@ -2983,6 +3064,7 @@ CONFIG_HID_GENERIC=m
 # CONFIG_HID_GFRM is not set
 # CONFIG_HID_GLORIOUS is not set
 # CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_VIVALDI is not set
 # CONFIG_HID_GT683R is not set
 # CONFIG_HID_KEYTOUCH is not set
 # CONFIG_HID_KYE is not set
@@ -3071,10 +3153,11 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_FEW_INIT_RETRIES is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
 CONFIG_USB_OTG_FSM=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_AUTOSUSPEND_DELAY=2
@@ -3136,7 +3219,13 @@ CONFIG_USB_UAS=m
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-# CONFIG_USBIP_CORE is not set
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
+CONFIG_USBIP_HOST=m
+CONFIG_USBIP_VUDC=m
+# CONFIG_USBIP_DEBUG is not set
 # CONFIG_USB_CDNS3 is not set
 CONFIG_USB_MUSB_HDRC=m
 # CONFIG_USB_MUSB_HOST is not set
@@ -3166,13 +3255,13 @@ CONFIG_USB_SERIAL_SIMPLE=m
 # CONFIG_USB_SERIAL_AIRCABLE is not set
 # CONFIG_USB_SERIAL_ARK3116 is not set
 # CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
+CONFIG_USB_SERIAL_CH341=m
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_CP210X is not set
+CONFIG_USB_SERIAL_CP210X=m
 # CONFIG_USB_SERIAL_CYPRESS_M8 is not set
 # CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
+CONFIG_USB_SERIAL_FTDI_SIO=m
 # CONFIG_USB_SERIAL_VISOR is not set
 # CONFIG_USB_SERIAL_IPAQ is not set
 # CONFIG_USB_SERIAL_IR is not set
@@ -3255,7 +3344,6 @@ CONFIG_NOP_USB_XCEIV=m
 # end of USB Physical Layer drivers
 
 CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=500
@@ -3347,19 +3435,21 @@ CONFIG_USB_G_MULTI_CDC=y
 CONFIG_USB_G_HID=m
 # CONFIG_USB_G_DBGP is not set
 CONFIG_USB_G_WEBCAM=m
-# CONFIG_USB_RAW_GADGET is not set
+CONFIG_USB_RAW_GADGET=m
 # end of USB Gadget precomposed configurations
 
 CONFIG_TYPEC=y
 CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_TCPCI=m
 # CONFIG_TYPEC_RT1711H is not set
+# CONFIG_TYPEC_TCPCI_MAXIM is not set
 # CONFIG_TYPEC_FUSB302 is not set
 CONFIG_TYPEC_UCSI=m
 # CONFIG_UCSI_CCG is not set
 CONFIG_TYPEC_ANX7688=m
 # CONFIG_TYPEC_HD3SS3220 is not set
 # CONFIG_TYPEC_TPS6598X is not set
+# CONFIG_TYPEC_STUSB160X is not set
 
 #
 # USB Type-C Multiplexer/DeMultiplexer Switch support
@@ -3400,13 +3490,16 @@ CONFIG_MMC_SUNXI=y
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_CLASS_FLASH is not set
+CONFIG_LEDS_CLASS_FLASH=y
+# CONFIG_LEDS_CLASS_MULTICOLOR is not set
 # CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
 
 #
 # LED drivers
 #
+# CONFIG_LEDS_AAT1290 is not set
 # CONFIG_LEDS_AN30259A is not set
+# CONFIG_LEDS_AS3645A is not set
 # CONFIG_LEDS_AW2013 is not set
 # CONFIG_LEDS_BCM6328 is not set
 # CONFIG_LEDS_BCM6358 is not set
@@ -3414,14 +3507,13 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_LM3532 is not set
 # CONFIG_LEDS_LM3642 is not set
 # CONFIG_LEDS_LM3692X is not set
+# CONFIG_LEDS_LM3601X is not set
 # CONFIG_LEDS_PCA9532 is not set
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_LP3952 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-# CONFIG_LEDS_LP5562 is not set
-# CONFIG_LEDS_LP8501 is not set
+# CONFIG_LEDS_LP50XX is not set
+# CONFIG_LEDS_LP55XX_COMMON is not set
 # CONFIG_LEDS_LP8860 is not set
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_PCA963X is not set
@@ -3432,6 +3524,7 @@ CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_TLC591XX is not set
 # CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_KTD2692 is not set
 # CONFIG_LEDS_IS31FL319X is not set
 # CONFIG_LEDS_IS31FL32XX is not set
 
@@ -3443,6 +3536,7 @@ CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_MLXREG is not set
 # CONFIG_LEDS_USER is not set
 # CONFIG_LEDS_TI_LMU_COMMON is not set
+CONFIG_LEDS_SGM3140=m
 # CONFIG_LEDS_AXP20X is not set
 
 #
@@ -3461,8 +3555,8 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
-# CONFIG_LEDS_TRIGGER_CAMERA is not set
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGER_NETDEV=y
 CONFIG_LEDS_TRIGGER_PATTERN=y
@@ -3519,6 +3613,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_RX8025 is not set
 # CONFIG_RTC_DRV_EM3027 is not set
 # CONFIG_RTC_DRV_RV3028 is not set
+# CONFIG_RTC_DRV_RV3032 is not set
 # CONFIG_RTC_DRV_RV8803 is not set
 # CONFIG_RTC_DRV_SD3078 is not set
 
@@ -3577,6 +3672,7 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DMA_OF=y
 # CONFIG_ALTERA_MSGDMA is not set
 # CONFIG_AMBA_PL08X is not set
+# CONFIG_BCM_SBA_RAID is not set
 CONFIG_DMA_SUN6I=y
 # CONFIG_DW_AXI_DMAC is not set
 # CONFIG_FSL_EDMA is not set
@@ -3586,6 +3682,7 @@ CONFIG_DMA_SUN6I=y
 # CONFIG_PL330_DMA is not set
 # CONFIG_XILINX_DMA is not set
 # CONFIG_XILINX_ZYNQMP_DMA is not set
+# CONFIG_XILINX_ZYNQMP_DPDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_DW_DMAC is not set
@@ -3683,31 +3780,21 @@ CONFIG_STAGING=y
 # end of Resolver to digital converters
 # end of IIO staging drivers
 
-#
-# Speakup console speech
-#
-# CONFIG_SPEAKUP is not set
-# end of Speakup console speech
-
 CONFIG_STAGING_MEDIA=y
 CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_SUNXI_CEDRUS=m
 
-#
-# soc_camera sensor drivers
-#
-
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_GS_FPGABOOT is not set
 # CONFIG_UNISYSSPAR is not set
-# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-# CONFIG_WILC1000_SDIO is not set
 # CONFIG_KS7010 is not set
 
 #
@@ -3718,16 +3805,14 @@ CONFIG_VIDEO_SUNXI_CEDRUS=m
 # CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_WFX is not set
-CONFIG_RTL8723CS_NEW=m
+CONFIG_RTL8723CS=m
 # CONFIG_GOLDFISH is not set
-# CONFIG_MFD_CROS_EC is not set
 # CONFIG_CHROME_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_HAVE_CLK=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
-# CONFIG_CLK_HSDK is not set
 # CONFIG_COMMON_CLK_MAX9485 is not set
 # CONFIG_COMMON_CLK_SCPI is not set
 # CONFIG_COMMON_CLK_SI5341 is not set
@@ -3750,6 +3835,8 @@ CONFIG_CLK_SUNXI_PRCM_SUN8I=y
 # CONFIG_CLK_SUNXI_PRCM_SUN9I is not set
 CONFIG_SUNXI_CCU=y
 CONFIG_SUN50I_A64_CCU=y
+CONFIG_SUN50I_A100_CCU=y
+CONFIG_SUN50I_A100_R_CCU=y
 # CONFIG_SUN50I_H6_CCU is not set
 # CONFIG_SUN50I_H6_R_CCU is not set
 # CONFIG_SUN8I_A83T_CCU is not set
@@ -3895,6 +3982,8 @@ CONFIG_EXTCON=y
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
 CONFIG_IIO_BUFFER_CB=m
+# CONFIG_IIO_BUFFER_DMA is not set
+# CONFIG_IIO_BUFFER_DMAENGINE is not set
 CONFIG_IIO_BUFFER_HW_CONSUMER=m
 CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO_TRIGGERED_BUFFER=m
@@ -3903,6 +3992,7 @@ CONFIG_IIO_TRIGGER=y
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 CONFIG_IIO_SW_DEVICE=m
 CONFIG_IIO_SW_TRIGGER=m
+# CONFIG_IIO_TRIGGERED_EVENT is not set
 
 #
 # Accelerometers
@@ -3982,6 +4072,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_CCS811 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_PMS7003 is not set
+# CONFIG_SCD30_CORE is not set
 # CONFIG_SENSIRION_SGP30 is not set
 # CONFIG_SPS30 is not set
 # CONFIG_VZ89X is not set
@@ -4068,6 +4159,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AM2315 is not set
 # CONFIG_DHT11 is not set
 # CONFIG_HDC100X is not set
+# CONFIG_HDC2010 is not set
 # CONFIG_HTS221 is not set
 # CONFIG_HTU21 is not set
 # CONFIG_SI7005 is not set
@@ -4080,6 +4172,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_BMI160_I2C is not set
 # CONFIG_FXOS8700_I2C is not set
 # CONFIG_KMX61 is not set
+# CONFIG_INV_ICM42600_I2C is not set
 CONFIG_INV_MPU6050_IIO=m
 CONFIG_INV_MPU6050_I2C=m
 # CONFIG_IIO_ST_LSM6DSX is not set
@@ -4094,6 +4187,7 @@ CONFIG_INV_MPU6050_I2C=m
 # CONFIG_AL3320A is not set
 # CONFIG_APDS9300 is not set
 # CONFIG_APDS9960 is not set
+# CONFIG_AS73211 is not set
 # CONFIG_BH1750 is not set
 # CONFIG_BH1780 is not set
 # CONFIG_CM32181 is not set
@@ -4249,7 +4343,6 @@ CONFIG_IIO_SYSFS_TRIGGER=m
 
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
-# CONFIG_PWM_DEBUG is not set
 # CONFIG_PWM_FSL_FTM is not set
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_SUN4I=y
@@ -4281,6 +4374,7 @@ CONFIG_RESET_SUNXI=y
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
 # CONFIG_PHY_XGENE is not set
+# CONFIG_USB_LGM_PHY is not set
 CONFIG_PHY_SUN4I_USB=y
 CONFIG_PHY_SUN6I_MIPI_DPHY=y
 # CONFIG_PHY_SUN9I_USB is not set
@@ -4309,6 +4403,7 @@ CONFIG_ARM_CCI_PMU=y
 CONFIG_ARM_CCI400_PMU=y
 # CONFIG_ARM_CCI5xx_PMU is not set
 # CONFIG_ARM_CCN is not set
+# CONFIG_ARM_CMN is not set
 CONFIG_ARM_PMU=y
 # CONFIG_ARM_DSU_PMU is not set
 # CONFIG_ARM_SPE_PMU is not set
@@ -4319,7 +4414,11 @@ CONFIG_ARM_PMU=y
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
+CONFIG_ANDROID_BINDER_IPC_SELFTEST=y
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
@@ -4364,18 +4463,30 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_SUPPORT_V4=y
+# CONFIG_XFS_QUOTA is not set
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_NILFS2_FS is not set
+CONFIG_BTRFS_FS=y
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
 CONFIG_F2FS_FS=y
 CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
 CONFIG_F2FS_CHECK_FS=y
-# CONFIG_F2FS_IO_TRACE is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
 CONFIG_F2FS_FS_COMPRESSION=y
 CONFIG_F2FS_FS_LZO=y
@@ -4447,6 +4558,7 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
+# CONFIG_TMPFS_INODE64 is not set
 # CONFIG_HUGETLBFS is not set
 CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
@@ -4580,6 +4692,7 @@ CONFIG_INIT_STACK_NONE=y
 # end of Kernel hardening options
 # end of Security options
 
+CONFIG_XOR_BLOCKS=y
 CONFIG_CRYPTO=y
 
 #
@@ -4605,14 +4718,14 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_TEST is not set
-CONFIG_CRYPTO_SIMD=y
+CONFIG_CRYPTO_SIMD=m
 CONFIG_CRYPTO_ENGINE=m
 
 #
@@ -4623,6 +4736,7 @@ CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECRDSA is not set
+# CONFIG_CRYPTO_SM2 is not set
 CONFIG_CRYPTO_CURVE25519=m
 
 #
@@ -4664,8 +4778,8 @@ CONFIG_CRYPTO_HMAC=y
 #
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=y
-# CONFIG_CRYPTO_XXHASH is not set
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_XXHASH=y
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_GHASH=m
@@ -4732,7 +4846,9 @@ CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_CRYPTO_USER_API_RNG=m
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
 CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
 
@@ -4743,14 +4859,14 @@ CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
 CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
 CONFIG_CRYPTO_LIB_CHACHA=m
 CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
 CONFIG_CRYPTO_LIB_CURVE25519=m
 CONFIG_CRYPTO_LIB_DES=m
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
 CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
 CONFIG_CRYPTO_LIB_POLY1305=m
 CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
@@ -4760,6 +4876,9 @@ CONFIG_CRYPTO_DEV_ALLWINNER=y
 # CONFIG_CRYPTO_DEV_SUN4I_SS is not set
 CONFIG_CRYPTO_DEV_SUN8I_CE=m
 # CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG is not set
+# CONFIG_CRYPTO_DEV_SUN8I_CE_HASH is not set
+# CONFIG_CRYPTO_DEV_SUN8I_CE_PRNG is not set
+# CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG is not set
 # CONFIG_CRYPTO_DEV_SUN8I_SS is not set
 # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
 # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
@@ -4786,11 +4905,11 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 # end of Certificates for signature checking
 
-CONFIG_BINARY_PRINTF=y
-
 #
 # Library routines
 #
+CONFIG_RAID6_PQ=y
+# CONFIG_RAID6_PQ_BENCHMARK is not set
 CONFIG_LINEAR_RANGES=y
 # CONFIG_PACKING is not set
 CONFIG_BITREVERSE=y
@@ -4798,7 +4917,7 @@ CONFIG_HAVE_ARCH_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
-CONFIG_CORDIC=y
+# CONFIG_CORDIC is not set
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
@@ -4832,7 +4951,7 @@ CONFIG_LZ4_COMPRESS=y
 CONFIG_LZ4_DECOMPRESS=y
 CONFIG_ZSTD_COMPRESS=y
 CONFIG_ZSTD_DECOMPRESS=y
-CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC=m
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
 CONFIG_XZ_DEC_IA64=y
@@ -4841,13 +4960,12 @@ CONFIG_XZ_DEC_ARMTHUMB=y
 CONFIG_XZ_DEC_SPARC=y
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_INTERVAL_TREE=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_DMA=y
+CONFIG_DMA_OPS=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
@@ -4863,6 +4981,7 @@ CONFIG_DMA_COHERENT_POOL=y
 CONFIG_DMA_REMAP=y
 CONFIG_DMA_DIRECT_REMAP=y
 CONFIG_DMA_CMA=y
+# CONFIG_DMA_PERNUMA_CMA is not set
 
 #
 # Default contiguous memory area size:
@@ -4877,8 +4996,6 @@ CONFIG_CMA_ALIGNMENT=8
 CONFIG_SGL_ALLOC=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
 CONFIG_NLATTR=y
 CONFIG_CLZ_TAB=y
 # CONFIG_IRQ_POLL is not set
@@ -4887,11 +5004,13 @@ CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
 CONFIG_FONT_SUPPORT=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 CONFIG_SG_POOL=y
+CONFIG_ARCH_STACKWALK=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set
 # end of Library routines
@@ -4908,9 +5027,8 @@ CONFIG_SBITMAP=y
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=7
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DYNAMIC_DEBUG_CORE is not set
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_DEBUG_CORE=y
 CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options
@@ -4918,17 +5036,14 @@ CONFIG_DEBUG_BUGVERBOSE=y
 #
 # Compile-time checks and compiler options
 #
-# CONFIG_DEBUG_INFO is not set
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
 # CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
 # CONFIG_HEADERS_INSTALL is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # end of Compile-time checks and compiler options
 
 #
@@ -4939,73 +5054,52 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
 CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
 CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_UBSAN is not set
 # end of Generic Kernel Debugging Instruments
 
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
+# CONFIG_DEBUG_KERNEL is not set
 
 #
 # Memory Debugging
 #
 # CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 CONFIG_ARCH_HAS_DEBUG_WX=y
 # CONFIG_DEBUG_WX is not set
 CONFIG_GENERIC_PTDUMP=y
-# CONFIG_PTDUMP_DEBUGFS is not set
-# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_SCHED_STACK_END_CHECK is not set
 CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
-# CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_VM_PGTABLE is not set
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 # CONFIG_KASAN is not set
-CONFIG_KASAN_STACK=1
 # end of Memory Debugging
 
-# CONFIG_DEBUG_SHIRQ is not set
-
 #
 # Debug Oops, Lockups and Hangs
 #
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
-# CONFIG_SOFTLOCKUP_DETECTOR is not set
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=1
-CONFIG_WQ_WATCHDOG=y
 # CONFIG_TEST_LOCKUP is not set
 # end of Debug Oops, Lockups and Hangs
 
 #
 # Scheduler Debugging
 #
-CONFIG_SCHED_DEBUG=y
 CONFIG_SCHED_INFO=y
-# CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging
 
 # CONFIG_DEBUG_TIMEKEEPING is not set
@@ -5014,52 +5108,25 @@ CONFIG_SCHED_INFO=y
 # Lock Debugging (spinlocks, mutexes, etc...)
 #
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # end of Lock Debugging (spinlocks, mutexes, etc...)
 
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
 CONFIG_HAVE_DEBUG_BUGVERBOSE=y
 
 #
 # Debug kernel data structures
 #
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # end of Debug kernel data structures
 
-# CONFIG_DEBUG_CREDENTIALS is not set
-
 #
 # RCU Debugging
 #
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
 # end of RCU Debugging
 
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -5067,44 +5134,8 @@ CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_BOOTTIME_TRACING=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_SYNTH_EVENTS is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACE_EVENT_INJECT is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_FTRACE is not set
 # CONFIG_SAMPLES is not set
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 # CONFIG_STRICT_DEVMEM is not set
@@ -5121,8 +5152,6 @@ CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 # Kernel Testing and Coverage
 #
 # CONFIG_KUNIT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 8ec4c4e13b93..56d1028beb6d 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -1,15 +1,15 @@
 # Template file for 'pinephone-kernel'
 pkgname=pinephone-kernel
-version=5.8.10
+version=5.10.12
 revision=1
-_commit=b8647e317c32f64543c32465abb7b4651e6e3199
-wrksrc="linux-${_commit}"
+_tag=orange-pi-5.10-20210130-2109
+wrksrc="linux-${_tag}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="John Sullivan <jsullivan@csumb.edu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
-distfiles="https://github.com/megous/linux/archive/${_commit}.tar.gz"
-checksum=65c154fde37f38334ccd2038765954536f78a504ef4460a3021cb8e33f64de6a
+distfiles="https://github.com/megous/linux/archive/${_tag}.tar.gz"
+checksum=7ef48ee91f6b6cfdc74f3dc73753903748bcda3282f1ac6e2ff33d392f6c30ca
 python_version=3
 patch_args="-Np1"
 
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ libressl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"
@@ -41,42 +41,51 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.alias.bin
  /usr/lib/modules/${_kernver}/modules.devname"
 
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+if [ "$CROSS_BUILD" ]; then
+	_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+fi
+if [ "${_patchver}" ]; then
+	_version="EXTRAVERSION=${_patchver}"
+fi
+
 do_configure() {
-	# 5.8 misses Documentation/DocBook. We ship the directory from 4.12 here.
-	cp -a $FILESDIR/DocBook -t Documentation
+	local arch=arm64
 
-	local arch _args
-	arch=arm64
+	# 5.10 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	cp -a $FILESDIR/DocBook -t Documentation
 
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	if [ -f ${FILESDIR}/pinephone-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for pinephone, using it.\n"
+		cp -f ${FILESDIR}/pinephone-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_cross} oldconfig
+	elif [ -f ${FILESDIR}/pinephone-dotconfig ]; then
+		msg_normal "Detected a .config file for pinephone, using it.\n"
+		cp -f $FILESDIR/pinephone-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_cross} oldconfig
+	else
+		msg_normal "Defaulting to 'pinephone_defconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_cross} pinephone_defconfig
 	fi
 
-	cp $FILESDIR/config .config || make ARCH=$arch $_args pinephone_defconfig
-
 	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
 	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
 }
 
 do_build() {
-	local arch _cross _args
-	_args="Image modules dtbs"
-	arch=arm64
+	local arch=arm64
 
-	if [ "$CROSS_BUILD" ]; then
-		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-	if [ "${_patchver}" ]; then
-		_version="EXTRAVERSION=${_patchver}"
-	fi
 	export LDFLAGS=
 	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} Image modules dtbs
 }
 
 do_install() {
-	local arch subarch _args hdrdest
-	arch=arm64
+	local arch=arm64 subarch _args hdrdest
 
 	# Run depmod after compressing modules.
 	sed -i '2iexit 0' scripts/depmod.sh

From cc7c5687297570fa944cee894c16b7da9699aed9 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Mon, 1 Feb 2021 15:03:30 +0100
Subject: [PATCH 0899/3482] kid3: update to 3.8.5, remove unused shlibs

---
 common/shlibs         | 2 --
 srcpkgs/kid3/template | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dd8a7019ee39..b9fec683dea7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3461,8 +3461,6 @@ libfifechan_opengl.so.0.1.5 fifechan-0.1.5_1
 libpolyclipping.so.22 clipper-6.4.2_1
 libSoapySDR.so.0.7 SoapySDR-0.7.0_1
 libeditorconfig.so.0 editorconfig-0.12.2_1
-libkid3-core.so.3.8.4 kid3-3.8.4_1
-libkid3-gui.so.3.8.4 kid3-3.8.4_1
 libcfitsio.so.9 cfitsio-3.480_1
 libapparmor.so.1 libapparmor-2.12.0_1
 libplacebo.so.72 libplacebo-2.72.0_1
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 074b992774dd..3291fe4b1e81 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,6 +1,6 @@
 # Template file for 'kid3'
 pkgname=kid3
-version=3.8.4
+version=3.8.5
 revision=1
 build_style=cmake
 configure_args="-DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
@@ -17,9 +17,9 @@ depends="desktop-file-utils hicolor-icon-theme"
 short_desc="MP3, Ogg/Vorbis and FLAC tag editor"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-only"
-homepage="https://kid3.sourceforge.io"
+homepage="https://kid3.kde.org"
 distfiles="${SOURCEFORGE_SITE}/kid3/kid3-${version}.tar.gz"
-checksum=598b843aa32ed9530ebfa9a45424579e622714447f0d67cf36a62e693277bc07
+checksum=0c467927541e9dd8172758016778742f0b154cb2f5bcfce727b35cfbdee3141f
 
 build_options="KDE mp3 mp4 flac vorbis taglib chromaprint"
 build_options_default="mp3 mp4 flac vorbis taglib chromaprint"

From e5752696b057b33821616904d5e10e77a72e6724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Feb 2021 20:54:01 +0100
Subject: [PATCH 0900/3482] quake4: requires tar; adopt; xlintify

---
 srcpkgs/quake4/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/quake4/template b/srcpkgs/quake4/template
index 66e721be9ae2..5987e41d3a80 100644
--- a/srcpkgs/quake4/template
+++ b/srcpkgs/quake4/template
@@ -2,14 +2,15 @@
 pkgname=quake4
 version=1.4.2
 revision=3
+hostmakedepends="tar"
 depends="SDL libXext virtual?libudev zlib desktop-file-utils"
 short_desc="Quake 4 for Linux"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Propietary"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="custom: propietary"
 homepage="http://www.quake4game.com/"
-distfiles="http://ftp.iinet.net.au/games/idstuff/quake4/linux/quake4-linux-${version}.x86.run"
-skip_extraction="quake4-linux-${version}.x86.run"
+distfiles="http://sources.voidlinux.de/${pkgname}-${version}/quake4-linux-${version}.x86.run"
 checksum=9203b387b1a4075a1b9ad1eb7be32b49a88141a448d9330d9cbe1f40a145bd6a
+skip_extraction="quake4-linux-${version}.x86.run"
 
 # 32bit package for x86_64 built on x86 :-)
 archs="i686"

From 3fe23c8da2658b2b2c57e75d733f7c34b9ce5252 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Feb 2021 14:45:35 -0500
Subject: [PATCH 0901/3482] python3-parso: update to 0.8.1.

---
 srcpkgs/python3-parso/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-parso/template b/srcpkgs/python3-parso/template
index cb2c8e20105c..bdca7f917155 100644
--- a/srcpkgs/python3-parso/template
+++ b/srcpkgs/python3-parso/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-parso'
 pkgname=python3-parso
-reverts="0.8.0_1"
-version=0.7.1
-revision=2
+version=0.8.1
+revision=1
 wrksrc="parso-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Python parser (Python 3)"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/davidhalter/parso"
 distfiles="${PYPI_SITE}/p/parso/parso-${version}.tar.gz"
-checksum=caba44724b994a8a5e086460bb212abc5a8bc46951bf4a9a1210745953622eb9
+checksum=8519430ad07087d4c997fda3a7918f7cfa27cb58972a8c89c2a0295a1c940e9e
 
 post_install() {
 	vlicense LICENSE.txt

From 0c2c5168840d153927857040f46ecb9d8af3db54 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Feb 2021 14:46:02 -0500
Subject: [PATCH 0902/3482] python3-jedi: update to 0.18.0.

---
 srcpkgs/python3-jedi/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-jedi/template b/srcpkgs/python3-jedi/template
index 0adda2c40caf..728ff3a36694 100644
--- a/srcpkgs/python3-jedi/template
+++ b/srcpkgs/python3-jedi/template
@@ -1,18 +1,22 @@
 # Template file for 'python3-jedi'
 pkgname=python3-jedi
-version=0.17.2
-revision=4
+version=0.18.0
+revision=1
 wrksrc="jedi-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-parso"
-checkdepends="python3-parso python3-pytest"
+checkdepends="python3-parso python3-pytest python3-docopt"
 short_desc="Autocompletion/static analysis library for Python 3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://jedi.readthedocs.io/"
 distfiles="${PYPI_SITE}/j/jedi/jedi-${version}.tar.gz"
-checksum=86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20
+checksum=92550a404bad8afed881a137ec9a461fed49eca661414be45059329614ed0707
+
+do_check() {
+	PYTHONPATH="$(cd build/lib* && pwd)" python3 ./test/run.py
+}
 
 post_install() {
 	vlicense LICENSE.txt

From 95a2e4effc2693dced516370fed1aa2b33d5ff62 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Feb 2021 14:46:31 -0500
Subject: [PATCH 0903/3482] python3-ipython: update to 7.20.0.

---
 srcpkgs/python3-ipython/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index dfef2b9c2498..21b801f02675 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.19.0
+version=7.20.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,13 +16,9 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=cbb2ef3d5961d44e6a963b9817d4ea4e1fa2eb589c371a470fed14d8d40cbd6a
+checksum=1923af00820a8cf58e91d56b89efc59780a6e81363b94464a0f17c039dffff9e
 conflicts="python-ipython<=5.8.0_2"
 
-do_check() {
-	pytest
-}
-
 post_install() {
 	# remove iptest
 	rm -f ${DESTDIR}/usr/bin/iptest*

From 59b719e7786178872556b45b5cfda653546aebc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Feb 2021 22:37:11 +0100
Subject: [PATCH 0904/3482] cavestory: update to 1.2; add x86_64

The update to 1.2 contains binaries for 32 and 64 bits. There is no license file.
The page https://www.cavestory.org/game-info/game-releases.php
says 'Cave Story (Freeware)' and so copy that text and a link to
the web page to a LICENSE file to satisfy xlint.
---
 srcpkgs/cavestory/files/cavestory |  2 +-
 srcpkgs/cavestory/template        | 32 +++++++++++++++++--------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/cavestory/files/cavestory b/srcpkgs/cavestory/files/cavestory
index 930cc3ce5f9f..2c8c339baa93 100755
--- a/srcpkgs/cavestory/files/cavestory
+++ b/srcpkgs/cavestory/files/cavestory
@@ -1,3 +1,3 @@
 #!/bin/sh
-cd /usr/share/cavestory
+cd /usr/libexec/cavestory
 exec ./doukutsu.bin "$@"
diff --git a/srcpkgs/cavestory/template b/srcpkgs/cavestory/template
index ed3665b197ae..52d06a0e51d6 100644
--- a/srcpkgs/cavestory/template
+++ b/srcpkgs/cavestory/template
@@ -1,26 +1,30 @@
 # Template file for 'cavestory'
 pkgname=cavestory
-version=1.01
-revision=3
-wrksrc=linuxDoukutsu-${version}
-archs="i686"
-lib32mode=full
-repository=nonfree
-short_desc="A Japanese side-scrolling platformer game"
+version=1.2
+revision=1
+archs="x86_64 i686"
+wrksrc=linuxDoukutsu-1.01
+short_desc="Japanese side-scrolling platformer game"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="Proprietary"
+license="custom: proprietary"
 homepage="http://www.cavestory.org/"
-distfiles="http://www.cavestory.org/downloads/linuxdoukutsu-${version}.tar.bz2"
-checksum=76466fc1b1901ce25e301a4ec8450aced806c9d499d66707d6f7b38efebc24c1
+distfiles="http://www.cavestory.org/downloads/linuxdoukutsu-1.01.tar.bz2
+ http://www.cavestory.org/downloads/linuxDoukutsu-${version}.zip"
+checksum="76466fc1b1901ce25e301a4ec8450aced806c9d499d66707d6f7b38efebc24c1
+ a8711393c86cb6a7c6786883b22aed814f0e819cf935f8b273cb9dc5d58cfc6b"
+repository=nonfree
+nopie=yes
 
 do_install() {
-	vmkdir usr/share/cavestory
-	vcopy Config.dat usr/share/cavestory
-	vcopy data usr/share/cavestory
+	vmkdir usr/libexec/cavestory
+	vcopy Config.dat usr/libexec/cavestory
+	vcopy data usr/libexec/cavestory
 	vdoc doc/readme.txt
 	vdoc doc/configfileformat.txt
-	vcopy doukutsu.bin usr/share/cavestory
+	mv ../linuxDoukutsu-${version}/doukutsu_${XBPS_TARGET_WORDSIZE}bits doukutsu.bin
+	vinstall doukutsu.bin 755 usr/libexec/cavestory
 	vbin ${FILESDIR}/cavestory
 	vinstall ${FILESDIR}/cavestory.desktop 644 usr/share/applications/
 	vinstall ${FILESDIR}/cavestory.png 644 usr/share/pixmaps/
+	vlicense doc/readme.txt
 }

From ad39e5aed4d2ac952c081c32f763f8fafe030524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Feb 2021 23:02:48 +0100
Subject: [PATCH 0905/3482] cavestory: forgot to commit the LICENSE change

---
 srcpkgs/cavestory/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cavestory/template b/srcpkgs/cavestory/template
index 52d06a0e51d6..b08211e1419a 100644
--- a/srcpkgs/cavestory/template
+++ b/srcpkgs/cavestory/template
@@ -1,7 +1,7 @@
 # Template file for 'cavestory'
 pkgname=cavestory
 version=1.2
-revision=1
+revision=2
 archs="x86_64 i686"
 wrksrc=linuxDoukutsu-1.01
 short_desc="Japanese side-scrolling platformer game"
@@ -26,5 +26,9 @@ do_install() {
 	vbin ${FILESDIR}/cavestory
 	vinstall ${FILESDIR}/cavestory.desktop 644 usr/share/applications/
 	vinstall ${FILESDIR}/cavestory.png 644 usr/share/pixmaps/
-	vlicense doc/readme.txt
+	cat >LICENSE <<EOF
+Cave Story (Freeware)
+See: https://www.cavestory.org/game-info/game-releases.php
+EOF
+	vlicense LICENSE
 }

From 942afb9424437a51d623e5731294a75daa9d80cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Feb 2021 23:04:24 +0100
Subject: [PATCH 0906/3482] gens-gs: remove

---
 srcpkgs/gens-gs/patches/gens-gtk.patch | 178 -------------------------
 srcpkgs/gens-gs/template               |  21 ---
 2 files changed, 199 deletions(-)
 delete mode 100644 srcpkgs/gens-gs/patches/gens-gtk.patch
 delete mode 100644 srcpkgs/gens-gs/template

diff --git a/srcpkgs/gens-gs/patches/gens-gtk.patch b/srcpkgs/gens-gs/patches/gens-gtk.patch
deleted file mode 100644
index b33ff85b0177..000000000000
--- a/srcpkgs/gens-gs/patches/gens-gtk.patch
+++ /dev/null
@@ -1,178 +0,0 @@
---- src/gens/ui/gtk/about/about_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ src/gens/ui/gtk/about/about_window.cpp	2010-10-11 15:46:25.000000000 +0000
-@@ -84,7 +84,7 @@
- 	gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE);
-+	g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)about_window, "delete_event",
---- src/gens/ui/gtk/bios_misc_files/bmf_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ src/gens/ui/gtk/bios_misc_files/bmf_window.cpp	2010-10-11 15:33:03.000000000 +0000
-@@ -84,7 +84,7 @@
- 	gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE);
-+	g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)bmf_window, "delete_event",
---- src/gens/ui/gtk/directory_config/dir_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ src/gens/ui/gtk/directory_config/dir_window.cpp	2010-10-11 15:34:21.000000000 +0000
-@@ -109,7 +109,7 @@
- 	gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE);
-+	g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)(dir_window), "delete_event",
---- src/gens/ui/gtk/general_options/genopt_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ src/gens/ui/gtk/general_options/genopt_window.cpp	2010-10-11 15:36:00.000000000 +0000
-@@ -140,7 +140,7 @@
- 	gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(genopt_window), false);
- 	gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false);
-+	g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)genopt_window, "delete_event",
-@@ -458,11 +458,11 @@
- 	gtk_box_pack_start(GTK_BOX(vboxIntroEffect), lblIntroEffect, false, false, 0);
- 	
- 	// Dropdown for intro effect.
--	cboIntroEffect = gtk_combo_box_new_text();
--	gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "None");
--	gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Gens Logo Effect");
--	gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "\"Crazy\" Effect");
--	//gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Genesis TMSS"); // TODO: Broken.
-+	cboIntroEffect = gtk_combo_box_text_new();
-+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "None");
-+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Gens Logo Effect");
-+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "\"Crazy\" Effect");
-+	//gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Genesis TMSS"); // TODO: Broken.
- 	gtk_widget_show(cboIntroEffect);
- 	gtk_box_pack_start(GTK_BOX(vboxIntroEffect), cboIntroEffect, false, false, 0);
- 	g_signal_connect((gpointer)(cboIntroEffect), "changed",
---- src/gens/ui/gtk/gens/gens_window_callbacks.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ src/gens/ui/gtk/gens/gens_window_callbacks.cpp	2010-10-11 15:21:28.000000000 +0000
-@@ -154,9 +154,9 @@
- 	GSFT_UNUSED_PARAMETER(y);
- 	GSFT_UNUSED_PARAMETER(user_data);
- 	
--	if (context->targets)
-+	if (gdk_drag_context_list_targets(context))
- 	{
--		GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0));
-+		GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0));
- 		gtk_drag_get_data(widget, context, target_type, time);
- 		return true;
- 	}
---- src/gens/ui/gtk/opengl_resolution/glres_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ src/gens/ui/gtk/opengl_resolution/glres_window.cpp	2010-10-11 15:46:21.000000000 +0000
-@@ -75,7 +75,7 @@
- 	gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE);
-+	g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)(glres_window), "delete_event",
---- src/gens/ui/gtk/plugin_manager/pmgr_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ src/gens/ui/gtk/plugin_manager/pmgr_window.cpp	2010-10-11 15:46:29.000000000 +0000
-@@ -80,8 +80,7 @@
- // Callbacks.
- static gboolean	pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data);
- static void	pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data);
--static void	pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
--							       guint page_num, gpointer user_data);
-+static void	pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data);
- static void	pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data);
- static void	pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data);
- 
-@@ -119,7 +118,7 @@
- 	gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE);
-+	g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)pmgr_window, "delete_event",
-@@ -559,11 +558,9 @@
-  * @param page_num New notebook page index.
-  * @param user_data User data.
-  */
--static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
--							   guint page_num, gpointer user_data)
-+static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data)
- {
- 	GSFT_UNUSED_PARAMETER(notebook);
--	GSFT_UNUSED_PARAMETER(page);
- 	GSFT_UNUSED_PARAMETER(user_data);
- 	
- 	// Activate the "cursor-changed" callback for the page.
---- src/gens/ui/gtk/select_cdrom/selcd_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ src/gens/ui/gtk/select_cdrom/selcd_window.cpp	2010-10-11 15:46:16.000000000 +0000
-@@ -94,7 +94,7 @@
- 	gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE);
-+	g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)(selcd_window), "delete_event",
-@@ -128,7 +128,7 @@
- 	gtk_box_pack_start(GTK_BOX(hboxDeviceName), lblDeviceName, false, false, 0);
- 	
- 	// Create the dropdown for the CD-ROM device name.
--	cboDeviceName = gtk_combo_box_entry_new_text();
-+	cboDeviceName = gtk_combo_box_text_new_with_entry();
- 	gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(cboDeviceName))), 63);
- 	gtk_label_set_mnemonic_widget(GTK_LABEL(lblDeviceName), cboDeviceName);
- 	gtk_widget_show(cboDeviceName);
-@@ -156,7 +156,7 @@
- 	gtk_box_pack_start(GTK_BOX(hboxDriveSpeed), vboxDriveSpeedDropdown, true, true, 0);
- 	
- 	// Create the dropdown for the CD-ROM drive speed selection.
--	cboDriveSpeed = gtk_combo_box_new_text();
-+	cboDriveSpeed = gtk_combo_box_text_new();
- 	char tmpSpeed[16];
- 	for (unsigned int i = 0; i < ((sizeof(CD_DriveSpeed) / sizeof(CD_DriveSpeed[0])) - 1); i++)
- 	{
-@@ -167,7 +167,7 @@
- 		else
- 			szprintf(tmpSpeed, sizeof(tmpSpeed), "%dx", CD_DriveSpeed[i]);
- 
--		gtk_combo_box_append_text(GTK_COMBO_BOX(cboDriveSpeed), tmpSpeed);
-+		gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDriveSpeed), tmpSpeed);
- 	}
- 	gtk_widget_show(cboDriveSpeed);
- 	gtk_box_pack_start(GTK_BOX(vboxDriveSpeedDropdown), cboDriveSpeed, true, false, 0);
-@@ -252,7 +252,7 @@
- 				continue;
- 			
- 			// Add the device file.
--			gtk_combo_box_append_text(GTK_COMBO_BOX(cboDeviceName), tmpDeviceName);
-+			gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDeviceName), tmpDeviceName);
- 		}
- 	}
- 	
---- src/mdp/misc/game_genie/gg_window_gtk2.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ src/mdp/misc/game_genie/gg_window_gtk2.cpp	2010-10-11 15:52:05.000000000 +0000
-@@ -111,7 +111,7 @@
- 	gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE);
- 	gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE);
-+	g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL);
- 	
- 	// Add the window icon.
- 	GList *icon_list = NULL;
diff --git a/srcpkgs/gens-gs/template b/srcpkgs/gens-gs/template
deleted file mode 100644
index 61004717914a..000000000000
--- a/srcpkgs/gens-gs/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'gens-gs'
-#
-archs="i686"
-lib32mode="full"
-LDFLAGS="-ldl -lX11"
-
-pkgname=gens-gs
-version=2.16.7
-revision=2
-wrksrc="gens-gs-r7"
-build_style=gnu-configure
-configure_args="--with-pic --disable-static"
-hostmakedepends="pkg-config nasm"
-makedepends="gtk+-devel SDL-devel"
-depends="desktop-file-utils"
-short_desc="Sega Genesis/CD/32X emulator combining features from various forks of Gens"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://segaretro.org/Gens/GS"
-distfiles="http://segaretro.org/images/6/6d/Gens-gs-r7.tar.gz"
-checksum=6320cd7bee85472891e1e29b21731d2c8180d04db67ee21256491f3f9ad145c1

From 7c3171e83f3f338ce03330f8e9e1769558787bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Feb 2021 23:04:52 +0100
Subject: [PATCH 0907/3482] removed-packages: add gens-gs

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 03d6c4399a2e..cef8a752e462 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=20
+revision=21
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -35,6 +35,7 @@ replaces="
  epstopdf<=2.27_3
  fontmatrix<=0.6.0.20171228_2
  gegl3<=0.3.28_2
+ gens-gs<=2.16.7_2
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  go1.4-bootstrap<=20171003_2

From 44fceb6149c1e428fafa4f387402c61ac2659197 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 2 Feb 2021 22:02:03 +0100
Subject: [PATCH 0908/3482] dbeaver: update to 7.3.4.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index b7e988016317..553904369bee 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=7.3.3
+version=7.3.4
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=8b4cff6a1e172da763373ddc7df554569f53a0c529175e540d4b64ed2b7066d9
+checksum=1adc7989776955d52afb5f6ff7cf4d027f2a8d7b0522ebacdaf8ece1f51db228
 nopie=true
 
 do_build() {

From 1f629f059c2f7b5814f4cda7d0053684d1a90a50 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Tue, 2 Feb 2021 17:29:45 -0500
Subject: [PATCH 0909/3482] oragono: update to 2.5.1.

---
 srcpkgs/oragono/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
index da7230580421..68a4f5386bc2 100644
--- a/srcpkgs/oragono/template
+++ b/srcpkgs/oragono/template
@@ -1,6 +1,6 @@
 # Template file for 'oragono'
 pkgname=oragono
-version=2.5.0
+version=2.5.1
 revision=1
 build_style=go
 go_import_path="github.com/oragono/oragono"
@@ -10,7 +10,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="MIT"
 homepage="https://oragono.io/"
 distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=b954b20a19a3cfbc0c76febc6277217b275b355e0989edbd6d1a80a1accb6ded
+checksum=1d38f36d73b4f2ffff158dfc47de833111b4c5f25703276a426c0f01618874ac
 conf_files="/etc/oragono.conf"
 system_accounts="_oragono"
 _oragono_homedir="/var/lib/oragono"

From 26940b7a1e7d7f0d4405b08ca782bb8fc897b00b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 01:10:35 +0100
Subject: [PATCH 0910/3482] supertuxkart: import upstream patch to fix build

---
 ...3c9c26da5520f2eaa02f2458971ba07f2aad.patch | 106 ++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 srcpkgs/supertuxkart/patches/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch

diff --git a/srcpkgs/supertuxkart/patches/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch b/srcpkgs/supertuxkart/patches/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch
new file mode 100644
index 000000000000..eee9f9efb549
--- /dev/null
+++ b/srcpkgs/supertuxkart/patches/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch
@@ -0,0 +1,106 @@
+From 61833c9c26da5520f2eaa02f2458971ba07f2aad Mon Sep 17 00:00:00 2001
+From: Benau <Benau@users.noreply.github.com>
+Date: Sun, 29 Nov 2020 12:42:11 +0800
+Subject: [PATCH] Fix compilation with latest SDL
+
+---
+ src/input/gamepad_config.cpp | 55 ++++++++++++++++++------------------
+ 1 file changed, 27 insertions(+), 28 deletions(-)
+
+diff --git src/input/gamepad_config.cpp src/input/gamepad_config.cpp
+index 7c6f632099..c060e7a5a7 100644
+--- src/input/gamepad_config.cpp
++++ src/input/gamepad_config.cpp
+@@ -32,8 +32,7 @@
+ #include "input/sdl_controller.hpp"
+ #include <array>
+ 
+-static_assert(SDL_CONTROLLER_BUTTON_MAX - 1 == SDL_CONTROLLER_BUTTON_DPAD_RIGHT, "non continous name");
+-enum AxisWithDirection
++enum AxisWithDirection : unsigned
+ {
+     SDL_CONTROLLER_AXIS_LEFTX_RIGHT = SDL_CONTROLLER_BUTTON_MAX,
+     SDL_CONTROLLER_AXIS_LEFTX_LEFT,
+@@ -140,56 +139,56 @@ void GamepadConfig::setDefaultBinds ()
+ core::stringw GamepadConfig::getBindingAsString(const PlayerAction action) const
+ {
+ #ifndef SERVER_ONLY
+-    std::array<core::stringw, SDL_CONTROLLER_AXIS_WITH_DIRECTION_AND_BUTTON_MAX> readable =
++    std::map<unsigned, core::stringw> readable =
+     {{
+-        "A", // SDL_CONTROLLER_BUTTON_A
+-        "B", // SDL_CONTROLLER_BUTTON_B
+-        "X", // SDL_CONTROLLER_BUTTON_X
+-        "Y", // SDL_CONTROLLER_BUTTON_Y
++        { SDL_CONTROLLER_BUTTON_A, "A" },
++        { SDL_CONTROLLER_BUTTON_B, "B" },
++        { SDL_CONTROLLER_BUTTON_X, "X" },
++        { SDL_CONTROLLER_BUTTON_Y, "Y" },
+         // I18N: name of buttons on gamepads
+-        _("Back"), // SDL_CONTROLLER_BUTTON_BACK
++        { SDL_CONTROLLER_BUTTON_BACK, _("Back") },
+         // I18N: name of buttons on gamepads
+-        _("Guide"), // SDL_CONTROLLER_BUTTON_GUIDE
++        { SDL_CONTROLLER_BUTTON_GUIDE, _("Guide") },
+         // I18N: name of buttons on gamepads
+-        _("Start"), // SDL_CONTROLLER_BUTTON_START
++        { SDL_CONTROLLER_BUTTON_START, _("Start") },
+         // I18N: name of buttons on gamepads
+-        _("Left thumbstick press"), // SDL_CONTROLLER_BUTTON_LEFTSTICK
++        { SDL_CONTROLLER_BUTTON_LEFTSTICK, _("Left thumbstick press") },
+         // I18N: name of buttons on gamepads
+-        _("Right thumbstick press"), // SDL_CONTROLLER_BUTTON_RIGHTSTICK
++        { SDL_CONTROLLER_BUTTON_RIGHTSTICK, _("Right thumbstick press") },
+         // I18N: name of buttons on gamepads
+-        _("Left shoulder"), // SDL_CONTROLLER_BUTTON_LEFTSHOULDER
++        { SDL_CONTROLLER_BUTTON_LEFTSHOULDER, _("Left shoulder") },
+         // I18N: name of buttons on gamepads
+-        _("Right shoulder"), // SDL_CONTROLLER_BUTTON_RIGHTSHOULDER
++        { SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, _("Right shoulder") },
+         // I18N: name of buttons on gamepads
+-        _("DPad up"), // SDL_CONTROLLER_BUTTON_DPAD_UP
++        { SDL_CONTROLLER_BUTTON_DPAD_UP, _("DPad up") },
+         // I18N: name of buttons on gamepads
+-        _("DPad down"), // SDL_CONTROLLER_BUTTON_DPAD_DOWN
++        { SDL_CONTROLLER_BUTTON_DPAD_DOWN, _("DPad down") },
+         // I18N: name of buttons on gamepads
+-        _("DPad left"), // SDL_CONTROLLER_BUTTON_DPAD_LEFT
++        { SDL_CONTROLLER_BUTTON_DPAD_LEFT, _("DPad left") },
+         // I18N: name of buttons on gamepads
+-        _("DPad right"), // SDL_CONTROLLER_BUTTON_DPAD_RIGHT
++        { SDL_CONTROLLER_BUTTON_DPAD_RIGHT, _("DPad right") },
+ 
+         // Below are extensions after SDL2 header SDL_CONTROLLER_BUTTON_MAX
+         // I18N: name of buttons on gamepads
+-        _("Left thumbstick right"), // SDL_CONTROLLER_AXIS_LEFTX_RIGHT
++        { SDL_CONTROLLER_AXIS_LEFTX_RIGHT, _("Left thumbstick right") },
+         // I18N: name of buttons on gamepads
+-        _("Left thumbstick left"), // SDL_CONTROLLER_AXIS_LEFTX_LEFT
++        { SDL_CONTROLLER_AXIS_LEFTX_LEFT, _("Left thumbstick left") },
+         // I18N: name of buttons on gamepads
+-        _("Left thumbstick down"), // SDL_CONTROLLER_AXIS_LEFTY_DOWN
++        { SDL_CONTROLLER_AXIS_LEFTY_DOWN, _("Left thumbstick down") },
+         // I18N: name of buttons on gamepads
+-        _("Left thumbstick up"), // SDL_CONTROLLER_AXIS_LEFTY_UP
++        { SDL_CONTROLLER_AXIS_LEFTY_UP, _("Left thumbstick up") },
+         // I18N: name of buttons on gamepads
+-        _("Right thumbstick right"), // SDL_CONTROLLER_AXIS_RIGHTX_RIGHT
++        { SDL_CONTROLLER_AXIS_RIGHTX_RIGHT, _("Right thumbstick right") },
+         // I18N: name of buttons on gamepads
+-        _("Right thumbstick left"), // SDL_CONTROLLER_AXIS_RIGHTX_LEFT
++        { SDL_CONTROLLER_AXIS_RIGHTX_LEFT, _("Right thumbstick left") },
+         // I18N: name of buttons on gamepads
+-        _("Right thumbstick down"), // SDL_CONTROLLER_AXIS_RIGHTY_DOWN
++        { SDL_CONTROLLER_AXIS_RIGHTY_DOWN, _("Right thumbstick down") },
+         // I18N: name of buttons on gamepads
+-        _("Right thumbstick up"), // SDL_CONTROLLER_AXIS_RIGHTY_UP
++        { SDL_CONTROLLER_AXIS_RIGHTY_UP, _("Right thumbstick up") },
+         // I18N: name of buttons on gamepads
+-        _("Left trigger"), // SDL_CONTROLLER_AXIS_TRIGGERLEFT_UP
++        { SDL_CONTROLLER_AXIS_TRIGGERLEFT_UP, _("Left trigger") },
+         // I18N: name of buttons on gamepads
+-        _("Right trigger") // SDL_CONTROLLER_AXIS_TRIGGERRIGHT_UP
++        { SDL_CONTROLLER_AXIS_TRIGGERRIGHT_UP, _("Right trigger") }
+     }};
+ 
+     const Binding &b = getBinding(action);

From 0c8e1652a827f0b74324df4cf76bc8853fe9a669 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:56:23 -0600
Subject: [PATCH 0911/3482] gst-libav: update to 1.18.3.

---
 srcpkgs/gst-libav/template | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index 715637e6d994..bfb62ea021ec 100644
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-libav'
 pkgname=gst-libav
-version=1.16.2
+version=1.18.3
 revision=1
 wrksrc="${pkgname}-${version}"
 build_style=meson
@@ -12,18 +12,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2
+checksum=ad20546bcd78ac1e7cf194666d73c4f33efeb62647d2b6af22993b540699e91c
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) # Required by musl for M_SQRT1_2
 		CFLAGS="-D_XOPEN_SOURCE"
 		;;
 esac
-
-post_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64-musl) # compiling with -O3 triggers a gcc bug
-			sed -i 's/-O3/-O2/g' gst-libs/ext/libav/config.mak
-			;;
-	esac
-}

From f676b59ad591f7c3fff7c69a75296048af488626 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 13:59:27 -0600
Subject: [PATCH 0912/3482] gst-omx: update to 1.18.3, drop rpi option.

rpi is broken and seems sketchy quality-wise.
---
 srcpkgs/gst-omx/template | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template
index 2a77a4a8e277..8646c3c87ae6 100644
--- a/srcpkgs/gst-omx/template
+++ b/srcpkgs/gst-omx/template
@@ -1,28 +1,14 @@
 # Template file for 'gst-omx'
 pkgname=gst-omx
-version=1.16.2
-revision=2
-build_style=gnu-configure
-configure_args="--disable-examples
- $(vopt_if rpi --with-omx-target=rpi --with-omx-target=generic)"
-hostmakedepends="pkg-config python glib-devel"
+version=1.18.3
+revision=1
+build_style=meson
+configure_args="-Dexamples=disabled -Dtarget=generic"
+hostmakedepends="pkg-config python3 glib-devel"
 makedepends="gst-plugins-base1-devel"
 short_desc="GStreamer OpenMAX IL wrapper plugin (1.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=11ed411a2eba75610d72331eeb14ff05e2df28f4fd05cb69225a88bec6d27439
-
-build_options="rpi"
-
-case "$XBPS_TARGET_MACHINE" in
-	armv[67]*) build_options_default="rpi" ;;
-esac
-
-if [ "$build_option_rpi" ]; then
-	makedepends+=" rpi-firmware rpi-userland-devel"
-	export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/opt/vc/lib/pkgconfig"
-	CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include/IL"
-	LDFLAGS="-Wl,-rpath=/opt/vc/lib"
-fi
+checksum=ed0f26504e9a60e15055134410f156e40952336410f2a59bdbbda45e61e8b93f

From 154b1515d09d4337c6b7b108ead275bbc36725aa Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 14:01:55 -0600
Subject: [PATCH 0913/3482] gstreamer-vaapi: update to 1.18.3.

---
 srcpkgs/gstreamer-vaapi/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template
index 3c3ed86673ae..cb0a2596d8c9 100644
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@@ -1,14 +1,20 @@
 # Template file for 'gstreamer-vaapi'
 pkgname=gstreamer-vaapi
-version=1.16.2
+version=1.18.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libXrandr-devel libva-devel MesaLib-devel gst-plugins-bad1-devel"
+checkdepends="$makedepends"
 short_desc="VA-API plugins for GStreamer 1.x"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 changelog="https://raw.githubusercontent.com/GStreamer/gstreamer-vaapi/master/ChangeLog"
 distfiles="${homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"
-checksum=191de7b0ab64a85dd0875c990721e7be95518f60e2a9106beca162004ed7c601
+checksum=ae9877f15757a661d4dfe6a09755a2faa959ab60752f14ca26b7ff10765e1f12
+
+pre_check() {
+	# Seems to need certain hardware to pass
+	vsed -i '/vaapipostproc/d' tests/check/meson.build
+}

From 08d4236fd94cbd4ecff786ba50391126d65a7f00 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 14:09:41 -0600
Subject: [PATCH 0914/3482] gst1-python3: update to 1.18.3.

---
 srcpkgs/gst1-python/template                  | 19 ++++++-------------
 srcpkgs/gst1-python3/patches/python-3.8.patch | 11 -----------
 srcpkgs/gst1-python3/template                 |  7 +++----
 3 files changed, 9 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/gst1-python3/patches/python-3.8.patch

diff --git a/srcpkgs/gst1-python/template b/srcpkgs/gst1-python/template
index 7242b212a37b..13a967a17039 100644
--- a/srcpkgs/gst1-python/template
+++ b/srcpkgs/gst1-python/template
@@ -1,23 +1,16 @@
 # Template file for 'gst1-python'
 pkgname=gst1-python
-version=1.16.2
+version=1.18.3
 revision=1
 wrksrc="gst-python-${version}"
-build_style=gnu-configure
-configure_args="--disable-static"
-pycompile_module="gi/overrides"
+build_style=meson
 hostmakedepends="pkg-config python"
-makedepends="libglib-devel python-gobject-devel gst-plugins-base1-devel"
-depends="python-gobject"
+makedepends="libglib-devel python3-gobject-devel gst-plugins-base1-devel"
+depends="python3-gobject"
+checkdepends="$depends"
 short_desc="Python bindings for GStreamer 1.x"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=208df3148d73d9f416d016564737585d8ea763d91201732d44b5fe688c6288a8
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		sed -i -e "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure
-	fi
-}
+checksum=4e630735276e08ff4d70337aa5d91fd008e5f1ed3dc0993674cd5820e264259a
diff --git a/srcpkgs/gst1-python3/patches/python-3.8.patch b/srcpkgs/gst1-python3/patches/python-3.8.patch
deleted file mode 100644
index cbf1a58ea51b..000000000000
--- a/srcpkgs/gst1-python3/patches/python-3.8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- meson.build
-+++ meson.build
-@@ -24,7 +24,7 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d
- 
- pymod = import('python')
- python = pymod.find_installation(get_option('python'))
--python_dep = python.dependency(required : true)
-+python_dep = dependency('python3-embed', required : true)
- 
- python_abi_flags = python.get_variable('ABIFLAGS', '')
- pylib_loc = get_option('libpython-dir')
diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index 402018c0476b..8232e307b805 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,10 +1,9 @@
 # Template file for 'gst1-python3'
 pkgname=gst1-python3
-version=1.16.2
-revision=3
+version=1.18.3
+revision=1
 wrksrc="gst-python-${version}"
 build_style=meson
-pycompile_module="gi/overrides"
 hostmakedepends="pkg-config python3"
 makedepends="libglib-devel python3-devel python3-gobject-devel gst-plugins-base1-devel"
 depends="python3-gobject"
@@ -13,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=208df3148d73d9f416d016564737585d8ea763d91201732d44b5fe688c6288a8
+checksum=4e630735276e08ff4d70337aa5d91fd008e5f1ed3dc0993674cd5820e264259a

From 9b5b0dce40e6b1dcc8666a3ff91cea2954ae3778 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 14:26:13 -0600
Subject: [PATCH 0915/3482] gst1-editing-services: update to 1.18.3.

---
 srcpkgs/gst1-editing-services/template | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index a23f876d84b5..89be86fa2383 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -1,8 +1,8 @@
 # Template file for 'gst1-editing-services'
 pkgname=gst1-editing-services
-version=1.16.2
+version=1.18.3
 revision=1
-wrksrc="${pkgname/gst1/gstreamer}-${version}"
+wrksrc="${pkgname/gst1/gst}-${version}"
 build_style=meson
 build_helper="gir"
 configure_args="-Dgtk_doc=disabled"
@@ -12,16 +12,19 @@ short_desc="GStreamer 1.x Editing Services"
 maintainer="Toyam Cox <Vaelatern@gmail.com>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
-distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gstreamer}-${version}.tar.xz"
-checksum=0e06a6191a0c6c16e16272bf2573cecaeb245f10629486ad940a299bef700c16
-python_version=2 #unverified
+distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gst}-${version}.tar.xz"
+checksum=8ae139b13b1646a20ba63b0b90877d35813e24cd87642d325e751fc7cb175e20
+
+do_check() {
+	: # Tests fail in older versions as well
+}
 
 gst1-editing-services-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 	}
 }

From 7165305f5e8343bd3ecd4ea6e2e9cfa8115a4f60 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:46:22 -0600
Subject: [PATCH 0916/3482] gst-plugins-bad1: update to 1.18.3.

---
 .../patches/no-gir-automagic.patch            | 24 ++++++++--
 ...an-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch | 48 -------------------
 srcpkgs/gst-plugins-bad1/template             | 12 +++--
 3 files changed, 27 insertions(+), 57 deletions(-)
 delete mode 100644 srcpkgs/gst-plugins-bad1/patches/vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch

diff --git a/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch b/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
index 68c74ee18e5d..38cc2f5edc11 100644
--- a/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
+++ b/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
@@ -1,11 +1,25 @@
---- meson.build	2019-06-09 12:56:31.309473261 +0200
-+++ meson.build	2019-06-09 12:56:46.166649265 +0200
-@@ -405,7 +405,7 @@
+From d4cba6b214ff9a631cdfb845c07101f97510abff Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sun, 15 Nov 2020 10:33:52 -0600
+Subject: [PATCH] no-gir-automatic
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git meson.build meson.build
+index 5d52ea9..4b2b5ea 100644
+--- meson.build
++++ meson.build
+@@ -445,7 +445,7 @@ python3 = import('python').find_installation()
  
  gir = find_program('g-ir-scanner', required : get_option('introspection'))
  gnome = import('gnome')
--build_gir = gir.found() and not meson.is_cross_build()
-+build_gir = gir.found()
+-build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
++build_gir = gir.found() or get_option('introspection').enabled()
  gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
      'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
      'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \
+-- 
+2.29.2
+
diff --git a/srcpkgs/gst-plugins-bad1/patches/vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch b/srcpkgs/gst-plugins-bad1/patches/vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch
deleted file mode 100644
index 30271438d8ee..000000000000
--- a/srcpkgs/gst-plugins-bad1/patches/vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-uptream: yes (master)
-
-From 29bf8d8528ec694f65c8fae310adac996322cc74 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@ltnglobal.com>
-Date: Sat, 9 May 2020 19:59:46 +0200
-Subject: [PATCH] vulkan: Drop use of VK_RESULT_BEGIN_RANGE
-
-This was removed in Vulkan 1.2.140.
-
-> Shortly after 2020-04-24, we will be removing the automatically
-> generated `VK_*_BEGIN_RANGE`, `VK_*_END_RANGE`, and `VK_*_RANGE_SIZE`
-> tokens from the Vulkan headers. These tokens are currently defined for
-> some enumerated types, but are explicitly not part of the Vulkan API.
-> They existed only to support some Vulkan implementation internals,
-> which no longer require them. We will be accepting comments on this
-> topic in [#1230], but we strongly suggest any external projects using
-> these tokens immediately migrate away from them.
-
-[#1230]: https://github.com/KhronosGroup/Vulkan-Docs/issues/1230
----
- ext/vulkan/vkerror.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/ext/vulkan/vkerror.c b/ext/vulkan/vkerror.c
-index 3fec27e4d..c91589d9b 100644
---- ext/vulkan/vkerror.c
-+++ ext/vulkan/vkerror.c
-@@ -27,7 +27,7 @@
- #include "vkerror.h"
- 
- /* *INDENT-OFF* */
--static const struct 
-+static const struct
- {
-   VkResult result;
-   const char *str;
-@@ -63,8 +63,6 @@ _vk_result_to_string (VkResult result)
- 
-   if (result >= 0)
-     return NULL;
--  if (result < VK_RESULT_BEGIN_RANGE)
--    return "Unknown Error";
- 
-   for (i = 0; i < G_N_ELEMENTS (vk_result_string_map); i++) {
-     if (result == vk_result_string_map[i].result)
--- 
-2.26.2
-
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 212203c24a14..e94d8095e0bc 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
-version=1.16.2
-revision=10
+version=1.18.3
+revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -15,7 +15,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dwildmidi=disabled -Dwpe=disabled -Ddirectfb=disabled
  -Dgme=$(vopt_if gme enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
-hostmakedepends="automake gettext libtool pkg-config python glib-devel
+hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
 makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
@@ -36,7 +36,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74
+checksum=b7e34b6b86272588fbd8b314dadfa6ceff895198cfb59e2950378e9e31ff22e0
 
 build_options="gir gme"
 build_options_default="gir"
@@ -49,6 +49,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) build_options_default+=" gme" ;;
 esac
 
+do_check() {
+	ninja check || msg_warn "Tests failed, but not unexpected"
+}
+
 gst-plugins-bad1-devel_package() {
 	depends="gst-plugins-base1-devel>=${version} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 774a8c91b683ca0c688cd10afb6b058a1ca7ba5f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:52:30 -0600
Subject: [PATCH 0917/3482] gst-plugins-good1: update to 1.18.3.

---
 srcpkgs/gst-plugins-good1/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index ba326be3f1dc..0a5daa610ee2 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-good1'
 pkgname=gst-plugins-good1
-version=1.16.2
-revision=3
+version=1.18.3
+revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
@@ -23,11 +23,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319
+checksum=9b3b8e05d4d6073bf929fb33e2d8f74dd81ff21fa5b50c3273c78dfa2ab9c5cb
 
 build_options="gtk3"
 build_options_default="gtk3"
 
+do_check() {
+	ninja -C build test || : #Fails on i686
+}
+
 gst-plugins-good1-qt5_package() {
 	short_desc+=" - Qt5 plugins"
 	depends="gst-plugins-good1-${version}_${revision}"

From 8ea188ee649e857e040c0cb581abccb33eae24f0 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:54:53 -0600
Subject: [PATCH 0918/3482] gst-plugins-ugly1: update to 1.18.3.

---
 srcpkgs/gst-plugins-ugly1/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template
index c4661f691380..c5622645e30e 100644
--- a/srcpkgs/gst-plugins-ugly1/template
+++ b/srcpkgs/gst-plugins-ugly1/template
@@ -1,12 +1,12 @@
 # Template file for 'gst-plugins-ugly1'
 pkgname=gst-plugins-ugly1
-version=1.16.2
-revision=2
+version=1.18.3
+revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 configure_args="-Damrnb=disabled -Damrwbdec=disabled -Dsidplay=disabled"
 # XXX add required pkgs for the amr, sid plugins.
-hostmakedepends="pkg-config intltool python"
+hostmakedepends="pkg-config intltool python3"
 makedepends="glib-devel libxml2-devel gst-plugins-base1-devel
  libcdio-devel libdvdread-devel libmad-devel x264-devel mpg123-devel
  orc-devel liba52-devel libmpeg2-devel lame-devel"
@@ -16,5 +16,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca
+checksum=70f7429b25dd2f714eb18e80af61b1363b1f63019e16cd28e086e3a619eaa992
 lib32disabled=yes

From ab54c093c44fd4db31080a79b66f522eed99092c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:31:16 -0600
Subject: [PATCH 0919/3482] gst-plugins-base1: update to 1.18.3.

Removed sndio patch due to upstream
---
 .../patches/no-gir-automagic.patch            | 24 ++++++++++++----
 srcpkgs/gst-plugins-base1/template            | 28 ++++++++++++++-----
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch b/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
index f1226041ae64..36483a10e065 100644
--- a/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
+++ b/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
@@ -1,11 +1,25 @@
---- meson.build	2019-06-09 10:53:06.607859182 +0200
-+++ meson.build	2019-06-09 10:53:24.953088389 +0200
-@@ -356,7 +356,7 @@
+From 0d734eb2314fc60deee59de5f1440617e04e5125 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sun, 15 Nov 2020 10:25:30 -0600
+Subject: [PATCH] no-gir-automatic
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git meson.build meson.build
+index 5ecce7f..98f8113 100644
+--- meson.build
++++ meson.build
+@@ -416,7 +416,7 @@ endif
  
  gir = find_program('g-ir-scanner', required : get_option('introspection'))
  gnome = import('gnome')
--build_gir = gir.found() and not meson.is_cross_build()
-+build_gir = gir.found()
+-build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
++build_gir = gir.found() or get_option('introspection').enabled()
  gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
      'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
      'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
+-- 
+2.29.2
+
diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index eb05c1c2fa36..f5065d2ea036 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-base1'
 pkgname=gst-plugins-base1
-version=1.16.2
-revision=2
+version=1.18.3
+revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 build_helper="gir"
@@ -16,27 +16,41 @@ makedepends="gstreamer1-devel glib-devel libxml2-devel pango-devel
  libSM-devel orc-devel $(vopt_if cdparanoia libcdparanoia-devel)
  opus-devel MesaLib-devel $(vopt_if sndio sndio-devel) graphene-devel"
 depends="orc>=0.4.18 gstreamer1>=${version}"
+checkdepends="mesa-dri"
 short_desc="GStreamer Base Plug-ins (v1.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a
+checksum=dbfa20283848f0347a223dd8523dfb62e09e5220b21b1d157a8b0c8b67ba9f52
 
-# Package build options
 build_options="cdparanoia gir sndio"
 build_options_default="cdparanoia gir"
-
-# this should not remain in this package in longer term
-# either upstream, separate, or remove
 desc_option_sndio="Enable sndio support (unsupported, known to be problematic)"
 
+# Remove sndio if not upstreamed
+if [ "$build_option_sndio" ]; then
+	msg_warn "sndio is unsupported upstream"
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	mips*)	# XXX: work around assembler "Error: branch out of range"
 		CFLAGS=" -Os"
 		;;
 esac
 
+pre_check() {
+	export XDG_RUNTIME_DIR=/etc/xdg
+	# Fails to get PCI-id in chroot
+	vsed -e '/glimagesink/d' \
+		-e '/gl-launch-lines/d' \
+		-i tests/check/meson.build
+}
+
+do_check() {
+	ninja -C build test || : # Locally checks pass
+}
+
 gst-plugins-base1-devel_package() {
 	depends="gstreamer1-devel>=${version} ${sourcepkg}>=${version}_${revision} orc-devel"
 	short_desc+=" - development files"

From d2b9f1c3489fbdc7caa452fb7d8f395cbcfdded9 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:21:10 -0600
Subject: [PATCH 0920/3482] gstreamer1: update to 1.18.3.

Remove gtk_doc option as it does nothing and doubt many use
---
 .../gstreamer1/patches/no-gir-automagic.patch | 22 ++++++++++---
 srcpkgs/gstreamer1/template                   | 32 +++++++++----------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/gstreamer1/patches/no-gir-automagic.patch b/srcpkgs/gstreamer1/patches/no-gir-automagic.patch
index c0135214edd8..53740b4bb047 100644
--- a/srcpkgs/gstreamer1/patches/no-gir-automagic.patch
+++ b/srcpkgs/gstreamer1/patches/no-gir-automagic.patch
@@ -1,13 +1,25 @@
-diff --git a/meson.build b/meson.build
-index e738c55..e1b8d93 100644
+From 225e87688f21a817224655372004eb512f862d43 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sun, 15 Nov 2020 10:04:50 -0600
+Subject: [PATCH] no-gir-automatic
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git meson.build meson.build
+index 5a21823..5d1db37 100644
 --- meson.build
 +++ meson.build
-@@ -451,7 +451,7 @@ rt_lib = cc.find_library('rt', required : false)
+@@ -503,7 +503,7 @@ rt_lib = cc.find_library('rt', required : false)
  gir = find_program('g-ir-scanner', required : get_option('introspection'))
  gnome = import('gnome')
  
--build_gir = gir.found() and not meson.is_cross_build()
-+build_gir = gir.found()
+-build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
++build_gir = gir.found() or get_option('introspection').enabled()
  
  gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
      'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
+-- 
+2.29.2
+
diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index 7a5863b27657..629caa92e521 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,16 +1,15 @@
 # Template file for 'gstreamer1'
 pkgname=gstreamer1
-version=1.16.2
-revision=2
+version=1.18.3
+revision=1
 wrksrc="gstreamer-${version}"
 build_style=meson
 build_helper="gir"
 configure_args="-Dptp-helper-permissions=capabilities
  -Dpackage-origin=https://www.voidlinux.org -Ddbghelp=disabled
- -Dintrospection=$(vopt_if gir enabled disabled)
- -Dgtk_doc=$(vopt_if gtk_doc enabled disabled)"
-hostmakedepends="gettext pkg-config flex python docbook-xsl glib-devel
- libcap-progs $(vopt_if gtk_doc gtk-doc)"
+ -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="gettext pkg-config flex python3 docbook-xsl glib-devel
+ libcap-progs"
 makedepends="libxml2-devel libglib-devel gtk+3-devel libcap-devel libunwind-devel
  bash-completion"
 short_desc="Core GStreamer libraries and elements (1.x)"
@@ -18,17 +17,19 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz"
-checksum=e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e
+checksum=0c2e09e18f2df69a99b5cb3bd53c597b3cc2e35cf6c98043bb86a66f3d312100
 
-# Package build options
-build_options="gir gtk_doc"
-build_options_default="gir"
+pre_check() {
+	# gst_gstdatetime is known to fail according to LFS
+	vsed -i '/gstdatetime/d' tests/check/meson.build
+}
 
-desc_option_gtk_doc="Build GTK Documentation with gtk-doc"
+do_check() {
+	ninja -C build test || msg_warn "Fails on musl"
+}
 
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default+=" gtk_doc"
-fi
+build_options="gir"
+build_options_default="gir"
 
 gstreamer1-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -37,9 +38,6 @@ gstreamer1-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
-		fi
 		vmove usr/share/aclocal
 		if [ "$build_option_gir" ]; then
 			vmove "usr/share/gir*"

From 54f05e5865fbce27b00d2e9b1c81bea8dfffac59 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Mon, 1 Feb 2021 10:00:21 +0100
Subject: [PATCH 0921/3482] geos: update to 3.9.0.

---
 common/shlibs                       |  4 ++--
 srcpkgs/geos/patches/geos-arm.patch | 14 ++++++++++++++
 srcpkgs/geos/template               |  6 +++---
 3 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/geos/patches/geos-arm.patch

diff --git a/common/shlibs b/common/shlibs
index b9fec683dea7..1523374f949f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3451,8 +3451,8 @@ libmedC.so.11 libmed-4.0.0_1
 libmed.so.11 libmed-4.0.0_1
 libeog.so eog-3.28.0_4
 libfreexl.so.1 freexl-1.0.5_1
-libgeos-3.7.0.so geos-3.7.0_1
-libgeos_c.so.1 geos-3.6.2_1
+libgeos-3.9.0.so geos-3.9.0_1
+libgeos_c.so.1 geos-3.9.0_1
 libpapi.so.5 papi-5.6.0_1
 libpfm.so.4 papi-5.6.0_1
 libfifechan.so.0.1.5 fifechan-0.1.5_1
diff --git a/srcpkgs/geos/patches/geos-arm.patch b/srcpkgs/geos/patches/geos-arm.patch
new file mode 100644
index 000000000000..5b6a7c6c7da0
--- /dev/null
+++ b/srcpkgs/geos/patches/geos-arm.patch
@@ -0,0 +1,14 @@
+see http://trac.osgeo.org/geos/ticket/222
+
+--- src/inlines.cpp	2020-12-09 18:17:36.000000000 +0100
++++ src/inlines.cpp	2021-02-02 09:57:11.270098998 +0100
+@@ -62,7 +62,9 @@
+ #include <geos/geomgraph/TopologyLocation.inl>
+ #include <geos/geomgraph/index/SegmentIntersector.inl>
+ #include <geos/noding/snapround/HotPixel.inl>
++#if ! defined(__ARM_EABI__)
+ #include <geos/noding/BasicSegmentString.inl>
++#endif // !defined __ARM_EABI__
+ #include <geos/noding/MCIndexNoder.inl>
+ 
+ #endif // defined __CYGWIN__
diff --git a/srcpkgs/geos/template b/srcpkgs/geos/template
index 049af66d27ae..4926620832e1 100644
--- a/srcpkgs/geos/template
+++ b/srcpkgs/geos/template
@@ -1,14 +1,14 @@
 # Template file for 'geos'
 pkgname=geos
-version=3.7.1
+version=3.9.0
 revision=1
 build_style=gnu-configure
 short_desc="C++ port of the Java Topology Suite (JTS)"
-maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
 license="LGPL-2.1-or-later"
 homepage="https://trac.osgeo.org/geos"
 distfiles="https://download.osgeo.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=0006c7b49eaed016b9c5c6f872417a7d7dc022e069ddd683335793d905a8228c
+checksum=bd8082cf12f45f27630193c78bdb5a3cba847b81e72b20268356c2a4fc065269
 
 geos-devel_package() {
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"

From bb9777cc386cd8c0ae77697c652ad0e1620a6e56 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 30 Jun 2020 16:19:50 -0500
Subject: [PATCH 0922/3482] dolphin-emu: update to 5.0.13178.

This moves to their beta releases, which are recommende for distribution
use.

Added by ericonr:
- Fix cross and use system's libenet.

Closes #25625.
---
 ...1c73c6e384b55ac8b95891bcecc455fae0da.patch |  47 --------
 .../patches/mbedtls_platform_h.patch          |  10 --
 srcpkgs/dolphin-emu/patches/musl.patch        |  22 ----
 .../dolphin-emu/patches/raster_font_cpp.patch | 112 ------------------
 .../dolphin-emu/patches/soundtouch212.patch   |  17 ---
 srcpkgs/dolphin-emu/template                  |  25 ++--
 6 files changed, 13 insertions(+), 220 deletions(-)
 delete mode 100644 srcpkgs/dolphin-emu/patches/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch
 delete mode 100644 srcpkgs/dolphin-emu/patches/mbedtls_platform_h.patch
 delete mode 100644 srcpkgs/dolphin-emu/patches/musl.patch
 delete mode 100644 srcpkgs/dolphin-emu/patches/raster_font_cpp.patch
 delete mode 100644 srcpkgs/dolphin-emu/patches/soundtouch212.patch

diff --git a/srcpkgs/dolphin-emu/patches/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch b/srcpkgs/dolphin-emu/patches/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch
deleted file mode 100644
index a808884a62ab..000000000000
--- a/srcpkgs/dolphin-emu/patches/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Origin: https://github.com/dolphin-emu/dolphin/commit/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch
-Subject: [PATCH] intrinsics: stop defining _xgetbv/_XCR_XFEATURE_ENABLED_MASK,
- which are reserved
-
----
---- Source/Core/Common/x64CPUDetect.cpp	2016-06-24 10:09:07.000000000 +0200
-+++ -	2018-08-19 19:43:35.737800299 +0200
-@@ -41,15 +41,27 @@
- 	return __cpuidex(info, function_id, 0);
- }
- 
--#define _XCR_XFEATURE_ENABLED_MASK 0
--static u64 _xgetbv(u32 index)
-+#endif // ifndef _WIN32
-+
-+#ifdef _WIN32
-+
-+static u64 xgetbv(u32 index)
-+{
-+	return _xgetbv(index);
-+}
-+constexpr u32 XCR_XFEATURE_ENABLED_MASK = _XCR_XFEATURE_ENABLED_MASK;
-+
-+#else
-+
-+static u64 xgetbv(u32 index)
- {
- 	u32 eax, edx;
- 	__asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index));
- 	return ((u64)edx << 32) | eax;
- }
-+constexpr u32 XCR_XFEATURE_ENABLED_MASK = 0;
-+#endif  // ifdef _WIN32
- 
--#endif // ifndef _WIN32
- 
- CPUInfo cpu_info;
- 
-@@ -134,7 +146,7 @@
- 		//  - XGETBV result has the XCR bit set.
- 		if (((cpu_id[2] >> 28) & 1) && ((cpu_id[2] >> 27) & 1))
- 		{
--			if ((_xgetbv(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
-+			if ((xgetbv(XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
- 			{
- 				bAVX = true;
- 				if ((cpu_id[2] >> 12) & 1)
diff --git a/srcpkgs/dolphin-emu/patches/mbedtls_platform_h.patch b/srcpkgs/dolphin-emu/patches/mbedtls_platform_h.patch
deleted file mode 100644
index 3d6587bbe608..000000000000
--- a/srcpkgs/dolphin-emu/patches/mbedtls_platform_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h	2016-06-24 10:09:07.000000000 +0200
-+++ Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h	2016-09-22 19:31:59.015774803 +0200
-@@ -5,6 +5,7 @@
- #pragma once
- 
- #include <string>
-+#include <mbedtls/platform.h>
- #include <mbedtls/ctr_drbg.h>
- #include <mbedtls/entropy.h>
- #include <mbedtls/net.h>
diff --git a/srcpkgs/dolphin-emu/patches/musl.patch b/srcpkgs/dolphin-emu/patches/musl.patch
deleted file mode 100644
index 52a8164c16da..000000000000
--- a/srcpkgs/dolphin-emu/patches/musl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Source/PCH/pch.h.orig	2016-06-26 08:53:16.021952803 +0200
-+++ Source/PCH/pch.h	2016-06-26 08:54:20.662712317 +0200
-@@ -19,7 +19,7 @@
- #include <ctype.h>
- #include <deque>
- #include <errno.h>
--#if !defined ANDROID && !defined _WIN32
-+#if defined(__linux__) && defined(__GLIBC__)
- #include <execinfo.h>
- #endif
- #include <fcntl.h>
---- Source/Core/Common/Thread.cpp.orig	2016-06-26 08:56:12.959031810 +0200
-+++ Source/Core/Common/Thread.cpp	2016-06-26 08:57:27.281905099 +0200
-@@ -135,7 +135,7 @@ void SetCurrentThreadName(const char* sz
- 	pthread_setname_np(szThreadName);
- #elif defined __FreeBSD__
- 	pthread_set_name_np(pthread_self(), szThreadName);
--#else
-+#elif defined __GLIBC__
- 	// linux doesn't allow to set more than 16 bytes, including \0.
- 	pthread_setname_np(pthread_self(), std::string(szThreadName).substr(0, 15).c_str());
- #endif
diff --git a/srcpkgs/dolphin-emu/patches/raster_font_cpp.patch b/srcpkgs/dolphin-emu/patches/raster_font_cpp.patch
deleted file mode 100644
index a569ec7e1e65..000000000000
--- a/srcpkgs/dolphin-emu/patches/raster_font_cpp.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- Source/Core/VideoBackends/OGL/RasterFont.cpp.orig	2017-04-20 13:02:30.087390930 +0300
-+++ Source/Core/VideoBackends/OGL/RasterFont.cpp	2017-04-20 13:02:49.036390127 +0300
-@@ -15,12 +15,12 @@
- namespace OGL
- {
- 
--static const int CHAR_WIDTH = 8;
--static const int CHAR_HEIGHT = 13;
--static const int CHAR_OFFSET = 32;
--static const int CHAR_COUNT = 95;
-+static const int CHARACTER_WIDTH = 8;
-+static const int CHARACTER_HEIGHT = 13;
-+static const int CHARACTER_OFFSET = 32;
-+static const int CHARACTER_COUNT = 95;
- 
--static const u8 rasters[CHAR_COUNT][CHAR_HEIGHT] = {
-+static const u8 rasters[CHARACTER_COUNT][CHARACTER_HEIGHT] = {
- 	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
- 	{0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
- 	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36},
-@@ -146,27 +146,27 @@
- 	glGenTextures(1, &texture);
- 	glActiveTexture(GL_TEXTURE8);
- 	glBindTexture(GL_TEXTURE_2D, texture);
--	std::vector<u32> texture_data(CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT);
--	for (int y = 0; y < CHAR_HEIGHT; y++)
-+	std::vector<u32> texture_data(CHARACTER_WIDTH * CHARACTER_COUNT * CHARACTER_HEIGHT);
-+	for (int y = 0; y < CHARACTER_HEIGHT; y++)
- 	{
--		for (int c = 0; c < CHAR_COUNT; c++)
-+		for (int c = 0; c < CHARACTER_COUNT; c++)
- 		{
--			for (int x = 0; x < CHAR_WIDTH; x++)
-+			for (int x = 0; x < CHARACTER_WIDTH; x++)
- 			{
--				bool pixel = (0 != (rasters[c][y] & (1 << (CHAR_WIDTH - x - 1))));
--				texture_data[CHAR_WIDTH * CHAR_COUNT * y + CHAR_WIDTH * c + x] = pixel ? -1 : 0;
-+				bool pixel = (0 != (rasters[c][y] & (1 << (CHARACTER_WIDTH - x - 1))));
-+				texture_data[CHARACTER_WIDTH * CHARACTER_COUNT * y + CHARACTER_WIDTH * c + x] = pixel ? -1 : 0;
- 			}
- 		}
- 	}
- 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
--	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, CHAR_WIDTH * CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
-+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, CHARACTER_WIDTH * CHARACTER_COUNT, CHARACTER_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
- 
- 	// generate shader
- 	ProgramShaderCache::CompileShader(s_shader, s_vertexShaderSrc, s_fragmentShaderSrc);
- 	s_shader.Bind();
- 
- 	// bound uniforms
--	glUniform2f(glGetUniformLocation(s_shader.glprogid,"charSize"), 1.0f / GLfloat(CHAR_COUNT), 1.0f);
-+	glUniform2f(glGetUniformLocation(s_shader.glprogid,"charSize"), 1.0f / GLfloat(CHARACTER_COUNT), 1.0f);
- 	uniform_color_id = glGetUniformLocation(s_shader.glprogid,"color");
- 	glUniform4f(uniform_color_id, 1.0f, 1.0f, 1.0f, 1.0f);
- 	uniform_offset_id = glGetUniformLocation(s_shader.glprogid, "offset");
-@@ -196,8 +196,8 @@
- 	std::vector<GLfloat> vertices(text.length() * 6 * 4);
- 
- 	int usage = 0;
--	GLfloat delta_x = GLfloat(2 * CHAR_WIDTH) / GLfloat(bbWidth);
--	GLfloat delta_y = GLfloat(2 * CHAR_HEIGHT) / GLfloat(bbHeight);
-+	GLfloat delta_x = GLfloat(2 * CHARACTER_WIDTH) / GLfloat(bbWidth);
-+	GLfloat delta_y = GLfloat(2 * CHARACTER_HEIGHT) / GLfloat(bbHeight);
- 	GLfloat border_x = 2.0f / GLfloat(bbWidth);
- 	GLfloat border_y = 4.0f / GLfloat(bbHeight);
- 
-@@ -220,37 +220,37 @@
- 			continue;
- 		}
- 
--		if (c < CHAR_OFFSET || c >= CHAR_COUNT + CHAR_OFFSET)
-+		if (c < CHARACTER_OFFSET || c >= CHARACTER_COUNT + CHARACTER_OFFSET)
- 			continue;
- 
- 		vertices[usage++] = x;
- 		vertices[usage++] = y;
--		vertices[usage++] = GLfloat(c - CHAR_OFFSET);
-+		vertices[usage++] = GLfloat(c - CHARACTER_OFFSET);
- 		vertices[usage++] = 0.0f;
- 
- 		vertices[usage++] = x + delta_x;
- 		vertices[usage++] = y;
--		vertices[usage++] = GLfloat(c - CHAR_OFFSET + 1);
-+		vertices[usage++] = GLfloat(c - CHARACTER_OFFSET + 1);
- 		vertices[usage++] = 0.0f;
- 
- 		vertices[usage++] = x + delta_x;
- 		vertices[usage++] = y + delta_y;
--		vertices[usage++] = GLfloat(c - CHAR_OFFSET + 1);
-+		vertices[usage++] = GLfloat(c - CHARACTER_OFFSET + 1);
- 		vertices[usage++] = 1.0f;
- 
- 		vertices[usage++] = x;
- 		vertices[usage++] = y;
--		vertices[usage++] = GLfloat(c - CHAR_OFFSET);
-+		vertices[usage++] = GLfloat(c - CHARACTER_OFFSET);
- 		vertices[usage++] = 0.0f;
- 
- 		vertices[usage++] = x + delta_x;
- 		vertices[usage++] = y + delta_y;
--		vertices[usage++] = GLfloat(c - CHAR_OFFSET + 1);
-+		vertices[usage++] = GLfloat(c - CHARACTER_OFFSET + 1);
- 		vertices[usage++] = 1.0f;
- 
- 		vertices[usage++] = x;
- 		vertices[usage++] = y + delta_y;
--		vertices[usage++] = GLfloat(c - CHAR_OFFSET);
-+		vertices[usage++] = GLfloat(c - CHARACTER_OFFSET);
- 		vertices[usage++] = 1.0f;
- 
- 		x += delta_x + border_x;
diff --git a/srcpkgs/dolphin-emu/patches/soundtouch212.patch b/srcpkgs/dolphin-emu/patches/soundtouch212.patch
deleted file mode 100644
index b48c57d94f5a..000000000000
--- a/srcpkgs/dolphin-emu/patches/soundtouch212.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix FTBFS with SoundTouch 2.1.2
- Explicitly disable exceptions in SoundTouch headers because Dolphin
- is compiled with -fno-exceptions.
-Author: James Cowgill <jcowgill@debian.org>
-Bug-Debian: https://bugs.debian.org/917671
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- Source/Core/AudioCommon/OpenALStream.h
-+++ Source/Core/AudioCommon/OpenALStream.h
-@@ -32,6 +32,7 @@
- #define BOOL SoundTouch_BOOL
- #endif
- 
-+#define ST_NO_EXCEPTION_HANDLING
- #include <soundtouch/SoundTouch.h>
- #include <soundtouch/STTypes.h>
- 
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 0e38d8d25be7..a577e9cc9620 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,25 +1,26 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0
-revision=18
-archs="x86_64* ppc64le*"
-wrksrc="dolphin-${version}"
+version=5.0.13178
+revision=1
+_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+#Version/hash pair can be found at https://dolphin-emu.org/download/
+archs="x86_64* aarch64* ppc64le*"
+wrksrc="dolphin-${_commit}"
 build_style=cmake
-configure_args="-DUSE_X11=1 -DUSE_EGL=0
- -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0"
-hostmakedepends="pkg-config"
+configure_args="-DUSE_SHARED_ENET=ON"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
 makedepends="
- zlib-devel glew-devel libusb-devel gtk+-devel miniupnpc-devel libevdev-devel
+ zlib-devel glew-devel libusb-devel qt5-devel miniupnpc-devel libevdev-devel
  SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg-devel libgomp-devel libcurl-devel
- portaudio-devel libopenal-devel soundtouch-devel lzo-devel wxWidgets-devel
- mbedtls-devel SFML-devel libenet-devel"
+ portaudio-devel libopenal-devel soundtouch-devel lzo-devel libbluetooth-devel
+ mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${version}.tar.gz"
-checksum=62c4602055767ab314ff50a3b94ea57f792832aa1629e6b1117ebce10518dc0b
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
+checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in

From 8f8f1aaee1a8d69ed822e842319fa47d76c915d6 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Mon, 1 Feb 2021 15:31:23 +0000
Subject: [PATCH 0923/3482] xorg-util-macros: update to 1.19.3.

Also move homepage to new git repository.

Closes: #28391 [via git-merge-pr]
---
 srcpkgs/xorg-util-macros/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xorg-util-macros/template b/srcpkgs/xorg-util-macros/template
index fb979ac898de..7d20e7035fba 100644
--- a/srcpkgs/xorg-util-macros/template
+++ b/srcpkgs/xorg-util-macros/template
@@ -1,16 +1,16 @@
 # Template file for 'xorg-util-macros'
 pkgname=xorg-util-macros
-version=1.19.2
-revision=2
+version=1.19.3
+revision=1
 wrksrc="${pkgname/xorg-/}-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 short_desc="X.org autotool macros"
-homepage="http://www.x.org/"
-license="MIT"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/xorg/util/macros/"
 distfiles="${XORG_SITE}/util/util-macros-$version.tar.bz2"
-checksum=d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712
+checksum=0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971
 
 post_install() {
 	vlicense COPYING

From 70f703a82e616eaecabfdb1d8a8f27b066742865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 28 Jan 2021 01:17:40 -0300
Subject: [PATCH 0924/3482] meson: update to 0.56.2.

Fix checkdepends and tests in general on musl.

Add bash completions.
---
 srcpkgs/meson/patches/fix-unittest.patch | 77 ++++++++++++++++++++++++
 srcpkgs/meson/template                   | 29 ++++++---
 2 files changed, 99 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/meson/patches/fix-unittest.patch

diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
new file mode 100644
index 000000000000..746de056ed72
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-unittest.patch
@@ -0,0 +1,77 @@
+commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
+Author: Érico Rolim <erico.erc@gmail.com>
+Date:   Mon Feb 1 00:26:49 2021 -0300
+
+    tests/common: fix " 37 has function" test on musl systems.
+    
+    This commit fixes the test that asserts on whether the lchmod() function
+    should have been detected as available by Meson. It does so by assuming
+    that on Linux systems not using glibc, the function will be available.
+    
+    - fix comment about lchmod on Linux: musl has implemented the function
+    correctly since 2013, so the assumption in the test wasn't correct.
+    Furthermore, musl doesn't use glibc's stub mechanism.
+    - fix include to receive __GLIBC__ definition: including almost any
+    header in glibc will end up defining __GLIBC__, since most headers
+    include <features.h>. The <gnu/libc-version.h> header was probably
+    chosen because of its name, but its actual purpose is defining functions
+    for checking glibc version at runtime (instead of what the binary was
+    built with), so it isn't necessary to use it. Since it is a completely
+    non standard header, including it makes the test suite fail on musl due
+    to not finding the header.
+
+diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
+index 26f13d6fa..a59480c2d 100644
+--- test cases/common/39 has function/meson.build	
++++ test cases/common/39 has function/meson.build	
+@@ -44,11 +44,13 @@ foreach cc : compilers
+     error('Found non-existent function "hfkerhisadf".')
+   endif
+ 
+-  # With glibc on Linux lchmod is a stub that will always return an error,
+-  # we want to detect that and declare that the function is not available.
+-  # We can't check for the C library used here of course, but if it's not
+-  # implemented in glibc it's probably not implemented in any other 'slimmer'
+-  # C library variants either, so the check should be safe either way hopefully.
++  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
++  # always return an error, we want to detect that and declare that the
++  # function is not available.
++  # We can't check for the C library used here of course, but the main
++  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
++  # also, it has implemented lchmod since 2013, so it should be safe to check
++  # that lchmod is available on Linux when not using glibc.
+   if host_system == 'linux' or host_system == 'darwin'
+     assert (cc.has_function('poll', prefix : '#include <poll.h>',
+                             args : unit_test_args),
+@@ -57,15 +59,24 @@ foreach cc : compilers
+     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
+ 
+     if host_system == 'linux'
+-      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
+-      message('GLIBC vetsion:', glibc_vers)
++      # __GLIBC__ macro can be retrieved by including almost any C library header
++      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
++      # __GLIBC__ will only be set for glibc
++      if glibc_major != ''
++        glibc_print = 'hi "@0@" hi'.format(glibc_major)
++        message(glibc_print)
++        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
++        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
++        message('GLIBC version:', glibc_vers)
+ 
+-      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
+-      if glibc_vers.version_compare('<2.32')
+-        assert (not has_lchmod, '"lchmod" check should have failed')
++        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
++        if glibc_vers.version_compare('<2.32')
++          assert (not has_lchmod, '"lchmod" check should have failed')
++        else
++          assert (has_lchmod, '"lchmod" check should have succeeded')
++        endif
+       else
++        # Other C libraries for Linux should have lchmod
+         assert (has_lchmod, '"lchmod" check should have succeeded')
+       endif
+     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 9a1afce0cfc1..64a12e6d7a98 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,20 +1,33 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.55.3
-revision=3
+version=0.56.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
-checkdepends="glib-devel gobject-introspection libsanitizer-devel ninja
+checkdepends="glib-devel gobject-introspection ninja
  gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python-devel
  cross-arm-linux-gnueabihf"
 short_desc="Super fast build system"
 maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0"
 homepage="https://mesonbuild.com"
-changelog="https://github.com/mesonbuild/$pkgname/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
-distfiles="https://github.com/mesonbuild/$pkgname/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5
+changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
+distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
+checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+
+# XXX: sanitizers aren't available on musl
+if [ "$XBPS_TARGET_LIBC" = glibc ]; then
+	checkdepends+=" libsanitizer-devel"
+fi
+
+post_patch() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		vsed -e 's/test_pch_with_address_sanitizer/_&/' \
+			-e 's/test_generate_gir_with_address_sanitizer/_&/' \
+			-i run_unittests.py
+	fi
+}
 
 do_check() {
 	# meson depends on trillion of things to perform actual tests
@@ -35,5 +48,7 @@ post_install() {
 	done
 
 	vinstall data/syntax-highlighting/emacs/meson.el 644 usr/share/emacs/site-lisp
-	vinstall data/shell-completions/zsh/_meson 644 usr/share/zsh/site-functions
+
+	vcompletion data/shell-completions/bash/meson bash
+	vcompletion data/shell-completions/zsh/_meson zsh
 }

From be267cecfc024223c6f550b27b4f8c03efead197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 17:20:22 -0300
Subject: [PATCH 0925/3482] kanshi: add patch to fix ndebug build.

Caught by new warnings enabled by meson update.
---
 srcpkgs/kanshi/patches/assert.patch | 37 +++++++++++++++++++++++++++++
 srcpkgs/kanshi/template             |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kanshi/patches/assert.patch

diff --git a/srcpkgs/kanshi/patches/assert.patch b/srcpkgs/kanshi/patches/assert.patch
new file mode 100644
index 000000000000..90e8e3c7babf
--- /dev/null
+++ b/srcpkgs/kanshi/patches/assert.patch
@@ -0,0 +1,37 @@
+commit 5ff7fad0a8391c0c3ef87f48e34e4e65c584d000
+Author: Érico Rolim <erico.erc@gmail.com>
+Date:   Tue Feb 2 17:18:42 2021 -0300
+
+    parser: use abort() instead of assert(0).
+    
+    assert(0) has no effect on NDEBUG builds, and means the program will
+    continue running in an unexpected state.
+
+diff --git parser.c parser.c
+index 40146e8..0ed1ba1 100644
+--- parser.c
++++ parser.c
+@@ -1,5 +1,4 @@
+ #define _POSIX_C_SOURCE 200809L
+-#include <assert.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <stdbool.h>
+@@ -24,7 +23,7 @@ static const char *token_type_str(enum kanshi_token_type t) {
+ 	case KANSHI_TOKEN_NEWLINE:
+ 		return "newline";
+ 	}
+-	assert(0);
++	abort();
+ }
+ 
+ static int parser_read_char(struct kanshi_parser *parser) {
+@@ -333,7 +332,7 @@ static struct kanshi_profile_output *parse_profile_output(
+ 					}
+ 					break;
+ 				default:
+-					assert(0);
++					abort();
+ 				}
+ 				has_key = false;
+ 				output->fields |= key;
diff --git a/srcpkgs/kanshi/template b/srcpkgs/kanshi/template
index fbef9a7e59ba..e6fe40f4a697 100644
--- a/srcpkgs/kanshi/template
+++ b/srcpkgs/kanshi/template
@@ -1,7 +1,7 @@
 # Template file for 'kanshi'
 pkgname=kanshi
 version=1.1.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
 makedepends="wayland-devel"

From e2d287ae6382b271e765d8555b16184918f117fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 18:05:10 -0300
Subject: [PATCH 0926/3482] wlroots: follow upstream recommendation for ndebug.

Assertions in this case are desirable at runtime.

Fix build for meson 0.56.x, since new warnings were added.
---
 srcpkgs/wlroots/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index a73b5f21a132..c4d3bad99c6b 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,11 +1,12 @@
 # Template file for 'wlroots'
 pkgname=wlroots
 version=0.12.0
-revision=1
+revision=2
 build_style=meson
+# enable assertions - upstream uses them only for unreachable situations
 configure_args="-Dlogind=disabled -Dlibseat=enabled
  -Dxcb-errors=enabled -Dxcb-icccm=enabled -Dxwayland=enabled
- -Dx11-backend=enabled -Dexamples=false"
+ -Dx11-backend=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false"
 hostmakedepends="pkg-config wayland-devel"
 _devel_depends="MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel
  libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols

From b6a7217185157a74572f77756e212873c84cfa7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 19:30:18 -0300
Subject: [PATCH 0927/3482] efl: don't build examples.

Avoids wasting build time.

Also gate tests, since they aren't working great yet.
---
 srcpkgs/efl/template | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index a8b26fff25c9..513cb4dfff46 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -4,6 +4,7 @@ version=1.24.4
 revision=1
 build_style=meson
 configure_args="
+ -Dbuild-examples=false
  -Dembedded-lz4=false
  -Dcrypto=openssl
  -Dnetwork-backend=none
@@ -46,6 +47,7 @@ makedepends="
  $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if lottie rlottie-devel)
  $(vopt_if ibus ibus-devel)"
+checkdepends="dbus xvfb-run"
 short_desc="Enlightenment Foundation Libraries"
 maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.1-only"
@@ -104,6 +106,13 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+do_check() {
+	if [ "$XBPS_CHECK_PKGS" = full ]; then
+		# FIXME: tests fail in weird places
+		xvfb-run dbus-run-session ninja -C build test
+	fi
+}
+
 post_install() {
 	# don't want service file junk
 	rm -rf ${DESTDIR}/usr/lib/systemd

From 6dcb39a79ffb911d8bdab3f0af7504b9554aeaf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 17:04:39 -0300
Subject: [PATCH 0928/3482] seatd: fix build with meson 0.56.x.

meson added some new warnings to the warning level used by seatd,
including for unused arguments. This made the build generate warnings,
and seatd's default of werror=true caused the build to fail.
---
 srcpkgs/seatd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seatd/template b/srcpkgs/seatd/template
index d76d4d3a658b..e6b6b387444c 100644
--- a/srcpkgs/seatd/template
+++ b/srcpkgs/seatd/template
@@ -3,7 +3,7 @@ pkgname=seatd
 version=0.4.0
 revision=1
 build_style=meson
-configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled)"
+configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled) -Dwerror=false"
 hostmakedepends="pkg-config scdoc"
 makedepends="$(vopt_if elogind elogind-devel)"
 short_desc="Minimal seat management daemon"

From a8798564bad1c1bb14d1b1f8e5ce23a6d537687a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 19:42:48 -0300
Subject: [PATCH 0929/3482] mako: fix build with meson 0.56.x.

---
 srcpkgs/mako/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mako/template b/srcpkgs/mako/template
index 299305acd789..18c18def196d 100644
--- a/srcpkgs/mako/template
+++ b/srcpkgs/mako/template
@@ -3,7 +3,7 @@ pkgname=mako
 version=1.4.1
 revision=1
 build_style=meson
-configure_args="-Dzsh-completions=true -Dapparmor=true"
+configure_args="-Dzsh-completions=true -Dapparmor=true -Dwerror=false"
 hostmakedepends="pkg-config scdoc wayland-devel wayland-protocols"
 makedepends="wayland-devel wayland-protocols pango-devel cairo-devel
  elogind-devel gdk-pixbuf-devel"

From 243942bc75c3b714854b224934476d9aa8d7edb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 19:59:11 -0300
Subject: [PATCH 0930/3482] grim: fix build for meson 0.56.x.

---
 srcpkgs/grim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grim/template b/srcpkgs/grim/template
index 896434db405f..618447694563 100644
--- a/srcpkgs/grim/template
+++ b/srcpkgs/grim/template
@@ -3,7 +3,7 @@ pkgname=grim
 version=1.3.1
 revision=1
 build_style=meson
-configure_args="-Djpeg=enabled"
+configure_args="-Djpeg=enabled -Dwerror=false"
 hostmakedepends="pkg-config wayland-devel scdoc"
 makedepends="wayland-devel wayland-protocols cairo-devel libjpeg-turbo-devel"
 short_desc="Grab images from a Wayland compositor"

From 9234a9991043d4fd3d11e64df183aa2dc5af07d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 20:40:19 -0300
Subject: [PATCH 0931/3482] swayidle: fix build with meson 0.56.x.

---
 srcpkgs/swayidle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/swayidle/template b/srcpkgs/swayidle/template
index b6f51f47927e..e415051946ae 100644
--- a/srcpkgs/swayidle/template
+++ b/srcpkgs/swayidle/template
@@ -3,7 +3,7 @@ pkgname=swayidle
 version=1.6
 revision=1
 build_style=meson
-configure_args="-Dlogind-provider=elogind"
+configure_args="-Dlogind-provider=elogind -Dwerror=false"
 hostmakedepends="pkg-config wayland-devel scdoc"
 makedepends="wayland-devel wayland-protocols elogind-devel"
 short_desc="Idle management daemon for Wayland"

From 3078a6a912292119a150b868c6bb6cc25fbfed2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 17:57:20 -0300
Subject: [PATCH 0932/3482] pixman: fix potential build errors with meson
 0.56.x.

I couldn't reproduce the errors, so this commit is not entirely
necessary. It still works as a precaution.

The below is slightly erroneous, since the issue didn't repeat itself.

Apparently meson detects OpenMP as available on cross builds because it
can find the omp.h header, even though the library seems to be
available.

For reference, what the configure output of a native build looks like:

WARNING: OpenMP found but omp.h missing.
Run-time dependency OpenMP found: NO
---
 srcpkgs/pixman/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index ca5bf9632b0d..26c65462af60 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -20,7 +20,11 @@ LDFLAGS="-Wl,-z,stack-size=2097152"
 if [ "$XBPS_CHECK_PKGS" ]; then
 	# libpng and openmp are used only for testing; the make-blue-noise.c file isn't built
 	# https://gitlab.freedesktop.org/pixman/pixman/-/blob/9b49f4e08751885289333fed652bf5e0f45976b4/pixman/dither/make-blue-noise.c
-	configure_args+=" -Dlibpng=enabled -Dopenmp=enabled"
+	configure_args+=" -Dtests=enabled -Dlibpng=enabled -Dopenmp=enabled"
+else
+	# dynamic libgomp is available only when running tests, better to disable explicitly.
+	# -Dtests will only take effect on the next release.
+	configure_args+=" -Dtests=disabled -Dopenmp=disabled"
 fi
 
 post_install() {

From fbf810233d822c4e437d2d7194de0cbefda1dabc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 21:51:21 -0300
Subject: [PATCH 0933/3482] nautilus: fix build after libdir changes.

Also gate tests.
---
 srcpkgs/nautilus/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index f7108f9b0622..e38755f0806b 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -19,9 +19,23 @@ homepage="https://wiki.gnome.org/Nautilus"
 distfiles="${GNOME_SITE}/${pkgname}/${version::4}/${pkgname}-${version}.tar.xz"
 checksum=0a3e812b13b774b7fd6f222f55acd1f87fb2973d9af60c04b7d25cb52222d0fd
 
+if [ "$CROSS_BUILD" ]; then
+	# tests try to use tracker-sandbox from the wrong path, because of some confusion with libdir:
+	# "Program /usr/lib32/tracker-3.0/trackertestutils/tracker-sandbox found: NO"
+	configure_args+=" -Dtests=none"
+fi
+
 build_options="gir"
 build_options_default="gir"
 
+do_check() {
+	if [ "$XBPS_CHECK_PKGS" = full ]; then
+		# tests timeout:
+		# 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
+		ninja -C builddir test
+	fi
+}
+
 libnautilus_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {

From 7e0d919ebd230dd4d8cf3a34b64e8aa7d81fcc8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 21:50:26 -0300
Subject: [PATCH 0934/3482] grilo-plugins: fix build for libdir changes.

---
 srcpkgs/grilo-plugins/template | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index 2de976a082b1..9631b2941a74 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -18,6 +18,14 @@ homepage="http://live.gnome.org/Grilo"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=c6b6df086a164d65c206d70139ce80591f8feca3545612e45b823fb4fe4b2577
 
+post_patch() {
+	if [ "$CROSS_BUILD" ]; then
+		# tests try to use tracker-sandbox from the wrong path:
+		# "Program /usr/lib32/tracker-3.0/trackertestutils/tracker-sandbox found: NO"
+		vsed -e "/subdir('tests')/d" -i meson.build
+	fi
+}
+
 # feel free to fix
 do_check() {
 	:

From 01e896422a326dab9a9694c1ac2e3cb57c8e1e5a Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 3 Feb 2021 00:54:14 -0500
Subject: [PATCH 0935/3482] xbps-src: dbulk-dump: remember to print bootstrap

---
 xbps-src | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xbps-src b/xbps-src
index 77969af84a15..009a145c1d6f 100755
--- a/xbps-src
+++ b/xbps-src
@@ -893,6 +893,9 @@ case "$XBPS_TARGET" in
         for x in pkgname version revision; do
             printf '%s: %s\n' "$x" "${!x}"
         done
+        for x in bootstrap; do
+            [[ ${!x} ]] && printf '%s: %s\n' "$x" "${!x}"
+        done
         for x in hostmakedepends makedepends depends; do
             arr=(${!x})
             if [[ ${#arr} -gt 0 ]]; then

From 5faabf054ad76f5da4fc2a01a691ced07a75ea22 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 2 Feb 2021 10:33:21 +0100
Subject: [PATCH 0936/3482] perl-Tree-DAG_Node: update to 1.32.

---
 srcpkgs/perl-Tree-DAG_Node/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Tree-DAG_Node/template b/srcpkgs/perl-Tree-DAG_Node/template
index 8e9423205699..9d690f6a36fb 100644
--- a/srcpkgs/perl-Tree-DAG_Node/template
+++ b/srcpkgs/perl-Tree-DAG_Node/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Tree-DAG_Node'.
 pkgname=perl-Tree-DAG_Node
-version=1.31
-revision=2
+version=1.32
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 homepage="https://metacpan.org/release/Tree-DAG_Node"
 license="Artistic-2.0"
 distfiles="${CPAN_SITE}/Tree/${pkgname/perl-/}-$version.tgz"
-checksum=1c8ba69772568b3758054247097512c550efe31517c329fb65eef7afccc9d304
+checksum=22d9de3d6e6f4afd89e6d825c664f9482878bd49e29cb81342a707af40542d3d

From 3c74fe19918e586c1e372b14ff00005484128004 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Feb 2021 11:36:43 +0100
Subject: [PATCH 0937/3482] xlbiff: update to 4.5.1.

---
 srcpkgs/xlbiff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xlbiff/template b/srcpkgs/xlbiff/template
index 25d93df6bf7b..563bc5830192 100644
--- a/srcpkgs/xlbiff/template
+++ b/srcpkgs/xlbiff/template
@@ -1,6 +1,6 @@
 # Template file for 'xlbiff'
 pkgname=xlbiff
-version=4.5
+version=4.5.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-xmhformdir=/etc/nmh"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.edsantiago.com/xlbiff/"
 distfiles="https://github.com/edsantiago/xlbiff/archive/${version}.tar.gz"
-checksum=efe4163a9b1ef8d7d4a472b2e719a5474022a1e32cc3f7ab1c0c17ee41c28b53
+checksum=96e72a0f30452d39ee9b37b4147cf89681b31546fb4fec607324349531f744cd
 
 pre_configure() {
 	autoreconf -fi

From 2644dc4c9c84bad86a2c1e8f7890ad466ff403b7 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Wed, 3 Feb 2021 10:18:23 -0300
Subject: [PATCH 0938/3482] texlive-science: fix typo in description.

---
 srcpkgs/texlive-science/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/texlive-science/template b/srcpkgs/texlive-science/template
index c405043a4638..17000ee36c22 100644
--- a/srcpkgs/texlive-science/template
+++ b/srcpkgs/texlive-science/template
@@ -1,10 +1,10 @@
 # Template file for 'texlive-science'
 pkgname=texlive-science
 version=2020.57068
-revision=1
+revision=2
 build_style="texmf"
 depends="texlive-core"
-short_desc="TeX Live - Typesetting for mathematatics and science disciplines"
+short_desc="TeX Live - Typesetting for mathematics and science disciplines"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="http://tug.org/texlive/"

From c2446dc8a33296bccfc02c9b35a80658f8c81a38 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 3 Feb 2021 10:02:46 +0100
Subject: [PATCH 0939/3482] google-chrome: update to 88.0.4324.146

---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index b182d2ce65e4..e2cea8c2e7dc 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=88.0.4324.96
+_chromeVersion=88.0.4324.146
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=4c3fca6ba917db4635368c99df61cd811c5138daa1ad890d4dc4271dd0014124
+checksum=2d9205f4f882c091ab9e5421e4d3f28d792479d073b1edce12632316b8f93c81
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 1feb7f339625a0256886db804aee76c811d693ce Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 3 Feb 2021 13:22:22 +0300
Subject: [PATCH 0940/3482] amfora: update to 1.7.2

---
 srcpkgs/amfora/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/amfora/template b/srcpkgs/amfora/template
index c19a4452657f..2019ac482bd0 100644
--- a/srcpkgs/amfora/template
+++ b/srcpkgs/amfora/template
@@ -1,6 +1,6 @@
 # Template file for 'amfora'
 pkgname=amfora
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/${pkgname}"
@@ -10,7 +10,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/makeworld-the-better-one/amfora"
 changelog="https://raw.githubusercontent.com/makeworld-the-better-one/amfora/master/CHANGELOG.md"
 distfiles="https://github.com/makeworld-the-better-one/${pkgname}/archive/v${version}.tar.gz"
-checksum=55a2d98e438ed3d41ad6bae6b4e04348a04e28a279fdc09866a1fdd5ee91d3ec
+checksum=3eb436a81b11b4db75dfb94e38eeaed994ce48a6a5f75ae02efd3f59cc76ec3e
 
 post_install() {
 	vinstall amfora.desktop 644 usr/share/applications/

From eafbbfa5f0304df8a7ed291252bd3fd140b6e2e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 3 Feb 2021 20:48:00 +0700
Subject: [PATCH 0941/3482] gst1-python: remove package

- Python 2 binding for gstreamer1
- Nothing depends on it
---
 srcpkgs/gst1-python/template      | 16 ----------------
 srcpkgs/gst1-python/update        |  2 --
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 srcpkgs/gst1-python/template
 delete mode 100644 srcpkgs/gst1-python/update

diff --git a/srcpkgs/gst1-python/template b/srcpkgs/gst1-python/template
deleted file mode 100644
index 13a967a17039..000000000000
--- a/srcpkgs/gst1-python/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'gst1-python'
-pkgname=gst1-python
-version=1.18.3
-revision=1
-wrksrc="gst-python-${version}"
-build_style=meson
-hostmakedepends="pkg-config python"
-makedepends="libglib-devel python3-gobject-devel gst-plugins-base1-devel"
-depends="python3-gobject"
-checkdepends="$depends"
-short_desc="Python bindings for GStreamer 1.x"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://gstreamer.freedesktop.org"
-distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=4e630735276e08ff4d70337aa5d91fd008e5f1ed3dc0993674cd5820e264259a
diff --git a/srcpkgs/gst1-python/update b/srcpkgs/gst1-python/update
deleted file mode 100644
index bfef6c041a70..000000000000
--- a/srcpkgs/gst1-python/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname=${pkgname/1/}
-ignore="1.*[13579].*"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index cef8a752e462..f18475645012 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -40,6 +40,7 @@ replaces="
  gksu<=2.0.2_4
  go1.4-bootstrap<=20171003_2
  goffice0.8<=0.8.17_6
+ gst1-python<=1.18.3_1
  grv<=0.3.1_3
  gtkhtml<=4.10.0_1
  gtkhtml-devel<=4.10.0_1

From 770d82ed22de691ae70bcae263f6360d246807cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Feb 2021 10:35:25 -0300
Subject: [PATCH 0942/3482] python3-Django: remove package.

Not maintained properly and a security risk.
---
 srcpkgs/python3-Django/template | 21 ---------------------
 srcpkgs/python3-Django/update   |  1 -
 2 files changed, 22 deletions(-)
 delete mode 100644 srcpkgs/python3-Django/template
 delete mode 100644 srcpkgs/python3-Django/update

diff --git a/srcpkgs/python3-Django/template b/srcpkgs/python3-Django/template
deleted file mode 100644
index 23a383b915d5..000000000000
--- a/srcpkgs/python3-Django/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python3-Django'
-pkgname=python3-Django
-version=3.0.7
-revision=2
-wrksrc="Django-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytz python3-setuptools"
-short_desc="High-level Python3 Web framework"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.djangoproject.com/"
-distfiles="https://media.djangoproject.com/releases/3.0/Django-${version}.tar.gz"
-checksum=5052b34b34b3425233c682e0e11d658fd6efd587d11335a0203d827224ada8f2
-alternatives="django:django-admin:/usr/bin/django-admin3"
-
-post_install() {
-	vlicense LICENSE
-	rm -f ${DESTDIR}/usr/bin/django-admin.py*
-	mv ${DESTDIR}/usr/bin/django-admin{,3}
-}
diff --git a/srcpkgs/python3-Django/update b/srcpkgs/python3-Django/update
deleted file mode 100644
index 25ef51d109a4..000000000000
--- a/srcpkgs/python3-Django/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*a* *b* *rc*"

From 6c4fdad5232f4467ca48a8f27b31bd98a7f6be00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Feb 2021 10:42:27 -0300
Subject: [PATCH 0943/3482] removed-packages: add python3-Django.

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f18475645012..229c78a6bccb 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=21
+revision=22
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -183,6 +183,7 @@ replaces="
  python-pyenet<=1.3.13.post7_2
  python-pyside<=1.2.2_7
  python-pytest-relaxed<=1.1.2_2
+ python3-Django<=3.0.7_2
  python3-pyPEG2<=2.15.2_7
  qimageblitz<=0.0.6_4
  qucs<=0.0.19_2

From d302f2943ae4064fed0483d0b7db03d1a9ee67d9 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 3 Feb 2021 16:27:00 +0300
Subject: [PATCH 0944/3482] element-desktop: update to 1.7.19

---
 srcpkgs/element-desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 3dd6032b568c..0a5204e7a6ca 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.7.18
+version=1.7.19
 revision=1
 wrksrc="element-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
@@ -18,8 +18,8 @@ _ghpage="https://github.com/vector-im"
 _archive="archive/v${version}.tar.gz"
 distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
  ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="364c6666cca3e8acee0f147fe8ac14825efa851bae4c89e2ce1cada5a817bff8
- 08ed3b659ebbe79fb749b49f18257024469e7d5f28d15d007529a12a9196d297"
+checksum="ab2543cf87614d82f3d070249c9890ac57b02a5ae1d7ed8140fcc56d1c1f8bd6
+ f2817b02b80106b8fee307cc7f0ecff1c735111407acd4fb92363a8457d5ea80"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From c7a917af88e7ae7536e5a7b0213cc8fe500adbf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 3 Feb 2021 20:44:59 +0700
Subject: [PATCH 0945/3482] gstreamer1: remove gir patch

---
 .../gstreamer1/patches/no-gir-automagic.patch | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 srcpkgs/gstreamer1/patches/no-gir-automagic.patch

diff --git a/srcpkgs/gstreamer1/patches/no-gir-automagic.patch b/srcpkgs/gstreamer1/patches/no-gir-automagic.patch
deleted file mode 100644
index 53740b4bb047..000000000000
--- a/srcpkgs/gstreamer1/patches/no-gir-automagic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 225e87688f21a817224655372004eb512f862d43 Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens@artixlinux.org>
-Date: Sun, 15 Nov 2020 10:04:50 -0600
-Subject: [PATCH] no-gir-automatic
-
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git meson.build meson.build
-index 5a21823..5d1db37 100644
---- meson.build
-+++ meson.build
-@@ -503,7 +503,7 @@ rt_lib = cc.find_library('rt', required : false)
- gir = find_program('g-ir-scanner', required : get_option('introspection'))
- gnome = import('gnome')
- 
--build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
-+build_gir = gir.found() or get_option('introspection').enabled()
- 
- gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
-     'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
--- 
-2.29.2
-

From 011fed0002accd94c407597431945b8a265d6193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 3 Feb 2021 21:02:33 +0700
Subject: [PATCH 0946/3482] gst-plugins-bad1: remove gir patch

---
 .../patches/no-gir-automagic.patch            | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch

diff --git a/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch b/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
deleted file mode 100644
index 38cc2f5edc11..000000000000
--- a/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d4cba6b214ff9a631cdfb845c07101f97510abff Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens@artixlinux.org>
-Date: Sun, 15 Nov 2020 10:33:52 -0600
-Subject: [PATCH] no-gir-automatic
-
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git meson.build meson.build
-index 5d52ea9..4b2b5ea 100644
---- meson.build
-+++ meson.build
-@@ -445,7 +445,7 @@ python3 = import('python').find_installation()
- 
- gir = find_program('g-ir-scanner', required : get_option('introspection'))
- gnome = import('gnome')
--build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
-+build_gir = gir.found() or get_option('introspection').enabled()
- gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
-     'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
-     'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \
--- 
-2.29.2
-

From 0417ef1e2a60a2f03f0ea62f6ffd169a1295b923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 3 Feb 2021 21:11:05 +0700
Subject: [PATCH 0947/3482] gst-plugins-base1: remove gir patch

---
 .../patches/no-gir-automagic.patch            | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch

diff --git a/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch b/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
deleted file mode 100644
index 36483a10e065..000000000000
--- a/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0d734eb2314fc60deee59de5f1440617e04e5125 Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens@artixlinux.org>
-Date: Sun, 15 Nov 2020 10:25:30 -0600
-Subject: [PATCH] no-gir-automatic
-
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git meson.build meson.build
-index 5ecce7f..98f8113 100644
---- meson.build
-+++ meson.build
-@@ -416,7 +416,7 @@ endif
- 
- gir = find_program('g-ir-scanner', required : get_option('introspection'))
- gnome = import('gnome')
--build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
-+build_gir = gir.found() or get_option('introspection').enabled()
- gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
-     'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
-     'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
--- 
-2.29.2
-

From ce20a34fc1bfe75604419c9473bc3cf7c199f35b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 2 Feb 2021 22:46:52 +0700
Subject: [PATCH 0948/3482] i3: update to 4.19.1.

---
 srcpkgs/i3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index f3d9d6c9d00a..c8751cbbe015 100644
--- a/srcpkgs/i3/template
+++ b/srcpkgs/i3/template
@@ -1,6 +1,6 @@
 # Template file for 'i3'
 pkgname=i3
-version=4.19
+version=4.19.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config perl"
@@ -15,7 +15,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD-3-Clause"
 homepage="https://i3wm.org/"
 distfiles="${homepage}/downloads/${pkgname}-${version}.tar.xz"
-checksum=aca48b03c0c70607826a1a91333065ff44d61774c152ddc9210fbc1627355872
+checksum=2284c812fc689e0338d8fe9be0b8d1552e548fc168d165f795b26bf497c22b47
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libglob-devel";;

From 24d41171a34817da2ac05068e0ea14d90c5eeb8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 3 Feb 2021 20:57:03 +0700
Subject: [PATCH 0949/3482] blanket: remove depends on python-gobject

I was surprised that blanket works. It's working only because
gst1-python3 pulls python3-gobject in.
---
 srcpkgs/blanket/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blanket/template b/srcpkgs/blanket/template
index 894455730b29..91fed55cbc17 100644
--- a/srcpkgs/blanket/template
+++ b/srcpkgs/blanket/template
@@ -1,10 +1,10 @@
 # Template file for 'blanket'
 pkgname=blanket
 version=0.3.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"
-depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 python-gobject libhandy1"
+depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 libhandy1"
 short_desc="Improve focus and productivity by listening to different sounds"
 maintainer="Reback00 <reback00@protonmail.com>"
 license="GPL-3.0-or-later"

From 1911f68c450b7109fbe3a74bbea7893689ac40d0 Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Tue, 2 Feb 2021 22:14:46 -0800
Subject: [PATCH 0950/3482] x265: fixes distfile (#28424)

---
 srcpkgs/x265/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index bba3e5dd14b6..2b858bad487f 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -2,7 +2,8 @@
 pkgname=x265
 version=3.4
 revision=1
-wrksrc="x265_${version}"
+_commit="a4f320054d67"
+wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
@@ -10,8 +11,8 @@ short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
-distfiles="https://bitbucket.org/multicoreware/x265/downloads/x265_${version}.tar.gz"
-checksum=c2047f23a6b729e5c70280d23223cb61b57bfe4ad4e8f1471eeee2a61d148672
+distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
+checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
 
 build_options="altivec assembly"
 

From 03059ebdb3c9de14879e9ffc75e682780a7acd7c Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 31 Jan 2021 17:08:23 +0100
Subject: [PATCH 0951/3482] hatari: update to 2.3.1, switch to python3

---
 srcpkgs/hatari/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/hatari/template b/srcpkgs/hatari/template
index 82049108ece9..e05e77961d60 100644
--- a/srcpkgs/hatari/template
+++ b/srcpkgs/hatari/template
@@ -1,9 +1,9 @@
 # Template file for 'hatari'
 pkgname=hatari
-version=2.2.1
+version=2.3.1
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config python3"
 makedepends="SDL2-devel libpng-devel portaudio-devel zlib-devel"
 depends="hicolor-icon-theme"
 short_desc="Atari ST/STE/TT/Falcon emulator"
@@ -11,5 +11,5 @@ maintainer="Jarbowski <jarbowski@cock.lu>"
 license="GPL-2.0-or-later"
 homepage="http://hatari.tuxfamily.org/"
 distfiles="http://download.tuxfamily.org/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
-checksum=11afef30a274be84696588583d5a1d65c8046934670f718c311c956ef7106f60
-python_version=2 #unverified
+checksum=44a2f62ca995e38d9e0874806956f0b9c3cc84ea89e0169a63849b63cd3b64bd
+python_version=3

From 5a1cee5e8696ce8d5d56d04fc1c4775dc7afc3bb Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Wed, 3 Feb 2021 11:24:24 -0300
Subject: [PATCH 0952/3482] rust-analyzer: update to 2021.02.01.

---
 srcpkgs/rust-analyzer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index bde944787c7e..716c1040d22d 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-analyzer'
 pkgname=rust-analyzer
-version=2021.01.18
+version=2021.02.01
 revision=1
 _ver=${version//./-}
 wrksrc="${pkgname}-${_ver}"
@@ -11,7 +11,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="Apache-2.0, MIT"
 homepage="https://rust-analyzer.github.io/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${_ver}.tar.gz"
-checksum=009ab946848719bb05bcaddab1cf5a75a45c5a92ae6dc31763adb42c3229f7db
+checksum=8e977cff0d64bed30c5f1f7945889e3fa76e6e55bfed882d1b4a5d2ffd9efc2c
 
 export RUST_ANALYZER_REV=${_ver}
 

From 8e733a5a160bb61081b8f3776c46a7a8a447c0e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 16:22:30 +0100
Subject: [PATCH 0953/3482] xar: add patch to fix compilation with OpenSSL >
 1.1

---
 srcpkgs/xar/patches/openssl1.1.patch | 54 ++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 srcpkgs/xar/patches/openssl1.1.patch

diff --git a/srcpkgs/xar/patches/openssl1.1.patch b/srcpkgs/xar/patches/openssl1.1.patch
new file mode 100644
index 000000000000..d718a3d4129c
--- /dev/null
+++ b/srcpkgs/xar/patches/openssl1.1.patch
@@ -0,0 +1,54 @@
+Reason: The OpenSSL_add_all_ciphers api doesn't was removed in OpenSSL 1.1
+so we just replace the check with something that exists in OpenSSL and LibreSSL
+
+---
+--- configure	2012-09-17 13:30:07.000000000 +0200
++++ -	2021-02-03 16:20:59.395787656 +0100
+@@ -4878,9 +4878,9 @@
+ 
+ done
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL_add_all_ciphers in -lcrypto" >&5
+-$as_echo_n "checking for OpenSSL_add_all_ciphers in -lcrypto... " >&6; }
+-if ${ac_cv_lib_crypto_OpenSSL_add_all_ciphers+:} false; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL_init_crypto in -lcrypto" >&5
++$as_echo_n "checking for OPENSSL_init_crypto in -lcrypto... " >&6; }
++if ${ac_cv_lib_crypto_OPENSSL_init_crypto+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -4894,27 +4894,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char OpenSSL_add_all_ciphers ();
++char OPENSSL_init_crypto ();
+ int
+ main ()
+ {
+-return OpenSSL_add_all_ciphers ();
++return OPENSSL_init_crypto ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_crypto_OpenSSL_add_all_ciphers=yes
++  ac_cv_lib_crypto_OPENSSL_init_crypto=yes
+ else
+-  ac_cv_lib_crypto_OpenSSL_add_all_ciphers=no
++  ac_cv_lib_crypto_OPENSSL_init_crypto=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_OpenSSL_add_all_ciphers" >&5
+-$as_echo "$ac_cv_lib_crypto_OpenSSL_add_all_ciphers" >&6; }
+-if test "x$ac_cv_lib_crypto_OpenSSL_add_all_ciphers" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_OPENSSL_init_crypto" >&5
++$as_echo "$ac_cv_lib_crypto_OPENSSL_init_crypto" >&6; }
++if test "x$ac_cv_lib_crypto_OPENSSL_init_crypto" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF

From 4197bf2f1760a76dc6a6a1fb1fc293b78f7aabd2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 3 Feb 2021 10:23:31 -0500
Subject: [PATCH 0954/3482] cpp-utilities: update to 5.10.1.

---
 srcpkgs/cpp-utilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index a833b0ddd56a..f79ec8e8a7e1 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.0
+version=5.10.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a0eed2901eff3785bec7e8395f427c8fe206af75960ca628f5fe277043e5c0ed
+checksum=bba073117fe2a16fb2cb277e69a8f9e9584d991543c8cfd75921afdf39ea3ec5
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"

From 72ee8af9510ed37cbafa416c2cb845be7c7d6768 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 3 Feb 2021 10:23:35 -0500
Subject: [PATCH 0955/3482] python3-tifffile: update to 2021.2.1.

---
 srcpkgs/python3-tifffile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index ba57570b081a..b7a4b5258ab6 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.1.14
+version=2021.2.1
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5af5c4e49ad2d6f0b04c43937b64a7e8101a9af306b6087181d8785c854792cb
+checksum=9ca215bbe6640b64d1c1f9d2762310f1e3e496630b00c51b7e0e9f9b4a993537
 
 post_install() {
 	vlicense LICENSE

From a696d4b8e3fd662f21c5dac2495fcdc662dfc620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 16:32:38 +0700
Subject: [PATCH 0956/3482] dracut: update to 051.

---
 ...-ask-no-warn-if-run-cryptsetup-exist.patch | 39 -------------
 .../patches/99squash-no-systemd-error.patch   | 13 +++++
 .../dracut/patches/better-arch-regex.patch    | 32 -----------
 .../patches/fix-early-microcode-non-x86.patch | 57 -------------------
 srcpkgs/dracut/patches/fix-ia32-uefi.patch    | 25 --------
 .../patches/ppcmac-respect-dracut-arch.patch  | 37 ------------
 srcpkgs/dracut/template                       | 11 ++--
 7 files changed, 18 insertions(+), 196 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
 create mode 100644 srcpkgs/dracut/patches/99squash-no-systemd-error.patch
 delete mode 100644 srcpkgs/dracut/patches/better-arch-regex.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-ia32-uefi.patch
 delete mode 100644 srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch

diff --git a/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch b/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
deleted file mode 100644
index 396fb7c05d45..000000000000
--- a/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2edc52848eaf2331cdcce64f92d8e76947c01a66 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Sat, 14 Mar 2020 11:44:47 +0700
-Subject: [PATCH] cryptroot-ask: no warn if /run/cryptsetup exist
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In either case:
-- encrypted device is decrypted, udev will trigger device changes again,
-- multiple encrypted device,
-
-cryptroot-ask will run multiple time, then report:
-> mkdir: cannot create directory '/run/cryptsetup': File exists
-
-Pass `-p` into mkdir to ignore that warning.
-
-Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
----
- modules.d/90crypt/cryptroot-ask.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git modules.d/90crypt/cryptroot-ask.sh modules.d/90crypt/cryptroot-ask.sh
-index e1f17975..97047ae9 100755
---- modules.d/90crypt/cryptroot-ask.sh
-+++ modules.d/90crypt/cryptroot-ask.sh
-@@ -8,7 +8,7 @@ NEWROOT=${NEWROOT:-"/sysroot"}
- 
- . /lib/dracut-lib.sh
- 
--mkdir -m 0700 /run/cryptsetup
-+mkdir -p -m 0700 /run/cryptsetup
- 
- # if device name is /dev/dm-X, convert to /dev/mapper/name
- if [ "${1##/dev/dm-}" != "$1" ]; then
--- 
-2.26.0.rc1.191.g7acaab7404
-
diff --git a/srcpkgs/dracut/patches/99squash-no-systemd-error.patch b/srcpkgs/dracut/patches/99squash-no-systemd-error.patch
new file mode 100644
index 000000000000..d93f6d895b17
--- /dev/null
+++ b/srcpkgs/dracut/patches/99squash-no-systemd-error.patch
@@ -0,0 +1,13 @@
+diff --git modules.d/99squash/module-setup.sh modules.d/99squash/module-setup.sh
+index 9a61a59d..96543a58 100644
+--- modules.d/99squash/module-setup.sh
++++ modules.d/99squash/module-setup.sh
+@@ -2,8 +2,7 @@
+ 
+ check() {
+     if ! dracut_module_included "systemd-initrd"; then
+-        derror "dracut-squash only supports systemd bases initramfs"
+         return 1
+     fi
+ 
+     if ! type -P mksquashfs >/dev/null || ! type -P unsquashfs >/dev/null ; then
diff --git a/srcpkgs/dracut/patches/better-arch-regex.patch b/srcpkgs/dracut/patches/better-arch-regex.patch
deleted file mode 100644
index 75d51034dff8..000000000000
--- a/srcpkgs/dracut/patches/better-arch-regex.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0e6859c98a90a1b44abc6f29ba64628afc1be7cb Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:29:23 +0200
-Subject: [PATCH 3/4] mkinitrd-dracut.sh: use vmlinux regex for ppc*, vmlinuz
- for i686
-
-Previously this would not catch ppc64le, now it does; same with
-i686.
----
- mkinitrd-dracut.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git mkinitrd-dracut.sh mkinitrd-dracut.sh
-index 82d90684..1ea3e514 100755
---- mkinitrd-dracut.sh
-+++ mkinitrd-dracut.sh
-@@ -57,10 +57,10 @@ default_kernel_images() {
-         s390|s390x)
-             regex='image'
-             ;;
--        ppc|ppc64)
-+        ppc*)
-             regex='vmlinux'
-             ;;
--        i386|x86_64)
-+        i*86|x86_64)
-             regex='vmlinuz'
-             ;;
-         arm*)
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch b/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
deleted file mode 100644
index 406e695f9a22..000000000000
--- a/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d690d736a71e18711b94098da24f56b392c7e6f7 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:28:16 +0200
-Subject: [PATCH 2/4] dracut.sh: fix early microcode detection logic
-
-This fixes two issues:
-
-1) on non-x86 systems in non-hostonly config this would cause
-   an annoying warning on every initramfs generation
-2) on non-x86 systems in hostonly config this would result in
-   early microcode not getting disabled
----
- dracut.sh | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git dracut.sh dracut.sh
-index 58ff24d1..cd3fcbe2 100755
---- dracut.sh
-+++ dracut.sh
-@@ -1194,19 +1194,26 @@ fi
- 
- if [[ $early_microcode = yes ]]; then
-     if [[ $hostonly ]]; then
--        [[ $(get_cpu_vendor) == "AMD" ]] \
--            && ! check_kernel_config CONFIG_MICROCODE_AMD \
--            && unset early_microcode
--        [[ $(get_cpu_vendor) == "Intel" ]] \
--            && ! check_kernel_config CONFIG_MICROCODE_INTEL \
--            && unset early_microcode
-+        if [[ $(get_cpu_vendor) == "AMD" ]]; then
-+            check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
-+        elif [[ $(get_cpu_vendor) == "Intel" ]]; then
-+            check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
-+        else
-+            unset early_microcode
-+        fi
-     else
-         ! check_kernel_config CONFIG_MICROCODE_AMD \
-             && ! check_kernel_config CONFIG_MICROCODE_INTEL \
-             && unset early_microcode
-     fi
--    [[ $early_microcode != yes ]] \
--        && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+    # Do not complain on non-x86 architectures as it makes no sense
-+    case $(uname -m) in
-+        x86_64|i*86)
-+            [[ $early_microcode != yes ]] \
-+                && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+            ;;
-+        *) ;;
-+    esac
- fi
- 
- # Need to be able to have non-root users read stuff (rpcbind etc)
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/fix-ia32-uefi.patch b/srcpkgs/dracut/patches/fix-ia32-uefi.patch
deleted file mode 100644
index b4a79092d69f..000000000000
--- a/srcpkgs/dracut/patches/fix-ia32-uefi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e1bce654f1bd739cf1f975ff0a1f766221c3d4ee Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:20:40 +0200
-Subject: [PATCH 1/4] dracut.sh: fix ia32 detection for uefi executables
-
----
- dracut.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git dracut.sh dracut.sh
-index e3195499..58ff24d1 100755
---- dracut.sh
-+++ dracut.sh
-@@ -1153,7 +1153,7 @@ if [[ ! $print_cmdline ]]; then
-         case $(uname -m) in
-             x86_64)
-                 EFI_MACHINE_TYPE_NAME=x64;;
--            ia32)
-+            i*86)
-                 EFI_MACHINE_TYPE_NAME=ia32;;
-             *)
-                 dfatal "Architecture '$(uname -m)' not supported to create a UEFI executable"
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch b/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch
deleted file mode 100644
index b569572a6bc2..000000000000
--- a/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c26b5c7559c297aaa6c78787fa8de18bbf090205 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:47:00 +0200
-Subject: [PATCH 4/4] 90ppcmac: respect DRACUT_ARCH, don't exclude ppcle
-
----
- modules.d/90ppcmac/module-setup.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git modules.d/90ppcmac/module-setup.sh modules.d/90ppcmac/module-setup.sh
-index 59221ec4..7199dd9b 100644
---- modules.d/90ppcmac/module-setup.sh
-+++ modules.d/90ppcmac/module-setup.sh
-@@ -17,9 +17,9 @@
- 
- # called by dracut
- check() {
--    local _arch="$(uname -m)"
-+    local _arch=${DRACUT_ARCH:-$(uname -m)}
-     # only for PowerPC Macs
--    [[ "$_arch" == ppc* && "$_arch" != ppc*le ]] || return 1
-+    [[ "$_arch" == ppc* && "$_arch" != ppc64le ]] || return 1
-     return 0
- }
- 
-@@ -36,7 +36,7 @@ installkernel() {
-     }
- 
-     # only PowerMac3,6 has a module, special case
--    if [[ "$(uname -m)" == ppc ]]; then
-+    if [[ "${DRACUT_ARCH:-$(uname -m)}" != ppc64* ]]; then
-         if ! [[ $hostonly ]] || [[ "$(pmac_model)" == "PowerMac3,6" ]]; then
-             instmods therm_windtunnel
-         fi
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 53cee6c4ff2c..d58e168497d5 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,19 @@
 # Template file for 'dracut'
 pkgname=dracut
-version=050
-revision=10
+version=051
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-# XXX: docbook-xml was added to sort builders out, can be removed
-hostmakedepends="asciidoc docbook-xml pkg-config"
+hostmakedepends="pkg-config"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"
-distfiles="https://github.com/dracutdevs/dracut/archive/${version}.tar.gz"
-checksum=f9dbf18597e5929221365964293212c8c9ffb7d84529c5a338c834ecab06e333
+distfiles="${KERNEL_SITE}/utils/boot/dracut/dracut-${version}.tar.xz"
+checksum=95bc2586b771e3f4ab5c8637201732a137bb682395d25ab496374241091906e3
 subpackages="dracut-network"
 
 make_dirs="

From 8ba412eef40d23531d19c54fa3a2916cee71c4da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 16:41:25 +0700
Subject: [PATCH 0957/3482] nvme-cli: fix dracut 051 warning

---
 srcpkgs/nvme-cli/patches/dracut-warning.patch | 5 +++++
 srcpkgs/nvme-cli/template                     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvme-cli/patches/dracut-warning.patch

diff --git a/srcpkgs/nvme-cli/patches/dracut-warning.patch b/srcpkgs/nvme-cli/patches/dracut-warning.patch
new file mode 100644
index 000000000000..966ce6c0ec9f
--- /dev/null
+++ b/srcpkgs/nvme-cli/patches/dracut-warning.patch
@@ -0,0 +1,5 @@
+--- nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in.orig	2021-01-24 16:37:06.346511231 +0700
++++ nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in	2021-01-24 16:38:01.351158511 +0700
+@@ -1 +1 @@
+-install_items+="@@UDEVRULESDIR@@/70-nvmf-autoconnect.rules"
++install_items+=" @@UDEVRULESDIR@@/70-nvmf-autoconnect.rules "
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index 8a731eae2089..0da50f2663ef 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
 version=1.13
-revision=1
+revision=2
 build_style=gnu-makefile
 # yeah, it must be 0 to enable
 make_build_args="LIBUUID=0"

From 3cf4ac92a1b3df6c3f4265a7df3b12095c9f7c40 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 3 Feb 2021 16:45:00 +0100
Subject: [PATCH 0958/3482] bottom: update to 0.5.7.

---
 srcpkgs/bottom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bottom/template b/srcpkgs/bottom/template
index b7065802fa72..9d5fbd8dbfd0 100644
--- a/srcpkgs/bottom/template
+++ b/srcpkgs/bottom/template
@@ -1,6 +1,6 @@
 # Template file for 'bottom'
 pkgname=bottom
-version=0.5.6
+version=0.5.7
 revision=1
 build_style=cargo
 short_desc="Yet another cross-platform graphical process/system monitor"
@@ -8,7 +8,7 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="MIT"
 homepage="https://github.com/ClementTsang/bottom"
 distfiles="https://github.com/ClementTsang/bottom/archive/${version}.tar.gz"
-checksum=e6b41796cd54dcf67c8b265a81db8275d8557c6b41a48b9ded0a99ce9f9c0d2c
+checksum=49e01a2930d913dba2a1329389faddb4b3971a6b0c08f7482d2759475d5cc27c
 
 post_install() {
 	vdoc README.md

From 194096f1ac04c9b21a2b1b3fe12680214606189f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 17:14:25 +0100
Subject: [PATCH 0959/3482] wvstreams: update patchset to also support OpenSSL
 1.1

---
 srcpkgs/wvstreams/patches/libressl.patch      |  52 --
 srcpkgs/wvstreams/patches/tripledes.patch     |  19 -
 .../wvstreams-4.6.1-openssl-1.1.0.patch       | 533 ++++++++++++++++++
 3 files changed, 533 insertions(+), 71 deletions(-)
 delete mode 100644 srcpkgs/wvstreams/patches/libressl.patch
 delete mode 100644 srcpkgs/wvstreams/patches/tripledes.patch
 create mode 100644 srcpkgs/wvstreams/patches/wvstreams-4.6.1-openssl-1.1.0.patch

diff --git a/srcpkgs/wvstreams/patches/libressl.patch b/srcpkgs/wvstreams/patches/libressl.patch
deleted file mode 100644
index e6e51b2e7a67..000000000000
--- a/srcpkgs/wvstreams/patches/libressl.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- crypto/wvx509.cc.orig	2019-05-16 20:25:58.171570222 +0200
-+++ crypto/wvx509.cc	2019-05-16 20:26:15.784410788 +0200
-@@ -974,7 +974,7 @@
-     sk_ACCESS_DESCRIPTION_push(ainfo, acc);
-     acc->method = OBJ_txt2obj(type.cstr(), 0);
-     acc->location->type = GEN_URI;
--    acc->location->d.ia5 = M_ASN1_IA5STRING_new();
-+    acc->location->d.ia5 = ASN1_IA5STRING_new();
-     unsigned char *cident 
- 	= reinterpret_cast<unsigned char *>(identifier.edit());
-     ASN1_STRING_set(acc->location->d.ia5, cident, identifier.len());
-@@ -1059,7 +1059,7 @@
-         GENERAL_NAMES *uris = GENERAL_NAMES_new();
-         GENERAL_NAME *uri = GENERAL_NAME_new();
-         uri->type = GEN_URI;
--        uri->d.ia5 = M_ASN1_IA5STRING_new();
-+        uri->d.ia5 = ASN1_IA5STRING_new();
-         unsigned char *cident
- 	    = reinterpret_cast<unsigned char *>(i().edit());    
-         ASN1_STRING_set(uri->d.ia5, cident, i().len());
-@@ -1130,7 +1130,7 @@
- 	pol->qualifiers = sk_POLICYQUALINFO_new_null();
- 	qual = POLICYQUALINFO_new();
- 	qual->pqualid = OBJ_nid2obj(NID_id_qt_cps);
--	qual->d.cpsouri = M_ASN1_IA5STRING_new();
-+	qual->d.cpsouri = ASN1_IA5STRING_new();
- 	ASN1_STRING_set(qual->d.cpsuri, url.edit(), url.len());
- 	sk_POLICYQUALINFO_push(pol->qualifiers, qual);
-     }
-@@ -1450,19 +1450,19 @@
- {
-     CHECK_CERT_EXISTS_SET("ski");
- 
--    ASN1_OCTET_STRING *oct = M_ASN1_OCTET_STRING_new();
-+    ASN1_OCTET_STRING *oct = ASN1_OCTET_STRING_new();
-     ASN1_BIT_STRING *pk = cert->cert_info->key->public_key;
-     unsigned char pkey_dig[EVP_MAX_MD_SIZE];
-     unsigned int diglen;
- 
-     EVP_Digest(pk->data, pk->length, pkey_dig, &diglen, EVP_sha1(), NULL);
- 
--    M_ASN1_OCTET_STRING_set(oct, pkey_dig, diglen);
-+    ASN1_OCTET_STRING_set(oct, pkey_dig, diglen);
-     X509_EXTENSION *ext = X509V3_EXT_i2d(NID_subject_key_identifier, 0, 
- 					oct);
-     X509_add_ext(cert, ext, -1);
-     X509_EXTENSION_free(ext);
--    M_ASN1_OCTET_STRING_free(oct);
-+    ASN1_OCTET_STRING_free(oct);
- }
- 
- 
diff --git a/srcpkgs/wvstreams/patches/tripledes.patch b/srcpkgs/wvstreams/patches/tripledes.patch
deleted file mode 100644
index a1e6df691b67..000000000000
--- a/srcpkgs/wvstreams/patches/tripledes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- include/wvtripledes.h.old	2014-12-11 01:53:28.157613918 +0100
-+++ include/wvtripledes.h	2014-12-11 01:53:46.005612583 +0100
-@@ -70,11 +70,11 @@ protected:
- 
- private:
-     Mode mode;
--    des_cblock key;
--    des_key_schedule deskey1;
--    des_key_schedule deskey2;
--    des_key_schedule deskey3;
--    des_cblock ivec; // initialization vector
-+    DES_cblock key;
-+    DES_key_schedule deskey1;
-+    DES_key_schedule deskey2;
-+    DES_key_schedule deskey3;
-+    DES_cblock ivec; // initialization vector
-     int ivecoff; // current offset into initvec
- };
- 
diff --git a/srcpkgs/wvstreams/patches/wvstreams-4.6.1-openssl-1.1.0.patch b/srcpkgs/wvstreams/patches/wvstreams-4.6.1-openssl-1.1.0.patch
new file mode 100644
index 000000000000..d080f69f9af6
--- /dev/null
+++ b/srcpkgs/wvstreams/patches/wvstreams-4.6.1-openssl-1.1.0.patch
@@ -0,0 +1,533 @@
+diff --git crypto/wvcrl.cc crypto/wvcrl.cc
+index fa00c76..880ad85 100644
+--- crypto/wvcrl.cc
++++ crypto/wvcrl.cc
+@@ -357,31 +357,19 @@ bool WvCRL::isrevoked(WvStringParm serial_number) const
+ 	ASN1_INTEGER *serial = serial_to_int(serial_number);
+ 	if (serial)
+ 	{
+-	    X509_REVOKED mayberevoked;
+-	    mayberevoked.serialNumber = serial;
+-	    if (crl->crl->revoked)
+-	    {
+-		int idx = sk_X509_REVOKED_find(crl->crl->revoked, 
+-					       &mayberevoked);
+-		ASN1_INTEGER_free(serial);
+-		if (idx >= 0)
+-                {
+-                    debug("Certificate is revoked.\n");
+-		    return true;
+-                }
+-                else
+-                {
+-                    debug("Certificate is not revoked.\n");
+-		    return false;
+-                }
+-	    }
+-	    else
+-	    {
+-		ASN1_INTEGER_free(serial);
+-		debug("CRL does not have revoked list.\n");
+-                return false;
+-	    }
+-	    
++	    X509_REVOKED *revoked_entry = NULL;
++	    int idx = X509_CRL_get0_by_serial(crl, &revoked_entry, serial);
++	    ASN1_INTEGER_free(serial);
++	    if (idx >= 1 || revoked_entry)
++            {
++                debug("Certificate is revoked.\n");
++	        return true;
++            }
++            else
++            {
++                debug("Certificate is not revoked.\n");
++	        return false;
++            }
+ 	}
+ 	else
+ 	    debug(WvLog::Warning, "Can't convert serial number to ASN1 format. "
+diff --git crypto/wvdiffiehellman.cc crypto/wvdiffiehellman.cc
+index 7c0bf32..15cd104 100644
+--- crypto/wvdiffiehellman.cc
++++ crypto/wvdiffiehellman.cc
+@@ -39,24 +39,25 @@ WvDiffieHellman::WvDiffieHellman(const unsigned char *_key, int _keylen,
+ {
+     int problems;
+     int check;
+-    {
++
+ 	info = DH_new();
+-	info->p = BN_bin2bn(_key, _keylen, NULL);
++	BIGNUM *p = BN_bin2bn(_key, _keylen, NULL);
+ // 	info->p->top = 0;
+ // 	info->p->dmax = _keylen * 8 / BN_BITS2;
+ // 	info->p->neg = 0;
+ // 	info->p->flags = 0;
+ 
+-	info->g = BN_new();
+-	BN_set_word(info->g, generator);
++	BIGNUM *g = BN_new();
++	BN_set_word(g, generator);
+ // 	info->g->d = &generator;
+ //  	info->g->top = 0;
+ //  	info->g->dmax = 1;
+ //  	info->g->neg = 0;
+ //  	info->g->flags = 0;
+-    }
+ 
+-    check = BN_mod_word(info->p, 24);
++	DH_set0_pqg(info, p, NULL, g);
++
++    check = BN_mod_word(p, 24);
+     DH_check(info, &problems);
+     if (problems & DH_CHECK_P_NOT_PRIME)
+  	log(WvLog::Error, "Using a composite number for authentication.\n");
+@@ -64,7 +65,7 @@ WvDiffieHellman::WvDiffieHellman(const unsigned char *_key, int _keylen,
+ 	log(WvLog::Error,"Using an unsafe prime number for authentication.\n");
+     if (problems & DH_NOT_SUITABLE_GENERATOR)
+ 	log(WvLog::Error, "Can you just use 2 instead of %s (%s)!!\n",
+-	    BN_bn2hex(info->g), check);
++	    BN_bn2hex(g), check);
+     if (problems & DH_UNABLE_TO_CHECK_GENERATOR)
+ 	log(WvLog::Notice, "Using a strange argument for diffie-hellman.\n");
+     DH_generate_key(info);
+@@ -72,18 +73,23 @@ WvDiffieHellman::WvDiffieHellman(const unsigned char *_key, int _keylen,
+ 
+ int WvDiffieHellman::pub_key_len()
+ {
+-    return BN_num_bytes(info->pub_key);
++    const BIGNUM *pub_key = NULL;
++	DH_get0_key(info, &pub_key, NULL);
++    return BN_num_bytes(pub_key);
+ }
+ 
+ int WvDiffieHellman::get_public_value(WvBuf &outbuf, int len)
+ {
+-    int key_len = BN_num_bytes(info->pub_key);
++	const BIGNUM *pub_key = NULL;
++	DH_get0_key(info, &pub_key, NULL);
++
++    int key_len = BN_num_bytes(pub_key);
+     if (key_len < len)
+ 	len = key_len;
+ 
+     // alloca is stack allocated, don't free it.
+     unsigned char *foo = (unsigned char*)alloca(key_len);
+-    BN_bn2bin(info->pub_key, foo);
++    BN_bn2bin(pub_key, foo);
+     outbuf.put(foo, len);
+ 
+     return len;
+@@ -91,8 +97,10 @@ int WvDiffieHellman::get_public_value(WvBuf &outbuf, int len)
+ 
+ bool WvDiffieHellman::create_secret(WvBuf &inbuf, size_t in_len, WvBuf& outbuf)
+ {
++   const BIGNUM *pub_key = NULL;
++   DH_get0_key(info, &pub_key, NULL);
+     unsigned char *foo = (unsigned char *)alloca(DH_size(info));
+-   log("My public value\n%s\nYour public value\n%s\n",BN_bn2hex(info->pub_key),
++   log("My public value\n%s\nYour public value\n%s\n",BN_bn2hex(pub_key),
+        hexdump_buffer(inbuf.peek(0, in_len), in_len, false));
+     int len = DH_compute_key (foo, BN_bin2bn(inbuf.get(in_len), in_len, NULL), 
+ 			      info);
+diff --git crypto/wvdigest.cc crypto/wvdigest.cc
+index 150edee..73ebb5d 100644
+--- crypto/wvdigest.cc
++++ crypto/wvdigest.cc
+@@ -13,10 +13,10 @@
+ 
+ /***** WvEVPMDDigest *****/
+ 
+-WvEVPMDDigest::WvEVPMDDigest(const env_md_st *_evpmd) :
++WvEVPMDDigest::WvEVPMDDigest(const EVP_MD*_evpmd) :
+     evpmd(_evpmd), active(false)
+ {
+-    evpctx = new EVP_MD_CTX;
++    evpctx = EVP_MD_CTX_new();
+     _reset();
+ }
+ 
+@@ -24,7 +24,7 @@ WvEVPMDDigest::WvEVPMDDigest(const env_md_st *_evpmd) :
+ WvEVPMDDigest::~WvEVPMDDigest()
+ {
+     cleanup();
+-    delete evpctx;
++    EVP_MD_CTX_free(evpctx);
+ }
+ 
+ 
+@@ -60,7 +60,7 @@ bool WvEVPMDDigest::_reset()
+     // the typecast is necessary for API compatibility with different
+     // versions of openssl.  None of them *actually* change the contents of
+     // the pointer.
+-    EVP_DigestInit(evpctx, (env_md_st *)evpmd);
++    EVP_DigestInit(evpctx, evpmd);
+     active = true;
+     return true;
+ }
+@@ -79,7 +79,7 @@ void WvEVPMDDigest::cleanup()
+ 
+ size_t WvEVPMDDigest::digestsize() const
+ {
+-    return EVP_MD_size((env_md_st *)evpmd);
++    return EVP_MD_size(evpmd);
+ }
+ 
+ 
+@@ -104,14 +104,14 @@ WvHMACDigest::WvHMACDigest(WvEVPMDDigest *_digest,
+ {
+     key = new unsigned char[keysize];
+     memcpy(key, _key, keysize);
+-    hmacctx = new HMAC_CTX;
++    hmacctx = HMAC_CTX_new();
+     _reset();
+ }
+ 
+ WvHMACDigest::~WvHMACDigest()
+ {
+     cleanup();
+-    delete hmacctx;
++    HMAC_CTX_free(hmacctx);
+     deletev key;
+     delete digest;
+ }
+@@ -145,7 +145,7 @@ bool WvHMACDigest::_finish(WvBuf &outbuf)
+ bool WvHMACDigest::_reset()
+ {
+     cleanup();
+-    HMAC_Init(hmacctx, key, keysize, (env_md_st *)digest->getevpmd());
++    HMAC_Init(hmacctx, key, keysize, digest->getevpmd());
+     active = true;
+     return true;
+ }
+diff --git crypto/wvocsp.cc crypto/wvocsp.cc
+index ddb2de4..8325ff2 100644
+--- crypto/wvocsp.cc
++++ crypto/wvocsp.cc
+@@ -118,9 +118,10 @@ bool WvOCSPResp::check_nonce(const WvOCSPReq &req) const
+ 
+ bool WvOCSPResp::signedbycert(const WvX509 &cert) const
+ {
+-    EVP_PKEY *skey = X509_get_pubkey(cert.cert);
+-    int i = OCSP_BASICRESP_verify(bs, skey, 0);
+-    EVP_PKEY_free(skey);
++    STACK_OF(X509) *sk = sk_X509_new_null();
++    sk_X509_push(sk, cert.cert);
++    int i = OCSP_basic_verify(bs, sk, NULL, OCSP_NOVERIFY);
++    sk_X509_free(sk);
+ 
+     if(i > 0)
+         return true;
+@@ -131,6 +132,7 @@ bool WvOCSPResp::signedbycert(const WvX509 &cert) const
+ 
+ WvX509 WvOCSPResp::get_signing_cert() const
+ {
++#ifdef LIBRESSL_VERSION_NUMBER
+     if (!bs || !sk_X509_num(bs->certs))
+         return WvX509();
+ 
+@@ -159,6 +161,18 @@ WvX509 WvOCSPResp::get_signing_cert() const
+     }
+     
+     return WvX509();
++#else
++    const STACK_OF(X509) *certs = OCSP_resp_get0_certs(bs);
++    if (!bs || !sk_X509_num(certs))
++        return WvX509();
++
++    X509 *signer = NULL;
++    if (OCSP_resp_get0_signer(bs, &signer, NULL) == 1) {
++        return WvX509(X509_dup(signer));
++    }
++
++    return WvX509();
++#endif
+ }
+ 
+ 
+diff --git crypto/wvx509.cc crypto/wvx509.cc
+index e9dad0b..a9a47bc 100644
+--- crypto/wvx509.cc
++++ crypto/wvx509.cc
+@@ -974,7 +974,7 @@ static void add_aia(WvStringParm type, WvString identifier,
+     sk_ACCESS_DESCRIPTION_push(ainfo, acc);
+     acc->method = OBJ_txt2obj(type.cstr(), 0);
+     acc->location->type = GEN_URI;
+-    acc->location->d.ia5 = M_ASN1_IA5STRING_new();
++    acc->location->d.ia5 = ASN1_IA5STRING_new();
+     unsigned char *cident 
+ 	= reinterpret_cast<unsigned char *>(identifier.edit());
+     ASN1_STRING_set(acc->location->d.ia5, cident, identifier.len());
+@@ -1059,7 +1059,7 @@ void WvX509::set_crl_urls(WvStringList &urls)
+         GENERAL_NAMES *uris = GENERAL_NAMES_new();
+         GENERAL_NAME *uri = GENERAL_NAME_new();
+         uri->type = GEN_URI;
+-        uri->d.ia5 = M_ASN1_IA5STRING_new();
++        uri->d.ia5 = ASN1_IA5STRING_new();
+         unsigned char *cident
+ 	    = reinterpret_cast<unsigned char *>(i().edit());    
+         ASN1_STRING_set(uri->d.ia5, cident, i().len());
+@@ -1162,10 +1162,11 @@ WvString WvX509::get_extension(int nid) const
+ #else
+             X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
+ #endif
++            ASN1_OCTET_STRING *ext_data_str = X509_EXTENSION_get_data(ext);
+             if (!method)
+             {
+                 WvDynBuf buf;
+-                buf.put(ext->value->data, ext->value->length);
++                buf.put(ext_data_str->data, ext_data_str->length);
+                 retval = buf.getstr();
+             }
+             else
+@@ -1176,21 +1177,21 @@ WvString WvX509::get_extension(int nid) const
+                 // even though it's const (at least as of version 0.9.8e). 
+                 // gah.
+ #if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+-                const unsigned char * ext_value_data = ext->value->data;
++                const unsigned char * ext_value_data = ext_data_str->data;
+ #else
+                 unsigned char *ext_value_data = ext->value->data;
+ #endif
+                 if (method->it)
+                 {
+                     ext_data = ASN1_item_d2i(NULL, &ext_value_data,
+-                                             ext->value->length, 
++                                             ext_data_str->length, 
+                                              ASN1_ITEM_ptr(method->it));
+                     TRACE("Applied generic conversion!\n");
+                 }
+                 else
+                 {
+                     ext_data = method->d2i(NULL, &ext_value_data,
+-                                           ext->value->length);
++                                           ext_data_str->length);
+                     TRACE("Applied method specific conversion!\n");
+                 }
+                 
+@@ -1325,13 +1326,13 @@ bool WvX509::verify(WvBuf &original, WvStringParm signature) const
+         return false;
+     
+     /* Verify the signature */
+-    EVP_MD_CTX sig_ctx;
+-    EVP_VerifyInit(&sig_ctx, EVP_sha1());
+-    EVP_VerifyUpdate(&sig_ctx, original.peek(0, original.used()),
++    EVP_MD_CTX *sig_ctx = EVP_MD_CTX_new();
++    EVP_VerifyInit(sig_ctx, EVP_sha1());
++    EVP_VerifyUpdate(sig_ctx, original.peek(0, original.used()),
+ 		     original.used());
+-    int sig_err = EVP_VerifyFinal(&sig_ctx, sig_buf, sig_size, pk);
++    int sig_err = EVP_VerifyFinal(sig_ctx, sig_buf, sig_size, pk);
+     EVP_PKEY_free(pk);
+-    EVP_MD_CTX_cleanup(&sig_ctx); // Again, not my fault... 
++    EVP_MD_CTX_free(sig_ctx); // Again, not my fault... 
+     if (sig_err != 1) 
+     {
+         debug("Verify failed!\n");
+@@ -1450,19 +1451,19 @@ void WvX509::set_ski()
+ {
+     CHECK_CERT_EXISTS_SET("ski");
+ 
+-    ASN1_OCTET_STRING *oct = M_ASN1_OCTET_STRING_new();
+-    ASN1_BIT_STRING *pk = cert->cert_info->key->public_key;
++    ASN1_OCTET_STRING *oct = ASN1_OCTET_STRING_new();
++    ASN1_BIT_STRING *pk = X509_get0_pubkey_bitstr(cert);
+     unsigned char pkey_dig[EVP_MAX_MD_SIZE];
+     unsigned int diglen;
+ 
+     EVP_Digest(pk->data, pk->length, pkey_dig, &diglen, EVP_sha1(), NULL);
+ 
+-    M_ASN1_OCTET_STRING_set(oct, pkey_dig, diglen);
++    ASN1_OCTET_STRING_set(oct, pkey_dig, diglen);
+     X509_EXTENSION *ext = X509V3_EXT_i2d(NID_subject_key_identifier, 0, 
+ 					oct);
+     X509_add_ext(cert, ext, -1);
+     X509_EXTENSION_free(ext);
+-    M_ASN1_OCTET_STRING_free(oct);
++    ASN1_OCTET_STRING_free(oct);
+ }
+ 
+ 
+diff --git crypto/wvx509mgr.cc crypto/wvx509mgr.cc
+index f249eec..b504a9f 100644
+--- crypto/wvx509mgr.cc
++++ crypto/wvx509mgr.cc
+@@ -350,6 +350,13 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const
+         return false;
+     }
+ 
++#ifdef LIBRESSL_VERSION_NUMBER
++    uint32_t ex_flags = cert->ex_flags;
++    uint32_t ex_kusage = cert->ex_kusage;
++#else
++    uint32_t ex_flags = X509_get_extension_flags(cert);
++    uint32_t ex_kusage = X509_get_key_usage(cert);
++#endif
+     if (cert == unsignedcert.cert)
+     {
+ 	debug("Self Signing!\n");
+@@ -362,8 +369,8 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const
+         return false;
+     }
+ #endif
+-    else if (!((cert->ex_flags & EXFLAG_KUSAGE) && 
+-               (cert->ex_kusage & KU_KEY_CERT_SIGN)))
++    else if (!((ex_flags & EXFLAG_KUSAGE) &&
++               (ex_kusage & KU_KEY_CERT_SIGN)))
+     {
+ 	debug("This Certificate is not allowed to sign certificates!\n");
+ 	return false;
+@@ -390,6 +397,13 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const
+ 
+ bool WvX509Mgr::signcrl(WvCRL &crl) const
+ {
++#ifdef LIBRESSL_VERSION_NUMBER
++    uint32_t ex_flags = cert->ex_flags;
++    uint32_t ex_kusage = cert->ex_kusage;
++#else
++    uint32_t ex_flags = X509_get_extension_flags(cert);
++    uint32_t ex_kusage = X509_get_key_usage(cert);
++#endif
+     if (!isok() || !crl.isok())
+     {
+         debug(WvLog::Warning, "Asked to sign CRL, but certificate or CRL (or "
+@@ -403,12 +417,12 @@ bool WvX509Mgr::signcrl(WvCRL &crl) const
+               "CRLs!\n");
+         return false;
+     }
+-    else if (!((cert->ex_flags & EXFLAG_KUSAGE) && 
+-	  (cert->ex_kusage & KU_CRL_SIGN)))
++    else if (!((ex_flags & EXFLAG_KUSAGE) &&
++	  (ex_kusage & KU_CRL_SIGN)))
+     {
+ 	debug("Certificate not allowed to sign CRLs! (%s %s)\n", 
+-              (cert->ex_flags & EXFLAG_KUSAGE),
+-	      (cert->ex_kusage & KU_CRL_SIGN));
++              (ex_flags & EXFLAG_KUSAGE),
++	      (ex_kusage & KU_CRL_SIGN));
+ 	return false;
+     }
+ #endif
+@@ -454,7 +468,6 @@ WvString WvX509Mgr::sign(WvBuf &data) const
+ {
+     assert(rsa);
+ 
+-    EVP_MD_CTX sig_ctx;
+     unsigned char sig_buf[4096];
+     
+     EVP_PKEY *pk = EVP_PKEY_new();
+@@ -467,20 +480,22 @@ WvString WvX509Mgr::sign(WvBuf &data) const
+ 	return WvString::null;
+     }
+     
+-    EVP_SignInit(&sig_ctx, EVP_sha1());
+-    EVP_SignUpdate(&sig_ctx, data.peek(0, data.used()), data.used());
++    EVP_MD_CTX *sig_ctx = EVP_MD_CTX_new();
++    EVP_SignInit(sig_ctx, EVP_sha1());
++    EVP_SignUpdate(sig_ctx, data.peek(0, data.used()), data.used());
+     unsigned int sig_len = sizeof(sig_buf);
+-    int sig_err = EVP_SignFinal(&sig_ctx, sig_buf, 
++    int sig_err = EVP_SignFinal(sig_ctx, sig_buf,
+ 				&sig_len, pk);
+     if (sig_err != 1)
+     {
+ 	debug("Error while signing.\n");
+ 	EVP_PKEY_free(pk);
++	EVP_MD_CTX_free(sig_ctx);
+ 	return WvString::null;
+     }
+ 
+     EVP_PKEY_free(pk);
+-    EVP_MD_CTX_cleanup(&sig_ctx); // this isn't my fault ://
++    EVP_MD_CTX_free(sig_ctx); // this isn't my fault ://
+     WvDynBuf buf;
+     buf.put(sig_buf, sig_len);
+     debug("Signature size: %s\n", buf.used());
+diff --git include/wvdiffiehellman.h include/wvdiffiehellman.h
+index af75ffa..a2d001f 100644
+--- include/wvdiffiehellman.h
++++ include/wvdiffiehellman.h
+@@ -27,7 +27,7 @@ public:
+     bool create_secret(WvBuf &inbuf, size_t in_len, WvBuf& outbuf);
+ 
+ protected:
+-    struct dh_st *info;
++    DH *info;
+     BN_ULONG generator;
+ 
+ private:
+diff --git include/wvdigest.h include/wvdigest.h
+index fdc39bd..ce41dd8 100644
+--- include/wvdigest.h
++++ include/wvdigest.h
+@@ -9,10 +9,8 @@
+ 
+ #include "wvencoder.h"
+ #include <stdint.h>
+-
+-struct env_md_st;
+-struct env_md_ctx_st;
+-struct hmac_ctx_st;
++#include <openssl/evp.h>
++#include <openssl/hmac.h>
+ 
+ /**
+  * Superclass for all message digests.
+@@ -45,8 +43,8 @@ public:
+ class WvEVPMDDigest : public WvDigest
+ {
+     friend class WvHMACDigest;
+-    const env_md_st *evpmd;
+-    env_md_ctx_st *evpctx;
++    const EVP_MD *evpmd;
++    EVP_MD_CTX *evpctx;
+     bool active;
+ 
+ public:
+@@ -54,13 +52,13 @@ public:
+     virtual size_t digestsize() const;
+ 
+ protected:
+-    WvEVPMDDigest(const env_md_st *_evpmd);
++    WvEVPMDDigest(const EVP_MD *_evpmd);
+     virtual bool _encode(WvBuf &inbuf, WvBuf &outbuf,
+         bool flush); // consumes input
+     virtual bool _finish(WvBuf &outbuf); // outputs digest
+     virtual bool _reset(); // supported: resets digest value
+     
+-    const env_md_st *getevpmd()
++    const EVP_MD *getevpmd()
+         { return evpmd; }
+ 
+ private:
+@@ -104,7 +102,7 @@ class WvHMACDigest : public WvDigest
+     WvEVPMDDigest *digest;
+     unsigned char *key;
+     size_t keysize;
+-    hmac_ctx_st *hmacctx;
++    HMAC_CTX *hmacctx;
+     bool active;
+ 
+ public:
+diff --git include/wvtripledes.h include/wvtripledes.h
+index 185fe8a..a442e7a 100644
+--- include/wvtripledes.h
++++ include/wvtripledes.h
+@@ -70,11 +70,11 @@ protected:
+ 
+ private:
+     Mode mode;
+-    des_cblock key;
+-    des_key_schedule deskey1;
+-    des_key_schedule deskey2;
+-    des_key_schedule deskey3;
+-    des_cblock ivec; // initialization vector
++    DES_cblock key;
++    DES_key_schedule deskey1;
++    DES_key_schedule deskey2;
++    DES_key_schedule deskey3;
++    DES_cblock ivec; // initialization vector
+     int ivecoff; // current offset into initvec
+ };
+ 

From 732d873372c74e5918877e8ec21ba6944a884229 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 17:25:34 +0100
Subject: [PATCH 0960/3482] vpn-ws: add OpenSSL patch

---
 srcpkgs/vpn-ws/patches/openssl.patch | 52 ++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 srcpkgs/vpn-ws/patches/openssl.patch

diff --git a/srcpkgs/vpn-ws/patches/openssl.patch b/srcpkgs/vpn-ws/patches/openssl.patch
new file mode 100644
index 000000000000..65c421a2f00e
--- /dev/null
+++ b/srcpkgs/vpn-ws/patches/openssl.patch
@@ -0,0 +1,52 @@
+From a9d297969457e4f1a835e7481ddcbb4a2241692b Mon Sep 17 00:00:00 2001
+From: Peter Nikolow <peter@mobiliodevelopment.com>
+Date: Fri, 29 Jan 2021 13:24:58 +0200
+Subject: [PATCH 2/3] Update ssl.c
+
+Fixing OpenSSL 1.1 deprecation of OPENSSL_config
+---
+ src/ssl.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/ssl.c b/src/ssl.c
+index 4f0405c..996e9b0 100644
+--- src/ssl.c
++++ src/ssl.c
+@@ -225,7 +225,11 @@ static SSL_CTX *ssl_ctx = NULL;
+ 
+ void *vpn_ws_ssl_handshake(vpn_ws_peer *peer, char *sni, char *key, char *crt) {
+ 	if (!ssl_initialized) {
+-		OPENSSL_config(NULL);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++               OPENSSL_config(NULL);
++#else
++               OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG,NULL);
++#endif
+         	SSL_library_init();
+         	SSL_load_error_strings();
+         	OpenSSL_add_all_algorithms();
+
+From ec10c3526b115ea32775f495abd449948cc1d807 Mon Sep 17 00:00:00 2001
+From: Peter Nikolow <peter@mobiliodevelopment.com>
+Date: Fri, 29 Jan 2021 13:30:22 +0200
+Subject: [PATCH 3/3] Update ssl.c
+
+Adding default locations for trusted CA certificates.
+
+This helps is your server uses 3rd party certificate like Let's Encrypt.
+---
+ src/ssl.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ssl.c b/src/ssl.c
+index 996e9b0..3759d5b 100644
+--- src/ssl.c
++++ src/ssl.c
+@@ -254,6 +254,7 @@ void *vpn_ws_ssl_handshake(vpn_ws_peer *peer, char *sni, char *key, char *crt) {
+ 			SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_NONE, NULL);
+ 		}
+ 		else {
++			SSL_CTX_load_verify_locations(ssl_ctx, "/etc/ssl/certs/ca-certificates.crt", "/etc/ssl/certs/");
+ 			SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, NULL);
+ 		}
+ 		ssl_peer_index = SSL_CTX_get_ex_new_index(0, NULL, NULL, NULL, NULL);

From 25fe349ab80a73920cb42a45ccd68c7fe8a1e998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 3 Feb 2021 17:20:51 +0100
Subject: [PATCH 0961/3482] exiftool: update to 12.17.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index a94bce3d7400..8c81c61209de 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.16
+version=12.17
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=c140797d72acdaf04f7ce0629867353510b56fbe99ceaac0742bbc379610756a
+checksum=6580b143a1d07257f4ef08d7c6abb79ec653cd7112fe19e757d7b5a8635b96ff

From 42193d0da6c06e2d52904bdd0ad6398333ed5e9f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 3 Feb 2021 19:09:38 +0100
Subject: [PATCH 0962/3482] syncthing: update to 1.13.1.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 1d27cf82139c..8bfb1673213b 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.13.0
+version=1.13.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -18,7 +18,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=b31d4a323c6c970c580ecab3fd2327c5ba2709286b766b157139a5e393795bc2
+checksum=f4632a062f75d01629e625ccef9625313f5d371c5f9bee744b0b811d47b92e25
 
 pre_build() {
 	GOARCH= go generate \

From 99507f7826ad03b448c44a9db89bbe1e2689398e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 18:51:10 +0100
Subject: [PATCH 0963/3482] virtuoso: add OpenSSL patches

---
 srcpkgs/virtuoso/patches/ssl1.1.patch      | 1400 ++++++++++++++++++++
 srcpkgs/virtuoso/patches/ssl1.1_more.patch |   20 +
 2 files changed, 1420 insertions(+)
 create mode 100644 srcpkgs/virtuoso/patches/ssl1.1.patch
 create mode 100644 srcpkgs/virtuoso/patches/ssl1.1_more.patch

diff --git a/srcpkgs/virtuoso/patches/ssl1.1.patch b/srcpkgs/virtuoso/patches/ssl1.1.patch
new file mode 100644
index 000000000000..a055404e9a27
--- /dev/null
+++ b/srcpkgs/virtuoso/patches/ssl1.1.patch
@@ -0,0 +1,1400 @@
+Description: Fix FTBFS with openssl 1.1
+Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+Bug-Debian: https://bugs.debian.org/828594
+Forwarded: https://github.com/openlink/virtuoso-opensource/pull/583
+Last-Update: Mo 11. Feb 13:50:17 CET 2019 (by Andreas Tille <tille@debian.org>)
+
+---
+
+From 823092cccbd8e2ab9bfad6c3d3df791a7ffa76fc Mon Sep 17 00:00:00 2001
+From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+Date: Mon, 5 Sep 2016 10:49:54 +0000
+Subject: [PATCH] virtuoso-opensource: build against openssl 1.1.0
+
+Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+---
+ libsrc/Dk/Dkernel.c      |   6 +-
+ libsrc/Wi/bif_crypto.c   | 120 ++++++++++--------
+ libsrc/Wi/http.c         |   2 +-
+ libsrc/Wi/xmlenc.c       | 319 +++++++++++++++++++++++++++--------------------
+ libsrc/Wi/xmlenc.h       | 193 ++++++++++++++++++++++++++--
+ libsrc/Wi/xmlenc_algos.c | 132 +++++++++++---------
+ libsrc/util/sslengine.c  |   6 +-
+ 7 files changed, 524 insertions(+), 254 deletions(-)
+
+--- libsrc/Wi/bif_crypto.c
++++ libsrc/Wi/bif_crypto.c
+@@ -181,21 +181,26 @@ box_hmac (caddr_t box, caddr_t key, int
+   unsigned char temp[EVP_MAX_MD_SIZE];
+   unsigned int size = 0;
+   caddr_t res = NULL;
+-  HMAC_CTX ctx;
++  HMAC_CTX *ctx;
+   const EVP_MD *md = EVP_sha1 ();
+ 
+   if (alg == 1)
+     md = EVP_ripemd160 ();
+ 
+-  HMAC_Init (&ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md);
+-  box_hmac_1 (box, &ctx);
+-  HMAC_Final (&ctx, temp, &size);
++  ctx = HMAC_CTX_new();
++  if (!ctx)
++	  return res;
++
++  HMAC_Init_ex (ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md, NULL);
++  box_hmac_1 (box, ctx);
++  HMAC_Final (ctx, temp, &size);
+   if (size)
+     {
+       res = dk_alloc_box (size + 1, DV_SHORT_STRING);
+       memcpy (res, temp, size);
+       res[size] = 0;
+     }
++  HMAC_CTX_free(ctx);
+   return res;
+ }
+ 
+@@ -347,14 +352,12 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
+ 	    {
+ 	      int ii;
+ 
+-	      opp = op;
+-	      ii = d2i_ASN1_BOOLEAN (NULL, (const unsigned char **)&opp, len + hl);
+-	      if (ii < 0)
++	      if (len + hl < 1)
+ 		{
+ 		  if (BIO_write (bp, "Bad boolean\n", 12))
+ 		    goto end;
+ 		}
+-	      BIO_printf (bp, "%d", ii);
++	      BIO_printf (bp, "%d", p[0]);
+ 	    }
+ 	  else if (tag == V_ASN1_BMPSTRING)
+ 	    {
+@@ -415,7 +418,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
+ 		}
+ 	      if (os != NULL)
+ 		{
+-		  M_ASN1_OCTET_STRING_free (os);
++		  ASN1_STRING_free (os);
+ 		  os = NULL;
+ 		}
+ 	    }
+@@ -448,7 +451,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
+ 		  if (BIO_write (bp, "BAD INTEGER", 11) <= 0)
+ 		    goto end;
+ 		}
+-	      M_ASN1_INTEGER_free (bs);
++	      ASN1_STRING_free (bs);
+ 	    }
+ 	  else if (tag == V_ASN1_ENUMERATED)
+ 	    {
+@@ -479,7 +482,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
+ 		  if (BIO_write (bp, "BAD ENUMERATED", 11) <= 0)
+ 		    goto end;
+ 		}
+-	      M_ASN1_ENUMERATED_free (bs);
++	      ASN1_STRING_free (bs);
+ 	    }
+ 	  else if (len > 0 && dump)
+ 	    {
+@@ -515,7 +518,7 @@ end:
+   if (o != NULL)
+     ASN1_OBJECT_free (o);
+   if (os != NULL)
+-    M_ASN1_OCTET_STRING_free (os);
++    ASN1_STRING_free (os);
+   *pp = p;
+   return (ret);
+ }
+@@ -723,7 +726,7 @@ bio_to_strses (BIO * out_bio)
+   int len = BIO_get_mem_data (out_bio, &ptr);
+   int to_read = len, readed = 0;
+ 
+-  to_free = ((BUF_MEM *) out_bio->ptr)->data;
++  to_free = ((BUF_MEM *) BIO_get_data(out_bio))->data;
+   BIO_set_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
+   CATCH_WRITE_FAIL (ses)
+     {
+@@ -735,7 +738,7 @@ bio_to_strses (BIO * out_bio)
+       } while (to_read > 0);
+     }
+   END_WRITE_FAIL (ses);
+-  ((BUF_MEM *) out_bio->ptr)->data = to_free;
++  ((BUF_MEM *) BIO_get_data(out_bio))->data = to_free;
+   BIO_clear_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
+   return ses;
+ }
+@@ -770,7 +773,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
+   if (DV_TYPE_OF (msg) == DV_STRING_SESSION)
+     {
+       in_bio = strses_to_bio ((dk_session_t *) msg);
+-      to_free = ((BUF_MEM *) in_bio->ptr)->data;
++      to_free = ((BUF_MEM *) BIO_get_data(in_bio))->data;
+       BIO_set_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
+     }
+   else
+@@ -780,7 +783,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
+       p7 = SMIME_read_PKCS7 (in_bio, &data_bio);
+       if (to_free)
+ 	{
+-	  ((BUF_MEM *) in_bio->ptr)->data = to_free;
++	  ((BUF_MEM *) BIO_get_data(in_bio))->data = to_free;
+ 	  BIO_clear_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
+ 	}
+       BIO_free (in_bio);
+@@ -924,16 +927,20 @@ bif_smime_sign (caddr_t * qst, caddr_t *
+     }
+ 
+   certs = sk_X509_new_null ();
+-  if (store && store->objs)
++
++  if (store && X509_STORE_get0_objects(store))
+     {
+-      for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
++      STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
++
++      for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
+ 	{
+-	  X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
+-	  if (obj->type == X509_LU_X509)
+-	    sk_X509_push (certs, X509_dup (obj->data.x509));
++	  X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
++	  if (X509_OBJECT_get_type(obj) == X509_LU_X509)
++	    sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
+ 	}
+ 
+     }
++
+   if (store)
+     X509_STORE_free (store);
+   in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
+@@ -1005,15 +1012,19 @@ bif_smime_encrypt (caddr_t * qst, caddr_
+     sqlr_new_error ("42000", "CR006", "No recipient certificates");
+ 
+   certs = sk_X509_new_null ();
+-  if (store && store->objs)
++
++  if (store && X509_STORE_get0_objects(store))
+     {
+-      for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
++      STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
++
++      for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
+ 	{
+-	  X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
+-	  if (obj->type == X509_LU_X509)
+-	    sk_X509_push (certs, X509_dup (obj->data.x509));
++	  X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
++	  if (X509_OBJECT_get_type(obj) == X509_LU_X509)
++	    sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
+ 	}
+     }
++
+   if (store)
+     X509_STORE_free (store);
+   in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
+@@ -1181,7 +1192,7 @@ x509_certificate_verify_cb (int ok, X509
+   char *opts = (char *) X509_STORE_CTX_get_app_data (ctx);
+   if (!ok && opts)
+     {
+-      switch (ctx->error)
++      switch (X509_STORE_CTX_get_error(ctx))
+ 	{
+ 	case X509_V_ERR_CERT_HAS_EXPIRED:
+ 	  if (strstr (opts, "expired"))
+@@ -1287,7 +1298,7 @@ bif_x509_certificate_verify (caddr_t * q
+   if (!i)
+     {
+       const char *err_str;
+-      err_str = X509_verify_cert_error_string (csc->error);
++      err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(csc));
+       *err_ret = srv_make_new_error ("22023", "CR015", "X509 error: %s", err_str);
+     }
+ 
+@@ -1308,20 +1319,16 @@ err_ret:
+ #define VIRT_CERT_EXT "2.16.840.1.1113.1"
+ 
+ static caddr_t
+-BN_box (BIGNUM * x)
++BN_box (const BIGNUM *x)
+ {
+   size_t buf_len, n;
+   caddr_t buf;
+   buf_len = (size_t) BN_num_bytes (x);
+-  if (buf_len <= BN_BYTES)
+-    buf = box_num ((unsigned long) x->d[0]);
+-  else
+-    {
+-      buf = dk_alloc_box (buf_len, DV_BIN);
+-      n = BN_bn2bin (x, (unsigned char *) buf);
+-      if (n != buf_len)
+-	GPF_T;
+-    }
++  /* did not figure out where buf is free()ed */
++  buf = dk_alloc_box (buf_len, DV_BIN);
++  n = BN_bn2bin (x, (unsigned char *) buf);
++  if (n != buf_len)
++	  GPF_T;
+   return buf;
+ }
+ 
+@@ -1498,7 +1505,7 @@ bif_get_certificate_info (caddr_t * qst,
+ 	int i;
+ 	char tmp[1024];
+ 	char *ext_oid = (char *) (BOX_ELEMENTS (args) > 4 ? bif_string_arg (qst, args, 4, "get_certificate_info") : VIRT_CERT_EXT);
+-	STACK_OF (X509_EXTENSION) * exts = cert->cert_info->extensions;
++	const STACK_OF (X509_EXTENSION) * exts = X509_get0_extensions(cert);
+ 	for (i = 0; i < sk_X509_EXTENSION_num (exts); i++)
+ 	  {
+ 	    X509_EXTENSION *ex = sk_X509_EXTENSION_value (exts, i);
+@@ -1510,7 +1517,7 @@ bif_get_certificate_info (caddr_t * qst,
+ 		char *data_ptr;
+ 		BIO *mem = BIO_new (BIO_s_mem ());
+ 		if (!X509V3_EXT_print (mem, ex, 0, 0))
+-		  M_ASN1_OCTET_STRING_print (mem, ex->value);
++		  ASN1_STRING_print (mem, X509_EXTENSION_get_data(ex));
+ 		len = BIO_get_mem_data (mem, &data_ptr);
+ 		if (len > 0 && data_ptr)
+ 		  {
+@@ -1537,18 +1544,23 @@ bif_get_certificate_info (caddr_t * qst,
+ 	if (k)
+ 	  {
+ #ifdef EVP_PKEY_RSA
+-	    if (k->type == EVP_PKEY_RSA)
++	    if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
+ 	      {
+-		RSA *x = k->pkey.rsa;
+-		ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (x->e), BN_box (x->n));
++		const BIGNUM *n, *e;
++
++		RSA_get0_key(EVP_PKEY_get0_RSA(k), &n, &e, NULL);
++
++		ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (e), BN_box (n));
+ 	      }
+ 	    else
+ #endif
+ #ifdef EVP_PKEY_DSA
+-	    if (k->type == EVP_PKEY_DSA)
++	    if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
+ 	      {
+-		DSA *x = k->pkey.dsa;
+-		ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (x->pub_key));
++		const BIGNUM *pub_key;
++
++		DSA_get0_key(EVP_PKEY_get0_DSA(k), &pub_key, NULL);
++		ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (pub_key));
+ 	      }
+ 	    else
+ #endif
+@@ -1567,13 +1579,13 @@ bif_get_certificate_info (caddr_t * qst,
+ 	int n, i, len;
+ 	char *s, *data_ptr;
+ 	BIO *mem = BIO_new (BIO_s_mem ());
+-	for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
++	for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
+ 	  {
+-	    ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
+-	    n = OBJ_obj2nid (ne->object);
++	    ne = X509_NAME_get_entry(subj, i);
++	    n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
+ 	    if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
+ 	      {
+-		i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
++		i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
+ 		s = buffer;
+ 	      }
+ 	    if (!strcmp (s, attr))
+@@ -1582,9 +1594,10 @@ bif_get_certificate_info (caddr_t * qst,
+ 		break;
+ 	      }
+ 	  }
++
+ 	if (ne_ret)
+ 	  {
+-	    ASN1_STRING_print (mem, ne_ret->value);
++	    ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne_ret));
+ 	    len = BIO_get_mem_data (mem, &data_ptr);
+ 	    if (len > 0 && data_ptr)
+ 	      {
+@@ -1605,17 +1618,17 @@ bif_get_certificate_info (caddr_t * qst,
+ 	dk_set_t set = NULL;
+ 	caddr_t val;
+ 	BIO *mem = BIO_new (BIO_s_mem ());
+-	for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
++	for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
+ 	  {
+ 	    val = NULL;
+-	    ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
+-	    n = OBJ_obj2nid (ne->object);
++	    ne = X509_NAME_get_entry(subj, i);
++	    n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
+ 	    if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
+ 	      {
+-		i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
++		i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
+ 		s = buffer;
+ 	      }
+-	    ASN1_STRING_print (mem, ne->value);
++	    ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne));
+ 	    len = BIO_get_mem_data (mem, &data_ptr);
+ 	    if (len > 0 && data_ptr)
+ 	      {
+@@ -1629,18 +1642,22 @@ bif_get_certificate_info (caddr_t * qst,
+ 	  }
+ 	BIO_free (mem);
+ 	ret = list_to_array (dk_set_nreverse (set));
++
+ 	break;
+       }
+     case 12:
+       {
+ 	const unsigned char *s;
+ 	int i, n;
+-	const ASN1_STRING *sig = cert->signature;
+-	X509_ALGOR *sigalg = cert->sig_alg;
++	const ASN1_STRING *sig;
++	const X509_ALGOR *sigalg;
++	const ASN1_OBJECT *sig_alg_algorithm;
+ 	char buf[80];
+ 	caddr_t val;
+ 
+-        i2t_ASN1_OBJECT(buf,sizeof (buf), sigalg->algorithm);
++	X509_get0_signature(&sig, &sigalg, cert);
++	X509_ALGOR_get0(&sig_alg_algorithm, NULL, NULL, sigalg);
++	i2t_ASN1_OBJECT(buf,sizeof (buf), sig_alg_algorithm);
+ 
+ 	n = sig->length;
+ 	s = sig->data;
+@@ -1660,11 +1677,11 @@ bif_get_certificate_info (caddr_t * qst,
+ 	if (k)
+ 	  {
+ #ifdef EVP_PKEY_RSA
+-	    if (k->type == EVP_PKEY_RSA)
++	    if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
+ 	      {
+ 		char *data_ptr;
+ 		int len;
+-		RSA *x = k->pkey.rsa;
++		RSA *x = EVP_PKEY_get0_RSA(k);
+ 		b = BIO_new (BIO_s_mem());
+ 		i2d_RSA_PUBKEY_bio (b, x);
+ 		len = BIO_get_mem_data (b, &data_ptr);
+--- libsrc/Wi/xmlenc.c
++++ libsrc/Wi/xmlenc.c
+@@ -1215,36 +1215,45 @@ void xenc_key_remove (xenc_key_t * key,
+ }
+ 
+ 
+-static void
+-genrsa_cb(int p, int n, void *arg)
+-{
+-#ifdef LINT
+-  p=n;
+-#endif
+-}
+-
+ int
+ __xenc_key_rsa_init (char *name)
+ {
+   RSA *rsa = NULL;
+-  int num=1024;
+-  unsigned long f4=RSA_F4;
++  BIGNUM *bn = NULL;
+   int r;
++
+   xenc_key_t * pkey = xenc_get_key_by_name (name, 1);
+   if (NULL == pkey)
+     SQLR_NEW_KEY_ERROR (name);
+ 
+-  rsa=RSA_generate_key(num,f4,genrsa_cb,NULL);
++  rsa = RSA_new();
++  if (!rsa)
++	  goto out;
++  bn = BN_new();
++  if (!bn)
++	  goto out;
++  if (!BN_set_word(bn, RSA_F4))
++	  goto out;
++
++  if (!RSA_generate_key_ex(rsa, 1024, bn, NULL))
++	  goto out;
++
+   r = RSA_check_key(rsa);
++  if (r != 1)
++	  goto out;
+   pkey->ki.rsa.pad = RSA_PKCS1_PADDING;
+-  if (rsa == NULL)
+-    {
+-      sqlr_new_error ("42000", "XENC06",
+-		    "RSA parameters generation error");
+-    }
+   pkey->xek_rsa = rsa;
+   pkey->xek_private_rsa = rsa;
++  BN_free(bn);
+   return 0;
++out:
++  if (bn)
++	  BN_free(bn);
++  if (rsa)
++	  RSA_free(rsa);
++  sqlr_new_error ("42000", "XENC06",
++		  "RSA parameters generation error");
++  return -1;
+ }
+ 
+ 
+@@ -1455,19 +1464,19 @@ xenc_key_t * xenc_key_create_from_x509_c
+ 
+   if (pkey)
+     {
+-      switch (EVP_PKEY_type (pkey->type))
++      switch (EVP_PKEY_type (EVP_PKEY_id(pkey)))
+ 	{
+ 	case EVP_PKEY_DSA:
+ 	  sign_algoname = DSIG_DSA_SHA1_ALGO;
+ 	  enc_algoname = XENC_DSA_ALGO;
+-	  dsa = pkey->pkey.dsa;
+-	  private_dsa = private_key ? private_key->pkey.dsa : 0;
++	  dsa = EVP_PKEY_get0_DSA(pkey);
++	  private_dsa = private_key ? EVP_PKEY_get0_DSA(private_key) : 0;
+ 	  break;
+ 	case EVP_PKEY_RSA:
+ 	  sign_algoname = DSIG_RSA_SHA1_ALGO;
+ 	  enc_algoname = XENC_RSA_ALGO;
+-	  rsa = pkey->pkey.rsa;
+-	  private_rsa = private_key ? private_key->pkey.rsa : 0;
++	  rsa = EVP_PKEY_get0_RSA(pkey);
++	  private_rsa = private_key ? EVP_PKEY_get0_RSA(private_key) : 0;
+ 	  break;
+ 	default:
+ 	  goto finish;
+@@ -1516,13 +1525,6 @@ xenc_key_t * xenc_key_create_from_x509_c
+   return k;
+ }
+ 
+-static void dh_cb(int p, int n, void *arg)
+-{
+-#ifdef LINT
+-  p=n;
+-#endif
+-}
+-
+ static /*xenc_key_DSA_create */
+ caddr_t bif_xenc_key_dsa_create (caddr_t * qst, caddr_t * err_r, state_slot_t ** args)
+ {
+@@ -1588,15 +1590,21 @@ caddr_t bif_xenc_key_DH_create (caddr_t
+       dh = DH_new ();
+       bn_p = BN_bin2bn ((unsigned char *)mod, p_len, NULL);
+       bn_g = BN_bin2bn (g_bin, 1, NULL);
+-      dh->p = bn_p;
+-      dh->g = bn_g;
++      if (dh)
++	      DH_set0_pqg(dh, bn_p, NULL, bn_g);
+ 
+       dk_free_box (mod_b64);
+       dk_free_box (mod);
+     }
+   else
+     {
+-      dh = DH_generate_parameters (num, g, dh_cb, NULL);
++      dh = DH_new();
++      if (dh) {
++	      if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
++		      DH_free(dh);
++		      dh = NULL;
++	      }
++      }
+     }
+   if (!dh)
+     {
+@@ -1626,7 +1634,7 @@ caddr_t bif_xenc_DH_get_params (caddr_t
+   int n, len;
+   caddr_t buf = NULL, ret, b64;
+   DH *dh;
+-  BIGNUM *num;
++  const BIGNUM *num;
+ 
+   mutex_enter (xenc_keys_mtx);
+   key = xenc_get_key_by_name (name, 0);
+@@ -1641,19 +1649,19 @@ caddr_t bif_xenc_DH_get_params (caddr_t
+   switch (param)
+     {
+   	case 1:
+-	 num = dh->p;
++	 DH_get0_pqg(dh, &num, NULL, NULL);
+ 	 break;
+ 	case 2:
+-	 num = dh->g;
++	 DH_get0_pqg(dh, NULL, NULL, &num);
+ 	 break;
+ 	case 3:
+-	 num = dh->pub_key;
++	 DH_get0_key(dh, &num, NULL);
+ 	 break;
+ 	case 4:
+-	 num = dh->priv_key;
++	 DH_get0_key(dh, NULL, &num);
+ 	 break;
+ 	default:
+-	 num = dh->pub_key;
++	 DH_get0_key(dh, &num, NULL);
+     }
+ 
+   buf_len = (size_t)BN_num_bytes(num);
+@@ -1811,7 +1819,15 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
+   xenc_key_t * k;
+   caddr_t name = bif_string_arg (qst, args, 0, "xenc_key_RSA_create");
+   int num = (int) bif_long_arg (qst, args, 1, "xenc_key_RSA_create");
+-  RSA *rsa = NULL;
++  RSA *rsa;
++  BIGNUM *bn;
++
++  rsa = RSA_new();
++  bn = BN_new();
++  if (!rsa || !bn)
++	goto out;
++  if (!BN_set_word(bn, RSA_F4))
++	goto out;
+ 
+   mutex_enter (xenc_keys_mtx);
+   if (NULL == (k = xenc_key_create (name, XENC_RSA_ALGO , DSIG_RSA_SHA1_ALGO, 0)))
+@@ -1820,12 +1836,11 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
+       SQLR_NEW_KEY_EXIST_ERROR (name);
+     }
+ 
+-  rsa = RSA_generate_key (num, RSA_F4, NULL, NULL);
+-
+-  if (rsa == NULL)
+-    {
+-      sqlr_new_error ("42000", "XENC06", "RSA generation error");
+-    }
++  if (!RSA_generate_key_ex (rsa, num, bn, NULL)) {
++	  mutex_leave (xenc_keys_mtx);
++	  goto out;
++  }
++  BN_free(bn);
+ 
+   k->xek_rsa = RSAPublicKey_dup (rsa);
+   k->xek_private_rsa = rsa;
+@@ -1839,6 +1854,13 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
+ 
+   mutex_leave (xenc_keys_mtx);
+   return NULL;
++out:
++  if (bn)
++	  BN_free(bn);
++  if (rsa)
++	  RSA_free(rsa);
++  sqlr_new_error ("42000", "XENC06", "RSA generation error");
++  return NULL;
+ }
+ 
+ xenc_key_t *
+@@ -2034,7 +2056,13 @@ int __xenc_key_dsa_init (char *name, int
+     SQLR_NEW_KEY_ERROR (name);
+ 
+   RAND_poll ();
+-  dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, NULL);
++  dsa = DSA_new();
++  if (dsa) {
++	  if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, NULL)) {
++		  DSA_free(dsa);
++		  dsa = NULL;
++	  }
++  }
+   if (dsa == NULL)
+     {
+       sqlr_new_error ("42000", "XENC11",
+@@ -2058,7 +2086,13 @@ int __xenc_key_dh_init (char *name, int
+   if (NULL == pkey)
+     SQLR_NEW_KEY_ERROR (name);
+ 
+-  dh = DH_generate_parameters (num, g, dh_cb, NULL);
++  dh = DH_new();
++  if (dh) {
++	  if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
++		  DH_free(dh);
++		  dh = NULL;
++	  }
++  }
+   if (!dh)
+     {
+       sqlr_new_error ("42000", "XENC11",
+@@ -2280,12 +2314,12 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
+     {
+       in = BIO_new_mem_buf (key_base64, len);
+       pkey = d2i_PUBKEY_bio (in, NULL);
+-      if (pkey && pkey->type == EVP_PKEY_RSA)
+-	p = pkey->pkey.rsa;
++      if (pkey && EVP_PKEY_id(pkey) == EVP_PKEY_RSA)
++	p = EVP_PKEY_get0_RSA(pkey);
+       BIO_reset (in);
+       pkkey = d2i_PrivateKey_bio (in, NULL);
+-      if (pkkey && pkkey->type == EVP_PKEY_RSA)
+-	r = pkkey->pkey.rsa;
++      if (pkkey && EVP_PKEY_id(pkkey) == EVP_PKEY_RSA)
++	r = EVP_PKEY_get0_RSA(pkkey);
+       BIO_free (in);
+     }
+   else
+@@ -2304,9 +2338,11 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
+ 
+   if (!p)
+     {
++      const BIGNUM *n, *e;
++
++      RSA_get0_key(r, &n, &e, NULL);
+       p = RSA_new ();
+-      p->n = BN_dup (r->n);
+-      p->e = BN_dup (r->e);
++      RSA_set0_key(p, BN_dup(n), BN_dup(e), NULL);
+     }
+ 
+   mutex_enter (xenc_keys_mtx);
+@@ -2355,14 +2391,13 @@ bif_xenc_key_rsa_construct (caddr_t * qs
+   p = RSA_new ();
+   n = BN_bin2bn ((unsigned char *) mod, box_length (mod) - 1, NULL);
+   e = BN_bin2bn ((unsigned char *) exp, box_length (exp) - 1, NULL);
+-  p->n = n;
+-  p->e = e;
++  RSA_set0_key(p, n, e, NULL);
+   if (pexp)
+     {
+       pk = RSA_new ();
+-      pk->d = BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL);
+-      pk->n = BN_dup (n);
+-      pk->e = BN_dup (e);
++      RSA_set0_key(p, BN_dup(n),
++		      BN_dup(e),
++		      BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL));
+     }
+   mutex_enter (xenc_keys_mtx);
+   k = xenc_key_create (name, XENC_RSA_ALGO, DSIG_RSA_SHA1_ALGO, 0);
+@@ -4086,7 +4121,7 @@ void xenc_tag_free (xenc_tag_t * t)
+ #endif
+ }
+ 
+-xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, BIGNUM * bn)
++static xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, const BIGNUM * bn)
+ {
+  char * buffer = dk_alloc_box (BN_num_bytes (bn), DV_BIN);
+  char * buffer_base64 = dk_alloc_box (box_length (buffer) * 2, DV_STRING);
+@@ -4111,12 +4146,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
+   caddr_t ** array;
+   if (key->xek_type == DSIG_KEY_RSA)
+     {
++      const BIGNUM *rsa_n, *rsa_e;
++
++      RSA_get0_key(key->ki.rsa.rsa_st, &rsa_n, &rsa_e, NULL);
+       xenc_tag_t * rsakeyval = xenc_tag_create (DSIG_URI, ":RSAKeyValue");
+       xenc_tag_t * rsamodulus = xenc_tag_create (DSIG_URI, ":Modulus");
+       xenc_tag_t * rsaexponent = xenc_tag_create (DSIG_URI, ":Exponent");
+ 
+-      xenc_tag_add_child_BN (rsamodulus, key->ki.rsa.rsa_st->n);
+-      xenc_tag_add_child_BN (rsaexponent, key->ki.rsa.rsa_st->e);
++      xenc_tag_add_child_BN (rsamodulus, rsa_n);
++      xenc_tag_add_child_BN (rsaexponent, rsa_e);
+ 
+       xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsamodulus));
+       xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsaexponent));
+@@ -4135,12 +4173,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
+       xenc_tag_t * g = xenc_tag_create (DSIG_URI, ":G");
+       xenc_tag_t * y = xenc_tag_create (DSIG_URI, ":Y");
+       DSA * dsa = key->ki.dsa.dsa_st;
++      const BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
+ 
++      DSA_get0_pqg(dsa, &dsa_p, &dsa_q, &dsa_g);
++      DSA_get0_key(dsa, &dsa_pub_key, NULL);
+ 
+-      xenc_tag_add_child_BN (p, dsa->p);
+-      xenc_tag_add_child_BN (p, dsa->q);
+-      xenc_tag_add_child_BN (p, dsa->g);
+-      xenc_tag_add_child_BN (p, dsa->pub_key);
++      xenc_tag_add_child_BN (p, dsa_p);
++      xenc_tag_add_child_BN (p, dsa_q);
++      xenc_tag_add_child_BN (p, dsa_g);
++      xenc_tag_add_child_BN (p, dsa_pub_key);
+ 
+       xenc_tag_add_child (dsakeyval, xenc_tag_finalize (p));
+       xenc_tag_add_child (dsakeyval, xenc_tag_finalize (q));
+@@ -6187,7 +6228,7 @@ caddr_t xenc_x509_get_key_identifier (X5
+ 
+   ret = dk_alloc_box (ikeyid->length, DV_BIN);
+   memcpy (ret, ikeyid->data, ikeyid->length);
+-  M_ASN1_OCTET_STRING_free(ikeyid);
++  ASN1_STRING_free(ikeyid);
+   return ret;
+ }
+ 
+@@ -6247,7 +6288,7 @@ bif_x509_get_subject (caddr_t * qst, cad
+ 
+   ret = dk_alloc_box (ikeyid->length, DV_BIN);
+   memcpy (ret, ikeyid->data, ikeyid->length);
+-  M_ASN1_OCTET_STRING_free(ikeyid);
++  ASN1_STRING_free(ikeyid);
+   return ret;
+ }
+ 
+@@ -6806,7 +6847,7 @@ bif_xenc_x509_csr_generate (caddr_t * qs
+ 	sk_X509_EXTENSION_push(st_exts, ex);
+     }
+   X509_REQ_add_extensions(x, st_exts);
+-  if (!X509_REQ_sign (x, pk, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1())))
++  if (!X509_REQ_sign (x, pk, (EVP_PKEY_id(pk) == EVP_PKEY_RSA ? EVP_md5() : EVP_sha1())))
+     {
+       pk = NULL; /* keep one in the xenc_key */
+       *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate : %s", get_ssl_error_text (buf, sizeof (buf)));
+@@ -6945,17 +6986,17 @@ bif_xenc_x509_from_csr (caddr_t * qst, c
+       *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate");
+       goto err;
+     }
+-  switch (EVP_PKEY_type (cli_pk->type))
++  switch (EVP_PKEY_type (EVP_PKEY_id(cli_pk)))
+     {
+       case EVP_PKEY_DSA:
+ 	  sign_algoname = DSIG_DSA_SHA1_ALGO;
+ 	  enc_algoname = XENC_DSA_ALGO;
+-	  dsa = cli_pk->pkey.dsa;
++	  dsa = EVP_PKEY_get0_DSA(cli_pk);
+ 	  break;
+       case EVP_PKEY_RSA:
+ 	  sign_algoname = DSIG_RSA_SHA1_ALGO;
+ 	  enc_algoname = XENC_RSA_ALGO;
+-	  rsa = cli_pk->pkey.rsa;
++	  rsa = EVP_PKEY_get0_RSA(cli_pk);
+ 	  break;
+       default:
+ 	  *err_ret = srv_make_new_error ("42000", "XECXX", "The type of public key is not supported mus tbe RSA or DSA");
+@@ -7032,19 +7073,19 @@ bif_xenc_pkcs12_export (caddr_t * qst, c
+   if (export_chain)
+     {
+       int i;
+-      X509_STORE_CTX store_ctx;
+-      X509_STORE_CTX_init (&store_ctx, CA_certs, x, NULL);
+-      if (X509_verify_cert (&store_ctx) > 0)
+-	chain = X509_STORE_CTX_get1_chain (&store_ctx);
++      X509_STORE_CTX *ctx;
++      X509_STORE_CTX_init (ctx, CA_certs, x, NULL);
++      if (X509_verify_cert (ctx) > 0)
++	chain = X509_STORE_CTX_get1_chain (ctx);
+       else
+ 	{
+ 	  const char *err_str;
+-	  err_str = X509_verify_cert_error_string (store_ctx.error);
++	  err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(ctx));
+ 	  *err_ret = srv_make_new_error ("22023", "XENCX", "X509 error: %s", err_str);
+-	  X509_STORE_CTX_cleanup (&store_ctx);
++	  X509_STORE_CTX_cleanup (ctx);
+ 	  goto err;
+ 	}
+-      X509_STORE_CTX_cleanup (&store_ctx);
++      X509_STORE_CTX_cleanup (ctx);
+       if (chain)
+ 	{
+ 	  certs = sk_X509_new_null ();
+@@ -7152,16 +7193,16 @@ bif_xenc_pubkey_pem_export (caddr_t * qs
+     {
+       k = X509_get_pubkey (key->xek_x509);
+ #ifdef EVP_PKEY_RSA
+-      if (k->type == EVP_PKEY_RSA)
++      if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
+ 	{
+-	  RSA * x = k->pkey.rsa;
++	  RSA *x = EVP_PKEY_get0_RSA(k);
+ 	  PEM_write_bio_RSA_PUBKEY (b, x);
+ 	}
+ #endif
+ #ifdef EVP_PKEY_DSA
+-      if (k->type == EVP_PKEY_DSA)
++      if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
+ 	{
+-	  DSA * x = k->pkey.dsa;
++	  DSA * x = EVP_PKEY_get0_DSA(k);
+ 	  PEM_write_bio_DSA_PUBKEY (b, x);
+ 	}
+ #endif
+@@ -7208,16 +7249,16 @@ bif_xenc_pubkey_der_export (caddr_t * qs
+     {
+       k = X509_get_pubkey (key->xek_x509);
+ #ifdef EVP_PKEY_RSA
+-      if (k->type == EVP_PKEY_RSA)
++      if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
+ 	{
+-	  RSA * x = k->pkey.rsa;
++	  RSA * x = EVP_PKEY_get0_RSA(k);
+ 	  i2d_RSA_PUBKEY_bio (b, x);
+ 	}
+ #endif
+ #ifdef EVP_PKEY_DSA
+-      if (k->type == EVP_PKEY_DSA)
++      if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
+ 	{
+-	  DSA * x = k->pkey.dsa;
++	  DSA * x = EVP_PKEY_get0_DSA(k);
+ 	  i2d_DSA_PUBKEY_bio (b, x);
+ 	}
+ #endif
+@@ -7245,7 +7286,7 @@ err:
+ }
+ 
+ static caddr_t
+-BN2binbox (BIGNUM * x)
++BN2binbox (const BIGNUM * x)
+ {
+   size_t buf_len, n;
+   caddr_t buf;
+@@ -7280,8 +7321,14 @@ static caddr_t
+ xenc_rsa_pub_magic (RSA * x)
+ {
+   caddr_t ret;
+-  caddr_t n = BN2binbox (x->n); /* modulus */
+-  caddr_t e = BN2binbox (x->e); /* public exponent */
++  caddr_t n;
++  caddr_t e;
++  const BIGNUM *rsa_n, *rsa_e;
++
++  RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
++  n = BN2binbox (rsa_n); /* modulus */
++  e = BN2binbox (rsa_e); /* public exponent */
++
+   n = xenc_encode_base64_binbox (n, 1);
+   e = xenc_encode_base64_binbox (e, 1);
+   ret = dk_alloc_box (box_length (n) + box_length (e) + 4 /* two dots - one trailing zero + RSA prefix */, DV_STRING);
+@@ -7306,9 +7353,9 @@ bif_xenc_pubkey_magic_export (caddr_t *
+     {
+       k = X509_get_pubkey (key->xek_x509);
+ #ifdef EVP_PKEY_RSA
+-      if (k->type == EVP_PKEY_RSA)
++      if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
+ 	{
+-	  RSA * x = k->pkey.rsa;
++	  RSA * x = EVP_PKEY_get0_RSA(k);
+ 	  ret = xenc_rsa_pub_magic (x);
+ 	}
+ #endif
+@@ -7349,10 +7396,16 @@ static caddr_t
+ xenc_rsa_pub_ssh_export (RSA * x)
+ {
+   static char * ssh_header = "\x00\x00\x00\x07ssh-rsa";
++  const BIGNUM *rsa_n, *rsa_e;
+   caddr_t ret;
+   int len, pos;
+-  caddr_t n = BN2binbox (x->n); /* modulus */
+-  caddr_t e = BN2binbox (x->e); /* public exponent */
++  caddr_t n;
++  caddr_t e;
++
++  RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
++  n = BN2binbox (rsa_n); /* modulus */
++  e = BN2binbox (rsa_e); /* public exponent */
++
+   len = 11 + 8 + box_length (n) + box_length (e);
+   if (n[0] & 0x80)
+     len ++;
+@@ -7383,9 +7436,9 @@ bif_xenc_pubkey_ssh_export (caddr_t * qs
+     {
+       k = X509_get_pubkey (key->xek_x509);
+ #ifdef EVP_PKEY_RSA
+-      if (k->type == EVP_PKEY_RSA)
++      if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
+ 	{
+-	  RSA * x = k->pkey.rsa;
++	  RSA * x = EVP_PKEY_get0_RSA(k);
+ 	  ret = xenc_rsa_pub_ssh_export (x);
+ 	}
+ #endif
+@@ -7418,7 +7471,7 @@ bif_xenc_SPKI_read (caddr_t * qst, caddr
+       return NULL;
+     }
+   pk = NETSCAPE_SPKI_get_pubkey (spki);
+-  if (!pk || pk->type != EVP_PKEY_RSA)
++  if (!pk || EVP_PKEY_id(pk) != EVP_PKEY_RSA)
+     {
+       NETSCAPE_SPKI_free (spki);
+       *err_ret = srv_make_new_error ("42000", "XECXX", "Can not retrieve RSA key");
+@@ -7595,14 +7648,14 @@ bif_xenc_x509_ca_certs_list (caddr_t * q
+   sec_check_dba ((QI*)qst, me);
+   in = BIO_new (BIO_s_mem ());
+   mutex_enter (xenc_keys_mtx);
+-  certs = CA_certs->objs;
++  certs = X509_STORE_get0_objects(CA_certs);
+   len = sk_X509_OBJECT_num (certs);
+   for (i = 0; i < len; i++)
+     {
+       X509_OBJECT * obj = sk_X509_OBJECT_value (certs, i);
+-      if (obj->type == X509_LU_X509)
++      if (X509_OBJECT_get_type(obj) == X509_LU_X509)
+ 	{
+-	  X509 *x = obj->data.x509;
++	  X509 *x = X509_OBJECT_get0_X509(obj);
+ 	  caddr_t itm;
+ 	  int blen;
+ 	  BIO_reset (in);
+--- libsrc/Wi/xmlenc.h
++++ libsrc/Wi/xmlenc.h
+@@ -38,6 +38,7 @@
+ #include <openssl/dsa.h>
+ #include <openssl/rsa.h>
+ #include <openssl/des.h>
++#include <openssl/hmac.h>
+ 
+ #ifdef AES_ENC_ENABLE
+ #include <openssl/aes.h>
+@@ -631,5 +632,183 @@ caddr_t * xml_find_any_child (caddr_t *
+ 
+ extern dk_mutex_t * xenc_keys_mtx;
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
++
++static inline HMAC_CTX *HMAC_CTX_new(void)
++{
++	HMAC_CTX *p;
++
++	p = calloc(1, sizeof(HMAC_CTX));
++	if (!p)
++		return p;
++	HMAC_CTX_init(p);
++	return p;
++}
++
++static inline void HMAC_CTX_free(HMAC_CTX *ctx)
++{
++	HMAC_CTX_cleanup(ctx);
++	free(ctx);
++}
++
++static inline void RSA_get0_key(const RSA *r, const BIGNUM **n,
++				const BIGNUM **e, const BIGNUM **d)
++{
++	if (n != NULL)
++		*n = r->n;
++	if (e != NULL)
++		*e = r->e;
++	if (d != NULL)
++		*d = r->d;
++}
++
++static inline void RSA_get0_factors(const RSA *r, const BIGNUM **p,
++				    const BIGNUM **q)
++{
++	if (p != NULL)
++		*p = r->p;
++	if (q != NULL)
++		*q = r->q;
++}
++
++static inline RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
++{
++	if (pkey->type != EVP_PKEY_RSA)
++		return NULL;
++	return pkey->pkey.rsa;
++}
++
++static inline void DH_get0_key(const DH *dh, const BIGNUM **pub_key,
++			       const BIGNUM **priv_key)
++{
++	if (pub_key != NULL)
++		*pub_key = dh->pub_key;
++	if (priv_key != NULL)
++		*priv_key = dh->priv_key;
++}
++
++
++static inline void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q,
++			       const BIGNUM **g)
++{
++	if (p != NULL)
++		*p = dh->p;
++	if (q != NULL)
++		*q = dh->q;
++	if (g != NULL)
++		*g = dh->g;
++}
++
++static inline DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
++{
++	if (pkey->type != EVP_PKEY_DSA)
++		return NULL;
++	return pkey->pkey.dsa;
++}
++
++static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
++{
++	/* If the fields p and g in d are NULL, the corresponding input
++	 * parameters MUST be non-NULL.  q may remain NULL.
++	 */
++	if ((dh->p == NULL && p == NULL)
++	    || (dh->g == NULL && g == NULL))
++		return 0;
++
++	if (p != NULL) {
++		BN_free(dh->p);
++		dh->p = p;
++	}
++	if (q != NULL) {
++		BN_free(dh->q);
++		dh->q = q;
++	}
++	if (g != NULL) {
++		BN_free(dh->g);
++		dh->g = g;
++	}
++
++	if (q != NULL) {
++		dh->length = BN_num_bits(q);
++	}
++
++	return 1;
++}
++
++static inline int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
++{
++	/* If the fields n and e in r are NULL, the corresponding input
++	 * parameters MUST be non-NULL for n and e.  d may be
++	 * left NULL (in case only the public key is used).
++	 */
++	if ((r->n == NULL && n == NULL)
++	    || (r->e == NULL && e == NULL))
++		return 0;
++
++	if (n != NULL) {
++		BN_free(r->n);
++		r->n = n;
++	}
++	if (e != NULL) {
++		BN_free(r->e);
++		r->e = e;
++	}
++	if (d != NULL) {
++		BN_free(r->d);
++		r->d = d;
++	}
++
++	return 1;
++}
++
++static inline void DSA_get0_pqg(const DSA *d, const BIGNUM **p,
++				const BIGNUM **q, const BIGNUM **g)
++{
++	if (p != NULL)
++		*p = d->p;
++	if (q != NULL)
++		*q = d->q;
++	if (g != NULL)
++		*g = d->g;
++}
++
++static inline void DSA_get0_key(const DSA *d, const BIGNUM **pub_key,
++				const BIGNUM **priv_key)
++{
++	if (pub_key != NULL)
++		*pub_key = d->pub_key;
++	if (priv_key != NULL)
++		*priv_key = d->priv_key;
++}
++
++static inline const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x)
++{
++	return x->cert_info->extensions;
++}
++
++static inline int X509_up_ref(X509 *x)
++{
++	return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
++}
++
++static inline STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *v)
++{
++	return v->objs;
++}
++
++static inline int X509_OBJECT_get_type(const X509_OBJECT *a)
++{
++	return a->type;
++}
++
++static inline X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a)
++{
++	if (a == NULL || a->type != X509_LU_X509)
++		return NULL;
++	return a->data.x509;
++}
++
++#endif
++
+ #endif
+ 
+--- libsrc/Wi/xmlenc_algos.c
++++ libsrc/Wi/xmlenc_algos.c
+@@ -1149,7 +1149,7 @@ int
+ dsig_hmac_sha256_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
+ {
+   unsigned char * data;
+-  HMAC_CTX ctx;
++  HMAC_CTX *ctx;
+   unsigned char key_data[32 * 8];
+   unsigned char md [SHA256_DIGEST_LENGTH + 1];
+   unsigned char md64 [SHA256_DIGEST_LENGTH * 2 + 1];
+@@ -1182,7 +1182,9 @@ dsig_hmac_sha256_digest (dk_session_t *
+       default:
+ 	  return 0;
+     }
+-
++  ctx = HMAC_CTX_new();
++  if (!ctx)
++	  return 0;
+ 
+   data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
+   CATCH_READ_FAIL (ses_in)
+@@ -1192,14 +1194,15 @@ dsig_hmac_sha256_digest (dk_session_t *
+   FAILED
+     {
+       dk_free_box ((box_t) data);
++      HMAC_CTX_free(ctx);
+       return 0;
+     }
+   END_READ_FAIL (ses_in);
+ 
+-  HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
+-  HMAC_Update(&ctx, data, len);
+-  HMAC_Final(&ctx, md, &hmac_len);
+-  HMAC_cleanup(&ctx);
++  HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
++  HMAC_Update(ctx, data, len);
++  HMAC_Final(ctx, md, &hmac_len);
++  HMAC_CTX_free(ctx);
+ 
+   if (hmac_len != SHA256_DIGEST_LENGTH)
+     GPF_T;
+@@ -1220,7 +1223,7 @@ dsig_hmac_sha256_digest (dk_session_t *
+ int
+ dsig_hmac_sha256_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
+ {
+-  HMAC_CTX ctx;
++  HMAC_CTX *ctx;
+   unsigned char * data;
+   unsigned char key_data[3 * 8];
+   unsigned char md [SHA256_DIGEST_LENGTH + 1];
+@@ -1249,6 +1252,9 @@ dsig_hmac_sha256_verify (dk_session_t *
+ 	  return 0;
+     }
+ 
++  ctx = HMAC_CTX_new();
++  if (!ctx)
++	  return 0;
+ 
+   data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
+   CATCH_READ_FAIL (ses_in)
+@@ -1258,14 +1264,15 @@ dsig_hmac_sha256_verify (dk_session_t *
+   FAILED
+     {
+       dk_free_box ((box_t) data);
++      HMAC_CTX_free(ctx);
+       return 0;
+     }
+   END_READ_FAIL (ses_in);
+ 
+-  HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
+-  HMAC_Update(&ctx, data, len);
+-  HMAC_Final(&ctx, md, &hmac_len);
+-  HMAC_cleanup(&ctx);
++  HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
++  HMAC_Update(ctx, data, len);
++  HMAC_Final(ctx, md, &hmac_len);
++  HMAC_CTX_free(ctx);
+   dk_free_box ((box_t) data);
+ 
+   len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
+@@ -1586,7 +1593,7 @@ int
+ dsig_hmac_sha1_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
+ {
+   unsigned char * data;
+-  HMAC_CTX ctx;
++  HMAC_CTX *ctx;
+   unsigned char key_data[32 * 8];
+   unsigned char md [SHA_DIGEST_LENGTH + 1];
+   unsigned char md64 [SHA_DIGEST_LENGTH * 2 + 1];
+@@ -1620,6 +1627,9 @@ dsig_hmac_sha1_digest (dk_session_t * se
+ 	  return 0;
+     }
+ 
++  ctx = HMAC_CTX_new();
++  if (!ctx)
++	  return 0;
+ 
+   data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
+   CATCH_READ_FAIL (ses_in)
+@@ -1629,14 +1639,15 @@ dsig_hmac_sha1_digest (dk_session_t * se
+   FAILED
+     {
+       dk_free_box ((box_t) data);
++      HMAC_CTX_free(ctx);
+       return 0;
+     }
+   END_READ_FAIL (ses_in);
+ 
+-  HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
+-  HMAC_Update(&ctx, data, len);
+-  HMAC_Final(&ctx, md, &hmac_len);
+-  HMAC_cleanup(&ctx);
++  HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
++  HMAC_Update(ctx, data, len);
++  HMAC_Final(ctx, md, &hmac_len);
++  HMAC_CTX_free(ctx);
+ 
+   if (hmac_len != SHA_DIGEST_LENGTH)
+     GPF_T;
+@@ -1657,7 +1668,7 @@ dsig_hmac_sha1_digest (dk_session_t * se
+ int
+ dsig_hmac_sha1_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
+ {
+-  HMAC_CTX ctx;
++  HMAC_CTX *ctx;
+   unsigned char * data;
+   unsigned char key_data[3 * 8];
+   unsigned char md [SHA_DIGEST_LENGTH + 1];
+@@ -1686,6 +1697,9 @@ dsig_hmac_sha1_verify (dk_session_t * se
+ 	  return 0;
+     }
+ 
++  ctx = HMAC_CTX_new();
++  if (!ctx)
++	  return 0;
+ 
+   data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
+   CATCH_READ_FAIL (ses_in)
+@@ -1695,14 +1709,15 @@ dsig_hmac_sha1_verify (dk_session_t * se
+   FAILED
+     {
+       dk_free_box ((box_t) data);
++      HMAC_CTX_free(ctx);
+       return 0;
+     }
+   END_READ_FAIL (ses_in);
+ 
+-  HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
+-  HMAC_Update(&ctx, data, len);
+-  HMAC_Final(&ctx, md, &hmac_len);
+-  HMAC_cleanup(&ctx);
++  HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
++  HMAC_Update(ctx, data, len);
++  HMAC_Final(ctx, md, &hmac_len);
++  HMAC_CTX_free(ctx);
+   dk_free_box ((box_t) data);
+ 
+   len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
+@@ -1763,7 +1778,7 @@ int xenc_aes_encryptor (dk_session_t * s
+   caddr_t outbuf_beg;
+   int len;
+   caddr_t encoded_out;
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   unsigned char * ivec = &key->ki.aes.iv[0];
+ 
+   CATCH_READ_FAIL (ses_in)
+@@ -1778,7 +1793,7 @@ int xenc_aes_encryptor (dk_session_t * s
+   END_READ_FAIL (ses_in);
+ 
+ #if 1
+-  EVP_CIPHER_CTX_init(&ctx);
++  ctx = EVP_CIPHER_CTX_new();
+   outbuf_beg = dk_alloc_box (box_length (text) + 16, DV_BIN);
+   memcpy (outbuf_beg, ivec, 16);
+   outbuf = outbuf_beg + 16;
+@@ -1786,20 +1801,19 @@ int xenc_aes_encryptor (dk_session_t * s
+   switch (key->ki.aes.bits)
+     {
+     case 128:
+-      EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
++      EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
+       break;
+     case 192:
+-      EVP_EncryptInit_ex(&ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
++      EVP_EncryptInit_ex(ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
+       break;
+     case 256:
+-      EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
++      EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
+       break;
+     default:
+       GPF_T1 ("Unsupported key size");
+     }
+-  if(!EVP_EncryptUpdate(&ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
++  if(!EVP_EncryptUpdate(ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
+     {
+-      EVP_CIPHER_CTX_cleanup(&ctx);
+       dk_free_box (text);
+       dk_free_box (outbuf_beg);
+       xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #2");
+@@ -1812,7 +1826,7 @@ int xenc_aes_encryptor (dk_session_t * s
+       xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #3");
+       } */
+   /* outlen += tmplen; */
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++  EVP_CIPHER_CTX_free(ctx);
+ 
+ #else
+   outbuf_beg = dk_alloc_box (box_length (text) + 16 /* iv */, DV_BIN);
+@@ -2050,6 +2064,7 @@ xenc_rsa_decryptor (dk_session_t * ses_i
+   int len = 0;
+   int keysize;
+   RSA * rsa = key->xek_private_rsa;
++  const BIGNUM *p, *q;
+ 
+   if (!seslen)
+     {
+@@ -2062,9 +2077,9 @@ xenc_rsa_decryptor (dk_session_t * ses_i
+       xenc_report_error (t, 500 + strlen (key->xek_name), XENC_ENC_ERR, "could not make RSA decryption [key %s is not RSA]", key->xek_name);
+       return 0;
+     }
++  RSA_get0_factors(rsa, &p, &q);
+   if (!rsa ||
+-      !rsa->p ||
+-      !rsa->q)
++      !p || !q)
+     {
+       if (key->xek_x509_KI)
+ 	key = xenc_get_key_by_keyidentifier (key->xek_x509_KI, 1);
+--- libsrc/util/sslengine.c
++++ libsrc/util/sslengine.c
+@@ -29,7 +29,11 @@
+ int
+ ssl_engine_startup (void)
+ {
+-  CRYPTO_malloc_init ();
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined LIBRESSL_VERSION_NUMBER
++	CRYPTO_malloc_init ();
++#else
++	OPENSSL_malloc_init();
++#endif
+   ERR_load_crypto_strings();
+   OpenSSL_add_all_algorithms();
+ 
+--- libsrc/Wi/http.c
++++ libsrc/Wi/http.c
+@@ -8886,7 +8886,7 @@ ssl_server_set_certificate (SSL_CTX* ssl
+ 		  log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
+ 		  break;
+ 		}
+-	      CRYPTO_add(&k->xek_x509->references, 1, CRYPTO_LOCK_X509);
++	      X509_up_ref(k->xek_x509);
+               tok = strtok_r (NULL, ",", &tok_s);
+ 	    }
+ 	  dk_free_box (str);
+--- libsrc/Dk/Dkernel.c
++++ libsrc/Dk/Dkernel.c
+@@ -5280,7 +5280,11 @@ ssl_server_init ()
+   }
+ #endif
+ 
+-  SSLeay_add_all_algorithms ();
++#if OPENSSL_VERSION_NUMBER < 0x10100000
++  SSLeay_add_all_algorithms();
++#else
++  OpenSSL_add_all_algorithms();
++#endif
+   PKCS12_PBE_add ();		/* stub */
+ 
+ #ifdef NO_THREAD
diff --git a/srcpkgs/virtuoso/patches/ssl1.1_more.patch b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
new file mode 100644
index 000000000000..c494297ec6da
--- /dev/null
+++ b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
@@ -0,0 +1,20 @@
+Description: Comment unknown definition in ssl1.1 - please review!
+Author: Andreas Tille <tille@debian.org>
+Bug-Debian: https://bugs.debian.org/828594
+Last-Update: Mo 11. Feb 13:50:17 CET 2019
+
+--- libsrc/Dk/Dkernel.c
++++ libsrc/Dk/Dkernel.c
+@@ -5161,10 +5161,12 @@ ssl_ctx_set_protocol_options(SSL_CTX *ct
+       else if (!strcasecmp (name, "TLSv1_2") || !strcasecmp (name, "TLSv1.2"))
+ 	opt = SSL_PROTOCOL_TLSV1_2;
+ #endif
++/*
+ #if defined (SSL_OP_NO_TLSv1_3)
+       else if (!strcasecmp (name, "TLSv1_3") || !strcasecmp (name, "TLSv1.3"))
+ 	opt = SSL_PROTOCOL_TLSV1_3;
+ #endif
++*/
+       else if (!strcasecmp (name, "ALL"))
+ 	opt = SSL_PROTOCOL_ALL;
+       else

From 625f2aa6d103de6f273908aebf0a5424ba8659a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 19:35:28 +0100
Subject: [PATCH 0964/3482] turbovnc: Update LibreSSL patch to not break
 OpenSSL

---
 srcpkgs/turbovnc/patches/fix-libressl.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch
index 0584ff6a858f..f63c1a82c6e5 100644
--- a/srcpkgs/turbovnc/patches/fix-libressl.patch
+++ b/srcpkgs/turbovnc/patches/fix-libressl.patch
@@ -5,7 +5,7 @@
  #define __RFB_H__
  
 +/* Fix for libressl */
-+#ifndef OPENSSL_INIT_SETTINGS
++#ifdef LIBRESSL_VERSION_NUMBER
 +#define OPENSSL_INIT_SETTINGS void
 +#endif
  

From ad3a449961ca75e7596a34473912ecee439b7e49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Wed, 3 Feb 2021 18:57:58 +0100
Subject: [PATCH 0965/3482] osm2pgsql: update to 1.4.1.

---
 srcpkgs/osm2pgsql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index fdbdc30bf7c6..56b9dfe075e0 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.4.0
+version=1.4.1
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/${pkgname}/archive/${version}.tar.gz"
-checksum=403e25a0310d088183a868d80e5325dceee88617d0df570056e50a2930905369
+checksum=33c4817dceed99764b089ead0e8e2f67c4c6675e761772339b635800970e66e2

From 394bfaf8f720089b408e928dc7dedaabf157fdeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Feb 2021 15:45:03 -0300
Subject: [PATCH 0966/3482] manpages-pt-br: fix update file.

Should ignore pre-releases.
---
 srcpkgs/manpages-pt-br/update | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/manpages-pt-br/update b/srcpkgs/manpages-pt-br/update
index 43c7e78b44e3..f8d78a094573 100644
--- a/srcpkgs/manpages-pt-br/update
+++ b/srcpkgs/manpages-pt-br/update
@@ -1,2 +1,3 @@
 pkgname=manpages-l10n
 site="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/tags"
+ignore="*pre*"

From cf1d058865ec6bfebbb747e68b2ed7d632cf44c4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Feb 2021 20:34:12 +0100
Subject: [PATCH 0967/3482] ugrep: update to 3.1.7.

AVX2 support is checked at runtime, so safe to enable.
---
 srcpkgs/ugrep/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index ca570f521876..31f08f28e942 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,13 +1,16 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.1.6
+version=3.1.7
 revision=1
 build_style=gnu-configure
-configure_args="--disable-avx"
 makedepends="bzip2-devel liblz4-devel liblzma-devel pcre2-devel zlib-devel"
 short_desc="Ultra fast grep with interactive query UI"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=5e494bccabebfa91b4ac34b0c44ac6e36fe8604e78ef4b22c099f68e82e32e35
+checksum=1b9fed98ea97992c98c9ca0d409da0c1f89bf54fd410ddbfdee1c57e01d4a85a
+
+post_install() {
+	vlicense LICENSE.txt LICENSE
+}

From dd997b134b035cd536e7ae7c406673aa5834d05e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Feb 2021 15:33:38 +0100
Subject: [PATCH 0968/3482] busybox: fix tests.

---
 srcpkgs/busybox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index 707dac57d2d2..c7c2e9ebbb99 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -87,7 +87,7 @@ do_check() {
 		cp src/scripts/echo.c "${t}/scripts"
 		# Run the testsuite
 		(
-		cd "${t}"
+		cd "${t}/testsuite"
 		SKIP_KNOWN_BUGS=yes ./runtest -v
 		)
 	done

From 26066642eb4b9c5e68b58a98d9d46c41d48511ea Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Feb 2021 14:25:20 +0100
Subject: [PATCH 0969/3482] busybox: add more applets to busybox-huge.

---
 srcpkgs/busybox/files/dotconfig.d/huge.patch | 421 +++++++++++++++++++
 srcpkgs/busybox/template                     |   4 +-
 2 files changed, 423 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/busybox/files/dotconfig.d/huge.patch

diff --git a/srcpkgs/busybox/files/dotconfig.d/huge.patch b/srcpkgs/busybox/files/dotconfig.d/huge.patch
new file mode 100644
index 000000000000..1ef1465cffd2
--- /dev/null
+++ b/srcpkgs/busybox/files/dotconfig.d/huge.patch
@@ -0,0 +1,421 @@
+@@ -93,7 +93,7 @@
+ CONFIG_PASSWORD_MINLEN=6
+ CONFIG_MD5_SMALL=1
+ CONFIG_SHA3_SMALL=1
+-# CONFIG_FEATURE_FAST_TOP is not set
++CONFIG_FEATURE_FAST_TOP=y
+ # CONFIG_FEATURE_ETC_NETWORKS is not set
+ # CONFIG_FEATURE_ETC_SERVICES is not set
+ CONFIG_FEATURE_EDITING=y
+@@ -124,7 +124,7 @@
+ CONFIG_FEATURE_USE_SENDFILE=y
+ CONFIG_FEATURE_COPYBUF_KB=4
+ CONFIG_FEATURE_SKIP_ROOTFS=y
+-# CONFIG_MONOTONIC_SYSCALL is not set
++CONFIG_MONOTONIC_SYSCALL=y
+ # CONFIG_IOCTL_HEX2STR_ERROR is not set
+ # CONFIG_FEATURE_HWIB is not set
+ 
+@@ -158,9 +158,9 @@
+ CONFIG_BZIP2=y
+ CONFIG_BZIP2_SMALL=8
+ CONFIG_FEATURE_BZIP2_DECOMPRESS=y
+-# CONFIG_CPIO is not set
+-# CONFIG_FEATURE_CPIO_O is not set
+-# CONFIG_FEATURE_CPIO_P is not set
++CONFIG_CPIO=y
++CONFIG_FEATURE_CPIO_O=y
++CONFIG_FEATURE_CPIO_P=y
+ # CONFIG_DPKG is not set
+ # CONFIG_DPKG_DEB is not set
+ CONFIG_GZIP=y
+@@ -191,7 +191,7 @@
+ CONFIG_FEATURE_UNZIP_BZIP2=y
+ CONFIG_FEATURE_UNZIP_LZMA=y
+ CONFIG_FEATURE_UNZIP_XZ=y
+-# CONFIG_FEATURE_LZMA_FAST is not set
++CONFIG_FEATURE_LZMA_FAST=y
+ 
+ #
+ # Coreutils
+@@ -205,7 +205,7 @@
+ CONFIG_CHOWN=y
+ CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
+ CONFIG_CHROOT=y
+-# CONFIG_CKSUM is not set
++CONFIG_CKSUM=y
+ CONFIG_COMM=y
+ CONFIG_CP=y
+ CONFIG_FEATURE_CP_LONG_OPTIONS=y
+@@ -213,11 +213,11 @@
+ CONFIG_CUT=y
+ CONFIG_DATE=y
+ CONFIG_FEATURE_DATE_ISOFMT=y
+-# CONFIG_FEATURE_DATE_NANO is not set
++CONFIG_FEATURE_DATE_NANO=y
+ CONFIG_FEATURE_DATE_COMPAT=y
+ CONFIG_DD=y
+ CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+-# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
++CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
+ CONFIG_FEATURE_DD_IBS_OBS=y
+ CONFIG_FEATURE_DD_STATUS=y
+ CONFIG_DF=y
+@@ -267,7 +266,7 @@
+ #
+ # Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
+ #
+-# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set
++CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+ CONFIG_MKDIR=y
+ CONFIG_MKFIFO=y
+ CONFIG_MKNOD=y
+@@ -313,7 +313,7 @@
+ CONFIG_TEST1=y
+ CONFIG_TEST2=y
+ CONFIG_FEATURE_TEST_64=y
+-# CONFIG_TIMEOUT is not set
++CONFIG_TIMEOUT=y
+ CONFIG_TOUCH=y
+ CONFIG_FEATURE_TOUCH_NODEREF=y
+ CONFIG_FEATURE_TOUCH_SUSV3=y
+@@ -328,7 +328,7 @@
+ CONFIG_BB_ARCH=y
+ CONFIG_UNIQ=y
+ CONFIG_UNLINK=y
+-# CONFIG_USLEEP is not set
++CONFIG_USLEEP=y
+ CONFIG_UUDECODE=y
+ CONFIG_BASE64=y
+ CONFIG_UUENCODE=y
+@@ -371,7 +371,7 @@
+ # CONFIG_FEATURE_LOADFONT_PSF2 is not set
+ # CONFIG_FEATURE_LOADFONT_RAW is not set
+ CONFIG_LOADKMAP=y
+-# CONFIG_OPENVT is not set
++CONFIG_OPENVT=y
+ CONFIG_RESET=y
+ # CONFIG_RESIZE is not set
+ # CONFIG_FEATURE_RESIZE_PRINT is not set
+@@ -543,7 +543,7 @@
+ #
+ CONFIG_CHATTR=y
+ # CONFIG_FSCK is not set
+-# CONFIG_LSATTR is not set
++CONFIG_LSATTR=y
+ # CONFIG_TUNE2FS is not set
+ 
+ #
+@@ -586,7 +586,7 @@
+ CONFIG_BLKID=y
+ CONFIG_FEATURE_BLKID_TYPE=y
+ # CONFIG_BLOCKDEV is not set
+-# CONFIG_CAL is not set
++CONFIG_CAL=y
+ # CONFIG_CHRT is not set
+ CONFIG_DMESG=y
+ CONFIG_FEATURE_DMESG_PRETTY=y
+@@ -639,13 +639,13 @@
+ CONFIG_FEATURE_MDEV_DAEMON=y
+ # CONFIG_MESG is not set
+ # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
+-# CONFIG_MKE2FS is not set
+-# CONFIG_MKFS_EXT2 is not set
++CONFIG_MKE2FS=y
++CONFIG_MKFS_EXT2=y
+ # CONFIG_MKFS_MINIX is not set
+ # CONFIG_FEATURE_MINIX2 is not set
+ # CONFIG_MKFS_REISER is not set
+-# CONFIG_MKDOSFS is not set
+-# CONFIG_MKFS_VFAT is not set
++CONFIG_MKDOSFS=y
++CONFIG_MKFS_VFAT=y
+ CONFIG_MKSWAP=y
+ CONFIG_FEATURE_MKSWAP_UUID=y
+ CONFIG_MORE=y
+@@ -654,24 +654,24 @@
+ CONFIG_FEATURE_MOUNT_VERBOSE=y
+ CONFIG_FEATURE_MOUNT_HELPERS=y
+ CONFIG_FEATURE_MOUNT_LABEL=y
+-CONFIG_FEATURE_MOUNT_NFS=n
++# CONFIG_FEATURE_MOUNT_NFS is not set
+ CONFIG_FEATURE_MOUNT_CIFS=y
+ CONFIG_FEATURE_MOUNT_FLAGS=y
+ CONFIG_FEATURE_MOUNT_FSTAB=y
+ CONFIG_FEATURE_MOUNT_OTHERTAB=y
+-# CONFIG_MOUNTPOINT is not set
++CONFIG_MOUNTPOINT=y
+ # CONFIG_NOLOGIN is not set
+ # CONFIG_NOLOGIN_DEPENDENCIES is not set
+ CONFIG_NSENTER=y
+ CONFIG_PIVOT_ROOT=y
+-# CONFIG_RDATE is not set
++CONFIG_RDATE=y
+ # CONFIG_RDEV is not set
+ # CONFIG_READPROFILE is not set
+ CONFIG_RENICE=y
+-# CONFIG_REV is not set
++CONFIG_REV=y
+ # CONFIG_RTCWAKE is not set
+-# CONFIG_SCRIPT is not set
+-# CONFIG_SCRIPTREPLAY is not set
++CONFIG_SCRIPT=y
++CONFIG_SCRIPTREPLAY=y
+ CONFIG_SETARCH=y
+ CONFIG_LINUX32=y
+ CONFIG_LINUX64=y
+@@ -686,8 +686,8 @@
+ CONFIG_SWAPOFF=y
+ CONFIG_FEATURE_SWAPONOFF_LABEL=y
+ CONFIG_SWITCH_ROOT=y
+-# CONFIG_TASKSET is not set
+-# CONFIG_FEATURE_TASKSET_FANCY is not set
++CONFIG_TASKSET=y
++CONFIG_FEATURE_TASKSET_FANCY=y
+ CONFIG_UEVENT=y
+ CONFIG_UMOUNT=y
+ CONFIG_FEATURE_UMOUNT_ALL=y
+@@ -737,7 +737,12 @@
+ # CONFIG_ADJTIMEX is not set
+ # CONFIG_BBCONFIG is not set
+ # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
+-# CONFIG_BC is not set
++CONFIG_BC=y
++CONFIG_DC=y
++CONFIG_FEATURE_DC_BIG=y
++# CONFIG_FEATURE_DC_LIBM is not set
++CONFIG_FEATURE_BC_INTERACTIVE=y
++CONFIG_FEATURE_BC_LONG_OPTIONS=y
+ # CONFIG_BEEP is not set
+ CONFIG_FEATURE_BEEP_FREQ=0
+ CONFIG_FEATURE_BEEP_LENGTH_MS=0
+@@ -756,9 +761,6 @@
+ # CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set
+ CONFIG_FEATURE_CROND_DIR=""
+ # CONFIG_CRONTAB is not set
+-CONFIG_DC=y
+-# CONFIG_FEATURE_DC_BIG is not set
+-CONFIG_FEATURE_DC_LIBM=y
+ # CONFIG_DEVFSD is not set
+ # CONFIG_DEVFSD_MODLOAD is not set
+ # CONFIG_DEVFSD_FG_NP is not set
+@@ -802,7 +804,7 @@
+ # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+ # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+ # CONFIG_MAN is not set
+-# CONFIG_MICROCOM is not set
++CONFIG_MICROCOM=y
+ # CONFIG_MT is not set
+ # CONFIG_NANDWRITE is not set
+ # CONFIG_NANDDUMP is not set
+@@ -813,7 +815,7 @@
+ # CONFIG_RUNLEVEL is not set
+ # CONFIG_RX is not set
+ CONFIG_SETFATTR=y
+-# CONFIG_SETSERIAL is not set
++CONFIG_SETSERIAL=y
+ CONFIG_STRINGS=y
+ CONFIG_TIME=y
+ CONFIG_TS=y
+@@ -836,20 +838,20 @@
+ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+ # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+ # CONFIG_FEATURE_TLS_SHA1 is not set
+-# CONFIG_ARP is not set
+-# CONFIG_ARPING is not set
++CONFIG_ARP=y
++CONFIG_ARPING=y
+ CONFIG_BRCTL=y
+ CONFIG_FEATURE_BRCTL_FANCY=y
+ CONFIG_FEATURE_BRCTL_SHOW=y
+ # CONFIG_DNSD is not set
+-# CONFIG_ETHER_WAKE is not set
+-# CONFIG_FTPD is not set
+-# CONFIG_FEATURE_FTPD_WRITE is not set
+-# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
+-# CONFIG_FEATURE_FTPD_AUTHENTICATION is not set
+-# CONFIG_FTPGET is not set
+-# CONFIG_FTPPUT is not set
+-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
++CONFIG_ETHER_WAKE=y
++CONFIG_FTPD=y
++CONFIG_FEATURE_FTPD_WRITE=y
++CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
++CONFIG_FEATURE_FTPD_AUTHENTICATION=y
++CONFIG_FTPGET=y
++CONFIG_FTPPUT=y
++CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
+ CONFIG_HOSTNAME=y
+ CONFIG_DNSDOMAINNAME=y
+ CONFIG_HTTPD=y
+@@ -880,12 +882,12 @@
+ # CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+ # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
+ # CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
+-# CONFIG_INETD is not set
+-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
++CONFIG_INETD=y
++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
+ # CONFIG_FEATURE_INETD_RPC is not set
+ CONFIG_IP=y
+ CONFIG_IPADDR=y
+@@ -906,11 +908,11 @@
+ # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+ # CONFIG_FEATURE_IPCALC_FANCY is not set
+ # CONFIG_FAKEIDENTD is not set
+-# CONFIG_NAMEIF is not set
+-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+-# CONFIG_NBDCLIENT is not set
++CONFIG_NAMEIF=y
++CONFIG_FEATURE_NAMEIF_EXTENDED=y
++CONFIG_NBDCLIENT=y
+ CONFIG_NC=y
+-# CONFIG_NETCAT is not set
++CONFIG_NETCAT=y
+ CONFIG_NC_SERVER=y
+ CONFIG_NC_EXTRA=y
+ # CONFIG_NC_110_COMPAT is not set
+@@ -928,13 +930,13 @@
+ CONFIG_PING6=y
+ CONFIG_FEATURE_FANCY_PING=y
+ # CONFIG_PSCAN is not set
+-# CONFIG_ROUTE is not set
++CONFIG_ROUTE=y
+ # CONFIG_SLATTACH is not set
+ CONFIG_SSL_CLIENT=y
+ CONFIG_TC=y
+ CONFIG_FEATURE_TC_INGRESS=y
+-# CONFIG_TCPSVD is not set
+-# CONFIG_UDPSVD is not set
++CONFIG_TCPSVD=y
++CONFIG_UDPSVD=y
+ CONFIG_TELNET=y
+ CONFIG_FEATURE_TELNET_TTYPE=y
+ CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+@@ -942,20 +944,21 @@
+ # CONFIG_TELNETD is not set
+ # CONFIG_FEATURE_TELNETD_STANDALONE is not set
+ # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
+-# CONFIG_TFTP is not set
+-# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+-# CONFIG_TFTPD is not set
+-# CONFIG_FEATURE_TFTP_GET is not set
+-# CONFIG_FEATURE_TFTP_PUT is not set
+-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
++CONFIG_TFTP=y
++CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
++CONFIG_FEATURE_TFTP_HPA_COMPAT=y
++CONFIG_TFTPD=y
++CONFIG_FEATURE_TFTP_GET=y
++CONFIG_FEATURE_TFTP_PUT=y
++CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+ # CONFIG_TFTP_DEBUG is not set
+ CONFIG_TLS=y
+-# CONFIG_TRACEROUTE is not set
+-# CONFIG_TRACEROUTE6 is not set
+-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+-# CONFIG_TUNCTL is not set
+-# CONFIG_FEATURE_TUNCTL_UG is not set
++CONFIG_TRACEROUTE=y
++CONFIG_TRACEROUTE6=y
++CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
++CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
++CONFIG_TUNCTL=y
++CONFIG_FEATURE_TUNCTL_UG=y
+ # CONFIG_VCONFIG is not set
+ CONFIG_WGET=y
+ CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+@@ -966,21 +969,21 @@
+ CONFIG_FEATURE_WGET_OPENSSL=y
+ CONFIG_WHOIS=y
+ # CONFIG_ZCIP is not set
+-# CONFIG_UDHCPD is not set
++CONFIG_UDHCPD=y
+ # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
+-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+-CONFIG_DHCPD_LEASES_FILE=""
++CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
++CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
+ # CONFIG_DUMPLEASES is not set
+ # CONFIG_DHCPRELAY is not set
+ CONFIG_UDHCPC=y
+ CONFIG_FEATURE_UDHCPC_ARPING=y
+ CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
+ CONFIG_UDHCPC_DEFAULT_SCRIPT=""
+-# CONFIG_UDHCPC6 is not set
+-# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
+-# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
+-# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
+-# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
++CONFIG_UDHCPC6=y
++CONFIG_FEATURE_UDHCPC6_RFC3646=y
++CONFIG_FEATURE_UDHCPC6_RFC4704=y
++CONFIG_FEATURE_UDHCPC6_RFC4833=y
++CONFIG_FEATURE_UDHCPC6_RFC5970=y
+ 
+ #
+ # Common options for DHCP applets
+@@ -1002,13 +1005,13 @@
+ #
+ # Mail Utilities
+ #
+-# CONFIG_MAKEMIME is not set
++CONFIG_MAKEMIME=y
+ # CONFIG_POPMAILDIR is not set
+ # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
+-# CONFIG_REFORMIME is not set
+-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
+-# CONFIG_SENDMAIL is not set
+-CONFIG_FEATURE_MIME_CHARSET=""
++CONFIG_REFORMIME=y
++CONFIG_FEATURE_REFORMIME_COMPAT=y
++CONFIG_SENDMAIL=y
++CONFIG_FEATURE_MIME_CHARSET="us-ascii"
+ 
+ #
+ # Process Utilities
+@@ -1021,7 +1024,7 @@
+ CONFIG_KILLALL5=y
+ CONFIG_LSOF=y
+ CONFIG_MPSTAT=y
+-# CONFIG_NMETER is not set
++CONFIG_NMETER=y
+ CONFIG_PGREP=y
+ CONFIG_PKILL=y
+ CONFIG_PIDOF=y
+@@ -1037,7 +1040,7 @@
+ CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS=y
+ CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
+ CONFIG_PSTREE=y
+-# CONFIG_PWDX is not set
++CONFIG_PWDX=y
+ # CONFIG_SMEMCAP is not set
+ CONFIG_BB_SYSCTL=y
+ CONFIG_TOP=y
+@@ -1050,7 +1053,7 @@
+ CONFIG_FEATURE_TOPMEM=y
+ CONFIG_UPTIME=y
+ # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
+-# CONFIG_WATCH is not set
++CONFIG_WATCH=y
+ CONFIG_FEATURE_SHOW_THREADS=y
+ 
+ #
+@@ -1068,7 +1071,7 @@
+ CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service"
+ # CONFIG_SVC is not set
+ CONFIG_SVOK=y
+-# CONFIG_SVLOGD is not set
++CONFIG_SVLOGD=y
+ # CONFIG_CHCON is not set
+ # CONFIG_GETENFORCE is not set
+ # CONFIG_GETSEBOOL is not set
diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index c7c2e9ebbb99..63d7aeb7cebf 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -1,7 +1,7 @@
 # Template file for 'busybox'
 pkgname=busybox
 version=1.31.1
-revision=4
+revision=5
 hostmakedepends="perl"
 checkdepends="zip"
 short_desc="Swiss Army Knife of Embedded Linux"
@@ -60,7 +60,7 @@ do_configure() {
 
 	_patch_config busybox udhcpc ntpd
 	_patch_config busybox-static udhcpc ntpd static
-	_patch_config busybox-huge udhcpc ntpd httpd mdev sysklogd
+	_patch_config busybox-huge udhcpc ntpd httpd mdev sysklogd huge
 
 	for t in busybox-core busybox busybox-static busybox-huge; do
 		make -C "${t}" KBUILD_SRC="${wrksrc}/src" -f "${wrksrc}/src/Makefile" prepare "${makejobs}"

From 83fab7a48095a49cd2406af1ef80fd3ee3bc7d68 Mon Sep 17 00:00:00 2001
From: xolophreny <xolophreny@protonmail.ch>
Date: Thu, 4 Feb 2021 01:00:14 +0500
Subject: [PATCH 0970/3482] vkBasalt: update to 0.3.2.4

---
 srcpkgs/vkBasalt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/vkBasalt/template b/srcpkgs/vkBasalt/template
index 63661ed4e5be..b7f93dd8803e 100644
--- a/srcpkgs/vkBasalt/template
+++ b/srcpkgs/vkBasalt/template
@@ -1,13 +1,13 @@
 # Template file for 'vkBasalt'
 pkgname=vkBasalt
-version=0.3.2.2
+version=0.3.2.4
 revision=1
 build_style=meson
 hostmakedepends="glslang pkg-config"
-makedepends="libX11-devel"
+makedepends="libX11-devel SPIRV-Headers Vulkan-Headers"
 short_desc="Vulkan post-processing layer"
-maintainer="xolophreny <lowranker@protonmail.com>"
+maintainer="xolophreny <xolophreny@protonmail.ch>"
 license="Zlib"
 homepage="https://github.com/DadSchoorse/vkBasalt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=dd2c714b3569d5da0bc2f058d85cfc7683c8a9bc6d6255b80b3e968c902e1913
+checksum=f45d513d9f212e9a1e1ec49448e72c5f2510d62303c38fdb5015b9a3afd42b26

From b0af3d49639e5ad46da354188119d07cee762d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Feb 2021 16:00:43 -0300
Subject: [PATCH 0971/3482] horizon: update to 1.4.0.

Also add changelog.
---
 srcpkgs/horizon/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 7daf6b6154d7..95e87bf0b751 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
 # Template file for 'horizon'
 pkgname=horizon
-version=1.3.0
-revision=2
+version=1.4.0
+revision=1
 build_style=gnu-makefile
 make_build_args="GOLD="
 make_use_env=yes
@@ -13,8 +13,9 @@ short_desc="Free EDA package"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-only"
 homepage="https://horizon-eda.org/"
+changelog="https://raw.githubusercontent.com/horizon-eda/horizon/master/CHANGELOG.md"
 distfiles="https://github.com/horizon-eda/horizon/archive/v${version}.tar.gz"
-checksum=407ae0022d354d173dc9f75549c68f4d26c195375c28a41ea7c6edee6bfd9bab
+checksum=a0fbbbca903594975dd468af10581be8d52256ad441e7f8c71d1e70b341dbfe4
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args+=" INC_OCE=-I$XBPS_CROSS_BASE/usr/include/opencascade"

From e22cd673392e698fe811a8696e2321ce13080423 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 3 Feb 2021 18:48:43 +0200
Subject: [PATCH 0972/3482] doctest: update to 2.4.5.

---
 srcpkgs/doctest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctest/template b/srcpkgs/doctest/template
index 16538dd2c695..cd1e36e79128 100644
--- a/srcpkgs/doctest/template
+++ b/srcpkgs/doctest/template
@@ -1,6 +1,6 @@
 # Template file for 'doctest'
 pkgname=doctest
-version=2.4.4
+version=2.4.5
 revision=1
 build_style=cmake
 short_desc="Doctest C++ testing framework"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/onqtam/doctest"
 changelog="https://raw.githubusercontent.com/onqtam/doctest/master/CHANGELOG.md"
 distfiles="https://github.com/onqtam/doctest/archive/${version}.tar.gz"
-checksum=3bcb62ad316bf4230873a336fcc6eb6292116568a6e19ab8cdd37a1610773d70
+checksum=b76ece19f0e473e3afa5c545dbdce2dd70bfef98ed0f383443b2f9fd9f86d5b4
 
 post_install() {
 	vlicense LICENSE.txt

From 5f4fa85f63b3db1f3c8fef3bae34c8160dd95122 Mon Sep 17 00:00:00 2001
From: Felix Kleinschmidt <fk@bsrd.io>
Date: Wed, 3 Feb 2021 09:54:08 -0300
Subject: [PATCH 0973/3482] keepassxc: update to 2.6.4.

Also fix changelog.

Closes: #28430 [via git-merge-pr]
---
 srcpkgs/keepassxc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index d110e2fd0431..54c33553b87f 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
 # Template file for 'keepassxc'
 pkgname=keepassxc
-version=2.6.3
-revision=2
+version=2.6.4
+revision=1
 build_style=cmake
 configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
  -DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
@@ -23,9 +23,9 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only,
  LGPL-3.0-or-later, Nokia-Qt-exception-1.1, MIT, BSL-1.0"
 homepage="https://keepassxc.org/"
-changelog="https://raw.githubusercontent.com/keepassxreboot/keepassxc/blob/${version}/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/keepassxreboot/keepassxc/blob/develop/CHANGELOG.md"
 distfiles="https://github.com/keepassxreboot/keepassxc/releases/download/${version}/keepassxc-${version}-src.tar.xz"
-checksum=e7e0b6ed8f3881c5b9579074bc3cde3991b28c1a3d1c852c46f2b7930a10f7d1
+checksum=e536e2a71c90fcf264eb831fb1a8b518ee1b03829828f862eeea748d3310f82b
 
 # https://github.com/keepassxreboot/keepassxc/blob/a775031fe9471310e50232d1861d4991e2803aff/CMakeLists.txt#L46
 build_options="autotype browser fdosecrets keeshare network sshagent yubikey"

From 8ddfda9ee16585473296aea34b221c018c1717aa Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Wed, 3 Feb 2021 06:34:12 +1100
Subject: [PATCH 0974/3482] libopenmpt: update to 0.5.5 - remove obsolete build
 options - make PortAudio a build option - build with SDL2 by default - add
 option descriptions

---
 srcpkgs/libopenmpt/template | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/libopenmpt/template b/srcpkgs/libopenmpt/template
index 9b82c7e90b29..55e49689fef5 100644
--- a/srcpkgs/libopenmpt/template
+++ b/srcpkgs/libopenmpt/template
@@ -1,33 +1,31 @@
 # Template file for 'libopenmpt'
 pkgname=libopenmpt
-version=0.5.4
+version=0.5.5
 revision=1
 wrksrc="libopenmpt-${version}+release.autotools"
 build_style=gnu-configure
-configure_args="$(vopt_with pulseaudio)
- $(vopt_with sdl) $(vopt_with sdl2)
- $(vopt_enable libopenmpt_modplug) $(vopt_enable libmodplug)"
+configure_args="$(vopt_with pulseaudio) $(vopt_with sdl2)
+ $(vopt_with portaudio) $(vopt_with portaudio portaudiocpp)"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel mpg123-devel libogg-devel libvorbis-devel
- portaudio-devel portaudio-cpp-devel libsndfile-devel libflac-devel
+makedepends="zlib-devel libsndfile-devel
+ libflac-devel mpg123-devel libogg-devel libvorbis-devel
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if sdl SDL-devel)"
+ $(vopt_if portaudio portaudio-cpp-devel)"
 short_desc="Cross-platform C & C++ library to decode tracked music files (modules)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="BSD-3-Clause"
 homepage="https://lib.openmpt.org/libopenmpt/"
 distfiles="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"
-checksum=f34d06b9daa7bca111625369e5bbc2e7c0e0e04737a439b0e6320811babcef40
-conflicts="$(vopt_if libmodplug libmodplug)"
+checksum=f1e01483ebf1a680d9ec030c9af20f5f2a5ac0f1e0642c18bd5593cfaa9ceb6b
 
 post_install() {
 	vlicense LICENSE
 }
 
 # Package build options
-build_options="pulseaudio sdl2 sdl libopenmpt_modplug libmodplug"
-build_options_default="pulseaudio"
-vopt_conflict sdl2 sdl
+build_options="pulseaudio sdl2 portaudio"
+build_options_default="pulseaudio sdl2 portaudio"
+desc_option_portaudio="Enable support for the PortAudio backend"
 
 libopenmpt-devel_package() {
 	depends="${sourcepkg}-${version}_${revision}"

From 9549f7c5b40069e1eaef7ddd705c3bf44817eeca Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 4 Nov 2020 15:11:11 +0100
Subject: [PATCH 0975/3482] prometheus: update to 2.24.1

---
 srcpkgs/prometheus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 2de044b8fe8d..dcc9ddd28028 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,6 +1,6 @@
 # Template file for 'prometheus'
 pkgname=prometheus
-version=2.21.0
+version=2.24.1
 revision=1
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
@@ -16,8 +16,9 @@ short_desc="Monitoring system and time series database"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://prometheus.io/"
+changelog="https://raw.githubusercontent.com/prometheus/prometheus/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=afafed1be631a53ada60e2b2f12cfdb51dcaee5e539fb65e9983f3276c99f5af
+checksum=9e08bacde869c6c4b68a9e34c7074b812be1391b33d033d3072a5e1ad2debd87
 
 system_accounts="_prometheus"
 
@@ -28,7 +29,6 @@ pre_build() {
 }
 
 post_install() {
-	vlicense LICENSE
 	vlicense NOTICE
 	vmkdir etc/prometheus
 	vmkdir usr/share/doc/prometheus

From 74e0a1291575149b457f607a264857293910781c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 3 Feb 2021 16:24:49 -0500
Subject: [PATCH 0976/3482] build-style/python3-pep517: make sure ./build
 exists in do_install

This allows templates to override do_build and not have to create the
build subdirectory used as TMPDIR in do_install; failure to create this
directory will cause pip to use (and pollute) /tmp in the masterdir.
---
 common/build-style/python3-pep517.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/build-style/python3-pep517.sh b/common/build-style/python3-pep517.sh
index 1a3c6d31eed4..4051185a28e6 100644
--- a/common/build-style/python3-pep517.sh
+++ b/common/build-style/python3-pep517.sh
@@ -25,6 +25,8 @@ do_install() {
 	# As with do_build, no need to accommodate cross compilation here
 	: ${make_install_target:=${pkgname#python3-}-${version}-*-*-*.whl}
 
+	# If do_build was overridden, make sure the TMPDIR exists
+	mkdir -p build
 	TMPDIR=build python3 -m pip install --use-pep517 --prefix /usr \
 		--root ${DESTDIR} --no-deps --no-build-isolation \
 		--no-clean ${make_install_args} ${make_install_target}

From 8eb60b06a1efbba33136132cc29a8f0361241325 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Feb 2021 23:05:28 +0100
Subject: [PATCH 0977/3482] fzf: update to 0.25.1.

---
 srcpkgs/fzf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 6c43ea9a0be4..b0b841a7a6ae 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.25.0
+version=0.25.1
 revision=1
 build_style=go
 go_import_path="github.com/junegunn/fzf"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/junegunn/fzf"
 changelog="https://raw.githubusercontent.com/junegunn/fzf/master/CHANGELOG.md"
 distfiles="https://github.com/junegunn/fzf/archive/${version}.tar.gz"
-checksum=ccbe13733d692dbc4f0e4c0d40c053cba8d22f309955803692569fb129e42eb0
+checksum=b97cf9ab528391a49dfa45b459c767fb2626ade9f3a3f99d0108d7274f2eca8b
 
 post_install() {
 	cd ${wrksrc}

From b40a0952294b399d3893f9cdd483763c16617079 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 3 Feb 2021 22:14:24 +0000
Subject: [PATCH 0978/3482] supermin: update to 5.2.1.

---
 srcpkgs/supermin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 0a038892340a..ff5304205bc5 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
 # Template file for 'supermin'
 pkgname=supermin
-version=5.2.0
-revision=2
+version=5.2.1
+revision=1
 _release_series=5.2-stable
 build_style=gnu-configure
 hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://people.redhat.com/~rjones/supermin/"
 distfiles="http://download.libguestfs.org/supermin/${_release_series}/supermin-${version}.tar.gz"
-checksum=fac7e128198b9b05afca99041fa9d5256cc80c1e3cd97eb3130a794b185cf107
+checksum=c45d8479b6da8ea55ca2c4b82b2c8bc7c2e6f724cf59c980df1dec93fb578ffb
 nocross=yes

From 6c43a3d45ab05ec65c89197f916e3fd59976d25e Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 3 Feb 2021 22:30:13 +0000
Subject: [PATCH 0979/3482] terragrunt: update to 0.28.1.

---
 srcpkgs/terragrunt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index a7dc8ef46868..2215e7ab7276 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.27.3
+version=0.28.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/$pkgname"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=a9d2c8457ba532ca2bbf06312a7b1eb34789119af8ee5b867a11a217d3877272
+checksum=d72f24dd94d3ec7112766c0b5defb67863f52d9bb41bd06b707312dcfb11a246
 
 post_install() {
 	vlicense LICENSE.txt

From b76216a2abd9bdf6603c0c0bcbf3ea1c1caa69ec Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Wed, 3 Feb 2021 09:41:07 +1000
Subject: [PATCH 0980/3482] kops: update to 1.19.0

Closes: #28421 [via git-merge-pr]
---
 srcpkgs/kops/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 4959d6aa79c7..28d8cee38857 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,6 +1,6 @@
 # Template file for 'kops'
 pkgname=kops
-version=1.15.1
+version=1.19.0
 revision=1
 archs="x86_64*"
 build_wrksrc=src/k8s.io/kops
@@ -18,7 +18,7 @@ do_fetch() {
 	# process expects the directory to be a git repository
 	rm -rf $wrksrc
 	mkdir -p $wrksrc/src/k8s.io
-	git clone -b ${version} https://github.com/kubernetes/kops \
+	git clone -b v${version} https://github.com/kubernetes/kops \
 		$wrksrc/src/k8s.io/kops
 }
 

From 7030d364354507a0cefb892e961b56fd5bf4baf7 Mon Sep 17 00:00:00 2001
From: Pierre Bourgin <pierre.bourgin@free.fr>
Date: Tue, 2 Feb 2021 23:42:05 +0100
Subject: [PATCH 0981/3482] kdevelop: update to 5.6.2

---
 srcpkgs/kdevelop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdevelop/template b/srcpkgs/kdevelop/template
index e805fed956f7..57466b22a5ee 100644
--- a/srcpkgs/kdevelop/template
+++ b/srcpkgs/kdevelop/template
@@ -1,6 +1,6 @@
 # Template file for 'kdevelop'
 pkgname=kdevelop
-version=5.6.1
+version=5.6.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -18,7 +18,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.kdevelop.org/"
 distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9e4488522275ebef9d68eebb68523a99e1c58d35e8d75127f7d749784c2e370a
+checksum=0f86bc3fe53f761c1e3e3f7544577a0c41433be8bff310cf2e729f76f4363bf6
 
 build_options="webengine"
 desc_option_webengine="Use Qt5 WebEngine for documentation"

From 7b0cbe15bd2e64df19c09c8d6554341d55808959 Mon Sep 17 00:00:00 2001
From: Pierre Bourgin <pierre.bourgin@free.fr>
Date: Wed, 3 Feb 2021 21:50:14 +0100
Subject: [PATCH 0982/3482] kdevelop-python: update to 5.6.2

---
 srcpkgs/kdevelop-python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdevelop-python/template b/srcpkgs/kdevelop-python/template
index d3aec9f4cdf4..6d2f53fd0e60 100644
--- a/srcpkgs/kdevelop-python/template
+++ b/srcpkgs/kdevelop-python/template
@@ -1,6 +1,6 @@
 # Template file for 'kdevelop-python'
 pkgname=kdevelop-python
-version=5.6.1
+version=5.6.2
 revision=1
 wrksrc="kdev-python-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://www.kdevelop.org/"
 distfiles="${KDE_SITE}/kdevelop/${version}/src/kdev-python-${version}.tar.xz"
-checksum=00d5db9596b7db9a6dd109fd3605dc155ac849b1b88328e038d4cf7b7fd575f3
+checksum=20f9b771b961262ded986a4f32b8d259ad9f7bc48bb29eac0a5d5853be1d917f
 python_version=3
 
 post_install() {

From 4e70bbf9f5bbd86c7113fc835ebcac31584a7d4e Mon Sep 17 00:00:00 2001
From: Pierre Bourgin <pierre.bourgin@free.fr>
Date: Wed, 3 Feb 2021 21:51:15 +0100
Subject: [PATCH 0983/3482] kdevelop-php: update to 5.6.2

---
 srcpkgs/kdevelop-php/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdevelop-php/template b/srcpkgs/kdevelop-php/template
index f54a9dd7c9cb..e31d301d7b00 100644
--- a/srcpkgs/kdevelop-php/template
+++ b/srcpkgs/kdevelop-php/template
@@ -1,6 +1,6 @@
 # Template file for 'kdevelop-php'
 pkgname=kdevelop-php
-version=5.6.1
+version=5.6.2
 revision=1
 wrksrc="kdev-php-${version}"
 build_style=cmake
@@ -15,4 +15,4 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kdevelop.org/"
 distfiles="${KDE_SITE}/kdevelop/${version}/src/kdev-php-${version}.tar.xz"
-checksum=702f12a1ad0caadd020ac30294b70ec6426e7961ac439d270f3010748b3f7a5a
+checksum=f1083daec2b8c752de1a0441d0f9f72274b1e2d29c723005ed78dcf8ba717e0c

From 7691ee66ef733360bd0eecd39ec6c4b56af5350a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Feb 2021 22:31:54 -0300
Subject: [PATCH 0984/3482] COPYING: move to 2021.

---
 COPYING | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/COPYING b/COPYING
index ec7edd5ca709..dd28569f0cbb 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,5 @@
  Copyright (c) 2008-2020 Juan Romero Pardines and contributors
- Copyright (c) 2017-2020 The Void Linux team and contributors
+ Copyright (c) 2017-2021 The Void Linux team and contributors
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without

From 034d95a5d4ee5a6ea74956e6c5683a03772f89ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 2 Feb 2021 21:03:42 +0700
Subject: [PATCH 0985/3482] evolution-data-server: update to 3.38.3, enable gir
 on cross

---
 .../files/disableRuntimeTests.cmake           | 45 -------------------
 .../files/iconv-detect.h                      |  5 ---
 .../evolution-data-server/patches/gir.patch   | 11 +++++
 srcpkgs/evolution-data-server/template        | 45 +++++++------------
 4 files changed, 28 insertions(+), 78 deletions(-)
 delete mode 100644 srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake
 delete mode 100644 srcpkgs/evolution-data-server/files/iconv-detect.h
 create mode 100644 srcpkgs/evolution-data-server/patches/gir.patch

diff --git a/srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake b/srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake
deleted file mode 100644
index 8be55b420707..000000000000
--- a/srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake
+++ /dev/null
@@ -1,45 +0,0 @@
-# This file was generated by CMake because it detected TRY_RUN() commands
-# in crosscompiling mode. It will be overwritten by the next CMake run.
-# Copy it to a safe location, set the variables to appropriate values
-# and use it then to preset the CMake cache (using -C).
-
-
-# _correct_iconv_EXITCODE
-#    indicates whether the executable would have been able to run on its
-#    target platform. If so, set _correct_iconv_EXITCODE to
-#    the exit code (in many cases 0 for success), otherwise enter "FAILED_TO_RUN".
-# The _correct_iconv_COMPILED variable holds the build result for this TRY_RUN().
-# 
-# Source file   : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/CMakeTmp/src.c
-# Executable    : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/cmTC_315ee-_correct_iconv_EXITCODE
-# Run arguments : 
-#    Called from: [2]	/usr/share/cmake-3.9/Modules/CheckCSourceRuns.cmake
-#                 [1]	/builddir/evolution-data-server-3.26.0/CMakeLists.txt
-
-set( _correct_iconv_EXITCODE 
-     0
-     CACHE INTERNAL "Result from TRY_RUN" FORCE)
-set(_correct_iconv_EXITCODE__TRYRUN_OUTPUT
-     0
-     CACHE INTERNAL "Result from TRY_RUN" FORCE)
-
-
-# HAVE_LKSTRFTIME_EXITCODE
-#    indicates whether the executable would have been able to run on its
-#    target platform. If so, set HAVE_LKSTRFTIME_EXITCODE to
-#    the exit code (in many cases 0 for success), otherwise enter "FAILED_TO_RUN".
-# The HAVE_LKSTRFTIME_COMPILED variable holds the build result for this TRY_RUN().
-# 
-# Source file   : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/CMakeTmp/src.c
-# Executable    : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/cmTC_d2897-HAVE_LKSTRFTIME_EXITCODE
-# Run arguments : 
-#    Called from: [2]	/usr/share/cmake-3.9/Modules/CheckCSourceRuns.cmake
-#                 [1]	/builddir/evolution-data-server-3.26.0/CMakeLists.txt
-
-set( HAVE_LKSTRFTIME_EXITCODE 
-     0
-     CACHE INTERNAL "Result from TRY_RUN" FORCE)
-set( HAVE_LKSTRFTIME_EXITCODE__TRYRUN_OUTPUT
-     0
-     CACHE INTERNAL "Result from TRY_RUN" FORCE)
-
diff --git a/srcpkgs/evolution-data-server/files/iconv-detect.h b/srcpkgs/evolution-data-server/files/iconv-detect.h
deleted file mode 100644
index 46f476d5bc92..000000000000
--- a/srcpkgs/evolution-data-server/files/iconv-detect.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* This is an auto-generated header, DO NOT EDIT! */
-
-#define ICONV_ISO_D_FORMAT "iso-%d-%d"
-#define ICONV_ISO_S_FORMAT "iso-%d-%s"
-#define ICONV_10646 "iso-10646"
diff --git a/srcpkgs/evolution-data-server/patches/gir.patch b/srcpkgs/evolution-data-server/patches/gir.patch
new file mode 100644
index 000000000000..c6a5832e2a4a
--- /dev/null
+++ b/srcpkgs/evolution-data-server/patches/gir.patch
@@ -0,0 +1,11 @@
+--- cmake/modules/GObjectIntrospection.cmake
++++ cmake/modules/GObjectIntrospection.cmake
+@@ -122,7 +122,7 @@
+ 		file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}")
+ 
+ 		add_custom_command(
+-			COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS=
++			COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'"
+ 				${INTROSPECTION_SCANNER_ENV}
+ 				${G_IR_SCANNER}
+ 				${INTROSPECTION_SCANNER_ARGS}
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 8ccf9cb6eb0f..2c8be82e8725 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,12 +1,14 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.38.0
+version=3.38.3
 revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
+ -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
  $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')"
-hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel"
+hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel
+ $(vopt_if gir vala)"
 makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel
  libsecret-devel mit-krb5-devel webkit2gtk-devel libgweather-devel
  $(vopt_if gir vala-devel)"
@@ -15,47 +17,34 @@ short_desc="Centralized access to appointments and contacts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-36/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=13689a7b55765806c4d5f3b05ef6c24b0bf9957b9ed9240c2dd09a2cdb13b0af
+checksum=9732f690b252aa7c0932c761740b5098a19705d1b6e4a5de2fad3a16e57e3ca7
 
 build_options="gir"
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
-fi
+build_options_default="gir"
+
+pre_build() {
+	# Only affect g-ir-scanner, which is fine
+	LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/camel"
+	LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/libebackend"
+	LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/libedataserver"
+	LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/private"
+}
 
 # problematic
 do_check() {
 	:
 }
 
-# cmake perfomrms 2 checks using binary runtime, about iconv and sfrtime.
-# musl (1.1.16) does not support "ISO-2022-JP" encoding (see its roadmap),
-# although evolution-data-server is fine with musl.
-# If crossbuild, cmake let disabling runtime checks via specific directives.
-# test iconv-detect.c also generates iconv-detect.h that is required for build.
-# So completly disable test from iconv-detect.c (cmake.patch file) and
-# use a cmake cache file on crossbuild to disable sfrtime running test.
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -C disableRuntimeTests.cmake"
-fi
-
-pre_configure() {
-	mkdir -p build
-	cp ${FILESDIR}/iconv-detect.h ${wrksrc}/build/.
-	if [ "$CROSS_BUILD" ]; then
-		cp ${FILESDIR}/disableRuntimeTests.cmake ${wrksrc}/build/.
-	fi
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd
 }
 
 evolution-data-server-devel_package() {
 	depends="sqlite-devel mit-krb5-devel nss-devel nspr-devel libical-devel
-		libldap-devel libgdata-devel>=0.15 libsecret-devel libglib-devel
-		libsoup-devel gtk+3-devel libxml2-devel gnome-desktop-devel
+		libgdata-devel>=0.15 libsecret-devel libglib-devel
+		libsoup-devel gtk+3-devel libxml2-devel
 		${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {

From f88b85ed5e41d0d05011213475067e0e2313436b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 2 Feb 2021 21:22:21 +0700
Subject: [PATCH 0986/3482] evolution: update to 3.38.3.

---
 srcpkgs/evolution/template | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 103eaa8383ae..442d4769e52c 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,12 +1,13 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.38.0
-revision=2
+version=3.38.3
+revision=1
 build_style=cmake
-build_helper="gir qemu"
-configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF
+build_helper="qemu"
+configure_args="-DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
+ -DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF
  -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_WEATHER=ON"
-hostmakedepends="gobject-introspection intltool itstool pkg-config glib-devel"
+hostmakedepends="intltool itstool pkg-config glib-devel"
 makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel
  evolution-data-server-devel gspell-devel libcanberra-devel
  libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel
@@ -18,15 +19,10 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f81cc40f54aa2d059da4f3a94eb09362e81513306c974a41ca7895b9c8957c5d
+checksum=7fac6226c5626f290b4bdeebd85b1e2c822a250ede53998b4970ddb92585dacd
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so"
 
-build_options="gir"
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
-fi
-
 evolution-devel_package() {
 	depends="webkit2gtk-devel gtk+3-devel libglib-devel evolution-data-server-devel
 	 ${sourcepkg}>=${version}_${revision}"

From f8539936a633eb3427edd3735ba7435b8af42981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 2 Feb 2021 21:27:40 +0700
Subject: [PATCH 0987/3482] folks: enable gir on cross

---
 srcpkgs/folks/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index b076b94bea2e..0a120ec6d11b 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,7 +1,7 @@
 # Template file for 'folks'
 pkgname=folks
 version=0.14.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Db_lto=false"
@@ -19,9 +19,7 @@ distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=d6e778da637d3b33fd9a6b45115e8157d8868211dc08b943d1075b5eb7282bb9
 
 build_options="gir"
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
-fi
+build_options_default="gir"
 
 folks-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From b752f4de639d147bc4747c4910c00b3fc92ae80e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 2 Feb 2021 21:34:13 +0700
Subject: [PATCH 0988/3482] gnome-online-miners: don't have gir

---
 srcpkgs/gnome-online-miners/template | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/gnome-online-miners/template b/srcpkgs/gnome-online-miners/template
index 43b21bf5b9c4..644ac3558c9f 100644
--- a/srcpkgs/gnome-online-miners/template
+++ b/srcpkgs/gnome-online-miners/template
@@ -1,12 +1,10 @@
 # Template file for 'gnome-online-miners'
 pkgname=gnome-online-miners
 version=3.34.0
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel
- $(vopt_if gir gobject-introspection)"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
 makedepends="libzapojit-devel libgdata-devel grilo-devel
  tracker-devel gfbgraph-devel gnome-online-accounts-devel"
 depends="libzapojit>=0.0.3_3"
@@ -16,8 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=845c2260fb12f14315c800d04d60f37e076c7c7b4222587ae75f108562fa52d8
-
-build_options="gir"
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
-fi
+lib32disabled=yes

From 2f5e5f1e5e223f62f6a59ec06c438001391630bf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 3 Feb 2021 22:41:02 -0500
Subject: [PATCH 0989/3482] build-helper/rust: define HOST_CC and HOST_CFLAGS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The cc-rs crate will try to guess the host compiler and use default
flags these are not specifically set. The default behavior is wrong in
Void cross-compilation environments. Explicitly define HOST_CC=gcc and
use innocuous HOST_CFLAGS=-O2 just to thwart the bad defaults.

Co-authored-by: Érico Rolim <erico.erc@gmail.com>
Co-authored-by: Andrew J. Hesford <ajh@sideband.org>

Closes: #28416.
---
 common/build-helper/rust.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 6fcd3bd7d9ed..431cb5f0fd43 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -17,6 +17,12 @@ if [ "$CROSS_BUILD" ]; then
 	# [build]
 	# target = ${RUST_TARGET}
 	export CARGO_BUILD_TARGET="$RUST_TARGET"
+
+	# If cc-rs needs to build host binaries, it guesses the compiler and
+	# uses default (wrong) flags unless they are specified explicitly;
+	# innocuous flags are used here just to disable its defaults
+	export HOST_CC="gcc"
+	export HOST_CFLAGS="-O2"
 else
 	unset CARGO_BUILD_TARGET
 fi

From 1ca01c09a11a79cb130b53b30dcdf34cbcaaaf84 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Feb 2021 11:13:44 +0300
Subject: [PATCH 0990/3482] New package: maturin-0.9.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Érico Rolim <erico.erc@gmail.com>
Co-authored-by: Andrew J. Hesford <ajh@sideband.org>
---
 srcpkgs/maturin/template | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 srcpkgs/maturin/template

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
new file mode 100644
index 000000000000..cce53cf58cce
--- /dev/null
+++ b/srcpkgs/maturin/template
@@ -0,0 +1,36 @@
+# Template file for 'maturin'
+pkgname=maturin
+version=0.9.0
+revision=1
+build_style=cargo
+# Disable the 'rustls' feature, which leads to bad platform compatibility
+# The list of enabled features should be reconciled with each new release
+configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
+hostmakedepends="python3-setuptools python3-toml"
+makedepends="libressl-devel"
+depends="python3-toml"
+short_desc="Build and publish crates as python packages"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/PyO3/maturin"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=22e8082a743e1dc11f5909b596f9053deb7dc1a56336003677381ba02cf67da8
+
+post_patch() {
+	# setup.py is broken, just use it for the pure python part
+	vsed -e 's/cmdclass.*/packages=["maturin"],/' -i setup.py
+}
+
+post_build() {
+	# python package is pure; the cross environment is not relevant
+	python3 setup.py build
+}
+
+do_check() {
+	echo "Tests use unstable features and fail to build; skipping"
+}
+
+post_install() {
+	vlicense license-mit LICENSE-MIT
+	python3 setup.py install --prefix=/usr --root=${DESTDIR}
+}

From c03d7b477e4cbdd0a5521d5c4e6672b3602c37df Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Feb 2021 13:50:32 +0300
Subject: [PATCH 0991/3482] New package: python3-adblock-0.4.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Érico Rolim <erico.erc@gmail.com>
Co-authored-by: Andrew J. Hesford <ajh@sideband.org>

Closes: #28396.
Closes: #28380.
Closes: #27490.
---
 srcpkgs/python3-adblock/template | 46 ++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 srcpkgs/python3-adblock/template

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
new file mode 100644
index 000000000000..c1200f890279
--- /dev/null
+++ b/srcpkgs/python3-adblock/template
@@ -0,0 +1,46 @@
+# Template file for 'python3-adblock'
+pkgname=python3-adblock
+version=0.4.2
+revision=1
+wrksrc="${pkgname/python3/python}-${version}"
+build_style=python3-pep517
+build_helper="rust"
+hostmakedepends="maturin pkg-config cargo libressl-devel"
+makedepends="libressl-devel python3-devel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Brave's adblock library in Python"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/ArniDagur/python-adblock"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=06de6074e6cfe889fc0383cc929a5a2306570251c14e51abbfcedd328b83e0e9
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*) broken="compiler throws SIGABRT on the psl crate" ;;
+esac
+
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" rust-std"
+	export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib"
+	export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include"
+fi
+
+do_build() {
+	maturin build -o . --release --target "${RUST_TARGET}" --manylinux off
+
+	# Drop platform specifiers from the wheel; pip will refuse to install,
+	# e.g., an armv7l wheel on an aarch64 system even if the masterdir is
+	# armv7l. The wheel is correct; no need for name compatibility checks.
+	mv adblock-${version}-*.whl adblock-${version}-py3-none-any.whl
+}
+
+pre_check() {
+	# Tests require the compiled extension
+	cp target/${RUST_TARGET}/release/libadblock.so adblock/adblock.so
+}
+
+post_install() {
+	vlicense LICENSE-MIT
+	chmod 755 ${DESTDIR}/${py3_sitelib}/adblock/*.so
+}

From b63e44af0dc2c757ceb4a9ae59ce3e570557a787 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 30 Jan 2021 03:14:46 +0300
Subject: [PATCH 0992/3482] starship: update to 0.50.0

Make libressl-devel dependency explicit - the final binary is linked
against it; libgit2 isn't being used for the final binary because
libgit2-sys now requires libgit2>=1.1.0, but we leave it in for when
it's updated and starship gets rebuilt.

libgit2-devel is also required on host now - it isn't picked up either.

Building the vendored libgit2 requires zlib-devel, which libgit2-devel
depends on, so the dependency is fullfilled indirectly.  When the
libgit2 package is updated, the build should pick it up.

Closes: #28310 [via git-merge-pr]
---
 srcpkgs/starship/template | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 0eae193aecee..08d0c71e41df 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,18 +1,18 @@
 # Template file for 'starship'
 pkgname=starship
-version=0.48.0
+version=0.50.0
 revision=1
 build_style=cargo
 build_helper=qemu
-hostmakedepends="pkg-config"
-makedepends="libgit2-devel"
+hostmakedepends="pkg-config libgit2-devel"
+makedepends="libressl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="ISC"
 homepage="https://starship.rs"
 distfiles="https://github.com/starship/starship/archive/v${version}.tar.gz"
-checksum=23e729ace48ec0bf6d8eff5f99003351463841f3b28fe453faceb62e6f99bae6
+checksum=d8f4dc9bd266f2a5c34926d361c62fdddb61cd7da4acadba5f9c175eb07602e5
 
 post_build() {
 	STARSHIP="target/${RUST_TARGET}/release/starship"
@@ -23,10 +23,7 @@ post_build() {
 
 do_check() {
 	mkdir -p fake-home
-	local OLDHOME=$HOME
-	export HOME=$(pwd)/fake-home
-	cargo test -q --release --target ${RUST_TARGET}
-	export HOME=$OLDHOME
+	HOME="${wrksrc}/fake-home" cargo test --release --target ${RUST_TARGET}
 }
 
 post_install() {

From 7544f4a2790d469e7ab39f81d6112f47bb731b24 Mon Sep 17 00:00:00 2001
From: Ameise <ameise@bitparlament.de>
Date: Tue, 29 Dec 2020 22:04:53 +0100
Subject: [PATCH 0993/3482] hledger: update to 1.20.4

Closes: #27534 [via git-merge-pr]
---
 srcpkgs/hledger/files/stack.yaml | 6 ------
 srcpkgs/hledger/template         | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100644 srcpkgs/hledger/files/stack.yaml

diff --git a/srcpkgs/hledger/files/stack.yaml b/srcpkgs/hledger/files/stack.yaml
deleted file mode 100644
index fdb69b61aee2..000000000000
--- a/srcpkgs/hledger/files/stack.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-resolver: lts-16.13
-packages:
-- hledger-lib
-- hledger
-- hledger-ui
-- hledger-web
diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index cb7b195d0850..aaad04b778c0 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,6 +1,6 @@
 # Template file for 'hledger'
 pkgname=hledger
-version=1.19.1
+version=1.20.4
 revision=1
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
 homepage="http://hledger.org/"
 changelog="https://hackage.haskell.org/package/hledger-${version}/changelog"
 distfiles="https://github.com/simonmichael/${pkgname}/archive/${version}.tar.gz"
-checksum=9324592f7c9caf8aee856aed3ea4407f1ba8a2119a39143ef6b83c11c5d3029c
+checksum=1213854ee7cf94913652706139b4c7f619af4394f5e70856b859f3c0ed07b2a4
 nopie_files="/usr/bin/hledger"
 nocross=yes # Can't yet cross compile Haskell
 

From fbdcd2ce505b2c1a9bf47081b3e4a3b75bd20a59 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 3 Feb 2021 14:58:18 +0100
Subject: [PATCH 0994/3482] ncmpc: update to 0.44.

---
 srcpkgs/ncmpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index 191fdd33f14e..72207b651614 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,6 +1,6 @@
 # Template file for 'ncmpc'
 pkgname=ncmpc
-version=0.43
+version=0.44
 revision=1
 build_style=meson
 configure_args="-Dlirc=disabled"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/clients/ncmpc/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/ncmpc/master/NEWS"
 distfiles="https://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz"
-checksum=7abf3c83d3a77c18681a8ce90126c8cb1e1884ebde5be2a735293a4f535ed382
+checksum=e9cf0ef9e052d55ec3e863f04724fd0cfe1a1e15e1c0017eed820906690eb58c
 
 post_install() {
 	vmkdir usr/share/examples/ncmpc

From a323e97d8ce15de8ae5f04d940599a58472546ac Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sat, 30 Jan 2021 22:27:18 +0300
Subject: [PATCH 0995/3482] emptty: update to 0.5.0.

---
 srcpkgs/emptty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 43b69aff7c89..402733e1b2a2 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.4.2
+version=0.5.0
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=55d192baacccdd858b3aa07d306a6feb965ec98370bc97522eb8542c2b4db109
+checksum=30fd606e9f2c00c923d6fc5d28774d2454e70f999aee57ff29de73eed824f384
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {

From 02d7e7675faaa91e415f8f1b8d881e8b2be969dc Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 16:29:19 +0100
Subject: [PATCH 0996/3482] elvish: update to 0.15.0.

---
 srcpkgs/elvish/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elvish/template b/srcpkgs/elvish/template
index 5d358752e44a..504a023e9a64 100644
--- a/srcpkgs/elvish/template
+++ b/srcpkgs/elvish/template
@@ -1,6 +1,6 @@
 # Template file for 'elvish'
 pkgname=elvish
-version=0.14.0
+version=0.15.0
 revision=1
 build_style=go
 go_import_path="github.com/elves/elvish"
@@ -8,8 +8,9 @@ short_desc="Novel Unix shell"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="BSD-2-Clause"
 homepage="https://elv.sh/"
+changelog="https://elv.sh/blog/${version}-release-notes.html"
 distfiles="https://github.com/elves/elvish/archive/v${version}.tar.gz"
-checksum=36ed5e0318d75f7e7d616398e42477cfbd6fd2a1d1f108dee7941621cfb7378a
+checksum=761739307c68fcbc51fd46c052c0a20ae848a30dba1ce3fbb6d27f99672f58e0
 register_shell="/bin/elvish"
 
 post_install() {

From b479adebed4a277e09a307696c10bd5c1f05eadd Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 28 Jan 2021 20:43:25 +0100
Subject: [PATCH 0997/3482] oil: update to 0.8.7, don't pretend we are using
 system python.

Closes: #28293 [via git-merge-pr]
---
 srcpkgs/oil/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index df432c0f2859..69ea84476e67 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,20 +1,19 @@
 # Template file for 'oil'
 pkgname=oil
-version=0.8.6
+version=0.8.7
 revision=1
 build_style=configure
 configure_args="--prefix=/usr $(vopt_with readline)"
-hostmakedepends="$(vopt_if readline readline-devel) python"
+hostmakedepends="$(vopt_if readline readline-devel)"
 makedepends="$hostmakedepends"
 short_desc="Oil, a new unix shell"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.oilshell.org"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=7d7d66888f325f39ff4fd71b6d9ffb13afed2ecdd15ec5f73e07c2eec0712235
-python_version=2
+checksum=29c5eed6efccbef6c22dbe5aec3d3d36f7c93da7a8d1cf19fc2cee93b5d1db73
 register_shell="/usr/bin/osh"
-nocross="Binaries doesn't build if cross built"
+nocross="Build systems gets confused with host and cross toolchains/headers"
 nostrip=yes
 
 build_options="readline"
@@ -23,8 +22,6 @@ build_options_default="readline"
 pre_build() {
 	# Remove the strip wrapper
 	rm -f "${XBPS_WRAPPERDIR}"/strip
-	# Use system python
-	vsed -i 's|$PREPARE_DIR/python|python|g' build/actions.sh
 }
 
 do_install() {

From 83c7bc749a12b40331c95c7876e30a1f7ed3b50d Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 26 Jan 2021 16:53:04 +0100
Subject: [PATCH 0998/3482] gotop: update to 4.1.0.

By ericonr:
Actually move to v4 release branch.

Closes: #28242 [via git-merge-pr]
---
 srcpkgs/gotop/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6cfa17573a35..3566a8d9a78e 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,16 +1,18 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.0.1
+version=4.1.0
 revision=1
 build_style=go
-go_import_path=github.com/xxxserxxx/gotop/cmd/gotop
+go_ldflags="-X main.Version=v${version}"
+go_import_path="github.com/xxxserxxx/gotop/v4"
+go_package="$go_import_path/cmd/gotop"
 hostmakedepends="git"
 short_desc="Terminal based graphical activity monitor"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
-license="BSD-3-Clause"
+license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=38a34543ed828ed8cedd93049d9634c2e578390543d4068c19f0d0c20aaf7ba0
+checksum=e61375feb183cc2c73764aaac92e164ea77f073206f7dbbfd4997c0efd38bfc0
 
 post_install() {
 	vlicense LICENSE

From 4dcec0c37617f67dbb65594456c6909e05b50c63 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 4 Feb 2021 12:34:03 +0200
Subject: [PATCH 0999/3482] notcurses: update to 2.1.8.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 09da539f5c44..7ac0f656f87a 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.1.7
+version=2.1.8
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=f6be3cf9654f2a9ccb30ed89aacf248f4edcf5a3c61d2353560e161166fc2d35
+checksum=35a8da40e4eaabbe9aba9ca8d29c30126e47c0d8dbc477532018f72aced07380
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From 88ad9facbe83731b1c387555f5301afdfb0cd025 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 4 Feb 2021 13:12:00 +0100
Subject: [PATCH 1000/3482] linux5.10: update to 5.10.13.

---
 srcpkgs/linux5.10/files/i386-dotconfig   | 41 +++++++++++++-------
 srcpkgs/linux5.10/files/x86_64-dotconfig | 48 +++++++++++++++---------
 srcpkgs/linux5.10/template               |  4 +-
 3 files changed, 60 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index 996cf947ea4a..d7414d89262d 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.10.1 Kernel Configuration
+# Linux/i386 5.10.13 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 9.3.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=234000000
+CONFIG_GCC_VERSION=100201
+CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
@@ -804,6 +804,7 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 CONFIG_HAVE_STATIC_CALL=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_ARCH_SPLIT_ARG64=y
 
 #
 # GCOV-based kernel profiling
@@ -2070,6 +2071,7 @@ CONFIG_REGMAP_SPMI=m
 CONFIG_REGMAP_W1=m
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SOUNDWIRE=m
 CONFIG_REGMAP_I3C=m
 CONFIG_REGMAP_SPI_AVMM=m
 CONFIG_DMA_SHARED_BUFFER=y
@@ -4275,7 +4277,6 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_GENERIC=m
-CONFIG_GPIO_REGMAP=m
 CONFIG_GPIO_MAX730X=m
 
 #
@@ -4331,7 +4332,6 @@ CONFIG_GPIO_LP3943=m
 CONFIG_GPIO_LP873X=m
 CONFIG_GPIO_MADERA=m
 CONFIG_GPIO_MSIC=y
-CONFIG_GPIO_SL28CPLD=m
 CONFIG_GPIO_TIMBERDALE=y
 CONFIG_GPIO_TPS65086=m
 # CONFIG_GPIO_TPS65912 is not set
@@ -4607,7 +4607,6 @@ CONFIG_SENSORS_UCD9000=m
 CONFIG_SENSORS_UCD9200=m
 CONFIG_SENSORS_XDPE122=m
 CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SL28CPLD=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SHT3x=m
@@ -4725,7 +4724,6 @@ CONFIG_WDAT_WDT=m
 # CONFIG_WM831X_WATCHDOG is not set
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_ZIIRAVE_WATCHDOG=m
-CONFIG_SL28CPLD_WATCHDOG=m
 CONFIG_CADENCE_WATCHDOG=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_MAX63XX_WATCHDOG=m
@@ -4882,8 +4880,6 @@ CONFIG_MFD_RT5033=m
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_SEC_CORE is not set
 CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SIMPLE_MFD_I2C=m
-CONFIG_MFD_SL28CPLD=m
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SKY81452=m
@@ -6469,7 +6465,9 @@ CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
 # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set
 CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
 CONFIG_SND_SOC_SOF_HDA=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK=y
 CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
 CONFIG_SND_SOC_SOF_XTENSA=m
 
 #
@@ -6553,6 +6551,7 @@ CONFIG_SND_SOC_MAX98504=m
 CONFIG_SND_SOC_MAX98927=m
 CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_I2C=m
+CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 CONFIG_SND_SOC_MAX9860=m
 CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
@@ -6579,6 +6578,7 @@ CONFIG_SND_SOC_RL6347A=m
 CONFIG_SND_SOC_RT286=m
 CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1015=m
+CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT5616=m
 CONFIG_SND_SOC_RT5631=m
 CONFIG_SND_SOC_RT5640=m
@@ -6590,6 +6590,13 @@ CONFIG_SND_SOC_RT5677=m
 CONFIG_SND_SOC_RT5677_SPI=m
 CONFIG_SND_SOC_RT5682=m
 CONFIG_SND_SOC_RT5682_I2C=m
+CONFIG_SND_SOC_RT5682_SDW=m
+CONFIG_SND_SOC_RT700=m
+CONFIG_SND_SOC_RT700_SDW=m
+CONFIG_SND_SOC_RT711=m
+CONFIG_SND_SOC_RT711_SDW=m
+CONFIG_SND_SOC_RT715=m
+CONFIG_SND_SOC_RT715_SDW=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SI476X=m
 CONFIG_SND_SOC_SIGMADSP=m
@@ -6651,6 +6658,7 @@ CONFIG_SND_SOC_WM8962=m
 CONFIG_SND_SOC_WM8974=m
 CONFIG_SND_SOC_WM8978=m
 CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_WSA881X=m
 CONFIG_SND_SOC_ZL38060=m
 # CONFIG_SND_SOC_ZX_AUD96P22 is not set
 # CONFIG_SND_SOC_MAX9759 is not set
@@ -7040,7 +7048,6 @@ CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_APPLE_MFI_FASTCHARGE=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -7095,7 +7102,6 @@ CONFIG_USB_BDC_UDC=m
 #
 # Platform Support
 #
-CONFIG_USB_BDC_PCI=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_NET2272=m
 # CONFIG_USB_NET2272_DMA is not set
@@ -8063,7 +8069,15 @@ CONFIG_RPMSG_CHAR=m
 CONFIG_RPMSG_VIRTIO=m
 # end of Rpmsg drivers
 
-# CONFIG_SOUNDWIRE is not set
+CONFIG_SOUNDWIRE=m
+
+#
+# SoundWire Devices
+#
+CONFIG_SOUNDWIRE_CADENCE=m
+CONFIG_SOUNDWIRE_INTEL=m
+CONFIG_SOUNDWIRE_QCOM=m
+CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
 
 #
 # SOC (System On Chip) specific Drivers
@@ -8693,7 +8707,6 @@ CONFIG_PWM_LPSS=m
 CONFIG_PWM_LPSS_PCI=m
 CONFIG_PWM_LPSS_PLATFORM=m
 CONFIG_PWM_PCA9685=m
-CONFIG_PWM_SL28CPLD=m
 
 #
 # IRQ chip support
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index 26d396246492..5cfcbb3f3485 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.10.1 Kernel Configuration
+# Linux/x86_64 5.10.13 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 9.3.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=234000000
+CONFIG_GCC_VERSION=100201
+CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
@@ -2132,6 +2132,7 @@ CONFIG_REGMAP_SPMI=m
 CONFIG_REGMAP_W1=m
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SOUNDWIRE=m
 CONFIG_REGMAP_I3C=m
 CONFIG_REGMAP_SPI_AVMM=m
 CONFIG_DMA_SHARED_BUFFER=y
@@ -4345,7 +4346,6 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_GENERIC=m
-CONFIG_GPIO_REGMAP=m
 CONFIG_GPIO_MAX730X=m
 
 #
@@ -4400,7 +4400,6 @@ CONFIG_GPIO_LP3943=m
 CONFIG_GPIO_LP873X=m
 CONFIG_GPIO_MADERA=m
 CONFIG_GPIO_MSIC=y
-CONFIG_GPIO_SL28CPLD=m
 CONFIG_GPIO_TPS65086=m
 # CONFIG_GPIO_TPS65912 is not set
 CONFIG_GPIO_TQMX86=m
@@ -4674,7 +4673,6 @@ CONFIG_SENSORS_UCD9000=m
 CONFIG_SENSORS_UCD9200=m
 CONFIG_SENSORS_XDPE122=m
 CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SL28CPLD=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SHT3x=m
@@ -4794,7 +4792,6 @@ CONFIG_WDAT_WDT=m
 # CONFIG_WM831X_WATCHDOG is not set
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_ZIIRAVE_WATCHDOG=m
-CONFIG_SL28CPLD_WATCHDOG=m
 CONFIG_CADENCE_WATCHDOG=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_MAX63XX_WATCHDOG=m
@@ -4948,8 +4945,6 @@ CONFIG_MFD_RT5033=m
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_SEC_CORE is not set
 CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SIMPLE_MFD_I2C=m
-CONFIG_MFD_SL28CPLD=m
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SKY81452=m
@@ -6482,10 +6477,10 @@ CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
 CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
-CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
-CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
+CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
@@ -6516,6 +6511,8 @@ CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_COFFEELAKE=m
 CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_ICELAKE=m
+CONFIG_SND_SOC_SOF_COMETLAKE=m
+CONFIG_SND_SOC_SOF_COMETLAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT=y
 CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_TIGERLAKE=m
@@ -6529,7 +6526,9 @@ CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
 # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set
 CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
 CONFIG_SND_SOC_SOF_HDA=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK=y
 CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
 CONFIG_SND_SOC_SOF_XTENSA=m
 
 #
@@ -6613,6 +6612,7 @@ CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
 CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_I2C=m
+CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 CONFIG_SND_SOC_MAX9860=m
 CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
@@ -6639,7 +6639,9 @@ CONFIG_SND_SOC_RL6231=m
 CONFIG_SND_SOC_RL6347A=m
 CONFIG_SND_SOC_RT286=m
 CONFIG_SND_SOC_RT298=m
+CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
+CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT5514=m
 CONFIG_SND_SOC_RT5514_SPI=m
 CONFIG_SND_SOC_RT5616=m
@@ -6654,6 +6656,13 @@ CONFIG_SND_SOC_RT5677=m
 CONFIG_SND_SOC_RT5677_SPI=m
 CONFIG_SND_SOC_RT5682=m
 CONFIG_SND_SOC_RT5682_I2C=m
+CONFIG_SND_SOC_RT5682_SDW=m
+CONFIG_SND_SOC_RT700=m
+CONFIG_SND_SOC_RT700_SDW=m
+CONFIG_SND_SOC_RT711=m
+CONFIG_SND_SOC_RT711_SDW=m
+CONFIG_SND_SOC_RT715=m
+CONFIG_SND_SOC_RT715_SDW=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SI476X=m
 CONFIG_SND_SOC_SIGMADSP=m
@@ -6715,6 +6724,7 @@ CONFIG_SND_SOC_WM8962=m
 CONFIG_SND_SOC_WM8974=m
 CONFIG_SND_SOC_WM8978=m
 CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_WSA881X=m
 CONFIG_SND_SOC_ZL38060=m
 # CONFIG_SND_SOC_ZX_AUD96P22 is not set
 # CONFIG_SND_SOC_MAX9759 is not set
@@ -7112,7 +7122,6 @@ CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_APPLE_MFI_FASTCHARGE=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -7167,7 +7176,6 @@ CONFIG_USB_BDC_UDC=m
 #
 # Platform Support
 #
-CONFIG_USB_BDC_PCI=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_NET2272=m
 # CONFIG_USB_NET2272_DMA is not set
@@ -8198,7 +8206,15 @@ CONFIG_RPMSG_CHAR=m
 CONFIG_RPMSG_VIRTIO=m
 # end of Rpmsg drivers
 
-# CONFIG_SOUNDWIRE is not set
+CONFIG_SOUNDWIRE=m
+
+#
+# SoundWire Devices
+#
+CONFIG_SOUNDWIRE_CADENCE=m
+CONFIG_SOUNDWIRE_INTEL=m
+CONFIG_SOUNDWIRE_QCOM=m
+CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
 
 #
 # SOC (System On Chip) specific Drivers
@@ -8830,7 +8846,6 @@ CONFIG_PWM_LPSS=m
 CONFIG_PWM_LPSS_PCI=m
 CONFIG_PWM_LPSS_PLATFORM=m
 CONFIG_PWM_PCA9685=m
-CONFIG_PWM_SL28CPLD=m
 
 #
 # IRQ chip support
@@ -9746,7 +9761,6 @@ CONFIG_DMA_OPS=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_DMA_VIRT_OPS=y
 CONFIG_SWIOTLB=y
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_SGL_ALLOC=y
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index ecf5eeed7016..cfc4ec0bde61 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.12
+version=5.10.13
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=1d454f2817ab4f34cf313ea680ab75e20f79c6431b3bd3ea3bcd39353030c4aa
+checksum=06698c0ce35ceefa9b79ceb108ec7fb86de05f51fe615f3ae5cc82e293dfe1f2
 python_version=3
 patch_args="-Np1"
 

From dd308a60a12c047824acb97a48cee8a850602f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 4 Feb 2021 19:22:13 +0700
Subject: [PATCH 1001/3482] python-gobject: conflicts with
 python3-gobject-devel

---
 srcpkgs/python-gobject/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python-gobject/template b/srcpkgs/python-gobject/template
index c17722c2d43e..0ea5cc9361ee 100644
--- a/srcpkgs/python-gobject/template
+++ b/srcpkgs/python-gobject/template
@@ -1,7 +1,7 @@
 # Template file for 'python-gobject'
 pkgname=python-gobject
 version=3.36.1
-revision=1
+revision=2
 wrksrc="pygobject-${version}"
 build_style=meson
 build_helper="gir"
@@ -20,6 +20,7 @@ python-gobject-devel_package() {
 	depends="libgirepository-devel python-cairo-devel
 	 libglib-devel libffi-devel
 	 python-gobject>=${version}_${revision}"
+	conflicts="python3-gobject-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From f89bba46252ea684af68d6ea2914bb9abd58d23d Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Thu, 21 Jan 2021 19:58:04 +0100
Subject: [PATCH 1002/3482] plymouth: update to 0.9.5.

---
 common/shlibs             |  4 ----
 srcpkgs/plymouth/template | 10 +++++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 1523374f949f..35263ec4744a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2751,10 +2751,6 @@ libTKXmlXCAF.so.11 oce-0.18_1
 libTKernel.so.11 oce-0.18_1
 libKF5CoreAddons.so.5 kcoreaddons-5.26.0_1
 librpmatch.so.0 musl-rpmatch-1.0_1
-libply.so.4 plymouth-0.9.2_1
-libply-splash-core.so.4 plymouth-0.9.2_1
-libply-splash-graphics.so.4 plymouth-0.9.2_1
-libply-boot-client.so.4 plymouth-0.9.2_1
 libmilter.so.1.0.2 libmilter-1.0.2_1
 libopendkim.so.10 opendkim-2.10.3_1
 libtevent.so.0 tevent-0.9.28_1
diff --git a/srcpkgs/plymouth/template b/srcpkgs/plymouth/template
index afb00bfb2a82..17f801fc5315 100644
--- a/srcpkgs/plymouth/template
+++ b/srcpkgs/plymouth/template
@@ -1,15 +1,15 @@
 # Template file for 'plymouth'
 pkgname=plymouth
-version=0.9.4
-revision=2
+version=0.9.5
+revision=1
 build_style=gnu-configure
 configure_args="--with-system-root-install=no \
  --without-rhgb-compat-link --enable-systemd-integration=no \
- --enable-gdm-transition $(vopt_enable gtk3 gtk) $(vopt_enable pango) \
+ $(vopt_enable gtk3 gtk) $(vopt_enable pango) \
  --with-logo=/usr/share/void-artwork/void-transparent.png --localstatedir=/ \
  --disable-documentation"
 conf_files="/etc/plymouth/plymouthd.conf"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
 makedepends="libdrm-devel libpng-devel void-artwork
  $(vopt_if gtk3 gtk+3-devel) $(vopt_if pango pango-devel)"
 depends="plymouth-data>=0"
@@ -18,7 +18,7 @@ maintainer="William OD <obirik2005@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/Plymouth/"
 distfiles="${FREEDESKTOP_SITE}/plymouth/releases/$pkgname-$version.tar.xz"
-checksum=4a197a4f1a05785d7453dd829b231352fb2d09171bd86c5ffaafbb2dd6791351
+checksum=ecae257f351d098340542a5bc06de029404c24dcee87e6ebb2abd5ef117fce86
 
 build_options="gtk3 pango"
 build_options_default="gtk3 pango"

From 5251fe6d9b07d2da85fe3c24c12c40fc9ec97f98 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 3 Feb 2021 20:13:56 +0100
Subject: [PATCH 1003/3482] apparmor: various fixes

* add missing python3 dependencies for aa-notify
* do not rewrite logfiles option in logprof.conf aggressively
* remove an old patch
* fix segfault on musl (was also an issue on glibc, just empty output
instead of segfault)
* depend on explicit libapparmor version

Closes #28127

Closes: #28448 [via git-merge-pr]
---
 .../add-missing-typedef-definitions.patch     | 49 -----------------
 .../patches/correct_paths_logprofconf.patch   |  9 ++--
 .../patches/fix-setting-proc_attr_base.patch  | 52 +++++++++++++++++++
 srcpkgs/apparmor/template                     |  7 +--
 4 files changed, 60 insertions(+), 57 deletions(-)
 delete mode 100644 srcpkgs/apparmor/patches/add-missing-typedef-definitions.patch
 create mode 100644 srcpkgs/apparmor/patches/fix-setting-proc_attr_base.patch

diff --git a/srcpkgs/apparmor/patches/add-missing-typedef-definitions.patch b/srcpkgs/apparmor/patches/add-missing-typedef-definitions.patch
deleted file mode 100644
index 30925916350a..000000000000
--- a/srcpkgs/apparmor/patches/add-missing-typedef-definitions.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Source: Alpine Linux
-Upstream: Unknown
-Reason: Fixes compilation with musl libc
----
-
-diff --git a/parser/missingdefs.h b/parser/missingdefs.h
-new file mode 100644
-index 0000000..8097aef
---- /dev/null
-+++ b/parser/missingdefs.h
-@@ -0,0 +1,8 @@
-+#ifndef PARSER_MISSINGDEFS_H
-+#define PARSER_MISSINGDEFS_H
-+
-+typedef int (*__compar_fn_t) (const void *, const void *);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef void (*__free_fn_t) (void *__nodep);
-+
-+#endif
-diff --git a/parser/parser_alias.c b/parser/parser_alias.c
-index f5b6da4..d57f580 100644
---- a/parser/parser_alias.c
-+++ b/parser/parser_alias.c
-@@ -25,6 +25,10 @@
- #include "parser.h"
- #include "profile.h"
- 
-+#ifndef __GLIBC__
-+#include "missingdefs.h"
-+#endif
-+
- struct alias_rule {
- 	char *from;
- 	char *to;
-diff --git a/parser/parser_symtab.c b/parser/parser_symtab.c
-index 3e667d8..e109f4d 100644
---- a/parser/parser_symtab.c
-+++ b/parser/parser_symtab.c
-@@ -25,6 +25,10 @@
- #include "immunix.h"
- #include "parser.h"
- 
-+#ifndef __GLIBC__
-+#include "missingdefs.h"
-+#endif
-+
- enum var_type {
- 	sd_boolean,
- 	sd_set,
diff --git a/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch b/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch
index fb6ce53ffdc6..e34e69af8bfb 100644
--- a/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch
+++ b/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch
@@ -11,15 +11,18 @@ diff --git a/utils/logprof.conf b/utils/logprof.conf
 index a778792..a9f7b79 100644
 --- a/utils/logprof.conf
 +++ b/utils/logprof.conf
-@@ -14,7 +14,7 @@
+@@ -12,9 +12,9 @@
+ [settings]
+   profiledir = /etc/apparmor.d /etc/subdomain.d
    inactive_profiledir = /usr/share/apparmor/extra-profiles 
-   logfiles = /var/log/audit/audit.log /var/log/syslog /var/log/messages
+-  logfiles = /var/log/audit/audit.log /var/log/syslog /var/log/messages
++  logfiles = /var/log/audit/audit.log /var/log/socklog/kernel/current /var/log/syslog /var/log/messages
  
 -  parser = /sbin/apparmor_parser /sbin/subdomain_parser
 +  parser = /usr/bin/apparmor_parser /usr/bin/subdomain_parser
    ldd = /usr/bin/ldd
    logger = /bin/logger /usr/bin/logger
- 
+
 @@ -51,12 +51,10 @@
    /bin/mount    = u
    /usr/bin/mount = u
diff --git a/srcpkgs/apparmor/patches/fix-setting-proc_attr_base.patch b/srcpkgs/apparmor/patches/fix-setting-proc_attr_base.patch
new file mode 100644
index 000000000000..35e9101f81b9
--- /dev/null
+++ b/srcpkgs/apparmor/patches/fix-setting-proc_attr_base.patch
@@ -0,0 +1,52 @@
+upstream: yes
+From cc113f4820721808c9efec8b075a5482e6f9a3ad Mon Sep 17 00:00:00 2001
+From: Aaron U'Ren <aauren@users.noreply.gitlab.com>
+Date: Wed, 20 Jan 2021 17:26:37 -0600
+Subject: [PATCH] fix setting proc_attr_base
+
+There is currently a case in which proc_attr_base won't get set when
+asprintf is able to generate the path, but the file doesn't exist, it
+will exit proc_attr_base_init_once() without proc_attr_base having been
+set as the fall-through if/else logic will get bypassed when asprintf is
+successful.
+---
+ libraries/libapparmor/src/kernel.c | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/libraries/libapparmor/src/kernel.c b/libraries/libapparmor/src/kernel.c
+index 0fa77b014..6ba028614 100644
+--- a/libraries/libapparmor/src/kernel.c
++++ b/libraries/libapparmor/src/kernel.c
+@@ -239,18 +239,21 @@ static void proc_attr_base_init_once(void)
+ 	/* if we fail we just fall back to the default value */
+ 	if (asprintf(&tmp, "/proc/%d/attr/apparmor/current", aa_gettid())) {
+ 		autoclose int fd = open(tmp, O_RDONLY);
+-		if (fd != -1)
++		if (fd != -1) {
+ 			proc_attr_base = proc_attr_base_stacking;
+-	} else if (!is_enabled() && is_private_enabled()) {
++			return;
++		}
++	}
++	if (!is_enabled() && is_private_enabled()) {
+ 		/* new stacking interfaces aren't available and apparmor
+-		 * is disabled, but available. do not use the
+-		 * /proc/<pid>/attr/ * interfaces as they could be
+-		 * in use by another LSM
+-		 */
++		* is disabled, but available. do not use the
++		* /proc/<pid>/attr/ * interfaces as they could be
++		* in use by another LSM
++		*/
+ 		proc_attr_base = proc_attr_base_unavailable;
+-	} else {
+-		proc_attr_base = proc_attr_base_old;
++		return;
+ 	}
++	proc_attr_base = proc_attr_base_old;
+ }
+ 
+ static char *procattr_path(pid_t pid, const char *attr)
+-- 
+GitLab
+
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index f6f5bff6aae8..6e7300cff1ed 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
 version=3.0.1
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
@@ -9,7 +9,7 @@ conf_files="/etc/apparmor.d/local/* /etc/apparmor/*"
 make_dirs="/etc/apparmor.d/disable 0755 root root"
 hostmakedepends="bison flex autoconf automake libtool gettext swig python3 which"
 makedepends="perl python3-devel"
-depends="runit-void-apparmor python3 libapparmor"
+depends="runit-void-apparmor libapparmor-${version}_${revision} python3-notify2 python3-psutil"
 checkdepends="dejagnu"
 short_desc="Mandatory access control to restrict programs"
 maintainer="Olivier Mauras <olivier@mauras.ch>"
@@ -32,9 +32,6 @@ pre_build() {
 	# Replace release profiles with our own
 	cd ${wrksrc}
 	cp ${FILESDIR}/profiles/* profiles/apparmor.d/
-
-	# use the correct syslog path
-	vsed -i utils/logprof.conf -e 's,logfiles = .*,logfiles = /var/log/socklog/kernel/current,'
 }
 
 post_build() {

From 5de07515096792f050fbbba9b7d2f665c48dabe5 Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Wed, 3 Feb 2021 21:58:23 -0700
Subject: [PATCH 1004/3482] sc-controller: update to 0.4.8.

---
 srcpkgs/sc-controller/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sc-controller/template b/srcpkgs/sc-controller/template
index 3147c3b8ca74..d0c7891718a5 100644
--- a/srcpkgs/sc-controller/template
+++ b/srcpkgs/sc-controller/template
@@ -1,15 +1,14 @@
 # Template file for 'sc-controller'
 pkgname=sc-controller
-version=0.4.7
+version=0.4.8
 revision=1
 build_style=python2-module
-pycompile_module="scc"
 hostmakedepends="python-setuptools"
 makedepends="python-devel zlib-devel"
 depends="gtk+3 python-gobject python-cairo python-evdev kernel-libc-headers"
 short_desc="User-mode driver and GTK3 based GUI for Steam Controller"
-maintainer="vintodrimmer <vintodrimmer@protonmail.ch>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/kozec/sc-controller"
 distfiles="https://github.com/kozec/sc-controller/archive/v${version}.tar.gz"
-checksum=b564d2f35a0a41ed5ea17df4add545a6e2035b6444227880131cdcced620ef04
+checksum=2abd6261e86ea396e306d29b9eb218ed1b34c2bc868ebd81a25561f025c6754a

From 98bb2f05c968fa114a3e81bccbacb1203be69e7d Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Thu, 4 Feb 2021 08:44:06 +0100
Subject: [PATCH 1005/3482] kotlin-bin: update to 1.4.30.

---
 srcpkgs/kotlin-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kotlin-bin/template b/srcpkgs/kotlin-bin/template
index dcd1d7249044..c566af52ed52 100644
--- a/srcpkgs/kotlin-bin/template
+++ b/srcpkgs/kotlin-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'kotlin-bin'
 pkgname=kotlin-bin
-version=1.4.21
+version=1.4.30
 revision=1
 archs="x86_64"
 wrksrc=kotlinc
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="Apache-2.0"
 homepage="https://kotlinlang.org/"
 distfiles="https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"
-checksum=46720991a716e90bfc0cf3f2c81b2bd735c14f4ea6a5064c488e04fd76e6b6c7
+checksum=7b0aae9dca5ea899ef05dedc0a6fdd6e359451e56ff0dd3354443b3208b31800
 nostrip=yes
 replaces="kotlin>=0"
 

From 67cbd1c24e3aaa09bd3694f3afb85de6dc5611e3 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 09:47:05 +0000
Subject: [PATCH 1006/3482] eog: update to 3.38.1.

---
 srcpkgs/eog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 2759273872eb..8ed50879fea8 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
 # Template file for 'eog'
 pkgname=eog
-version=3.38.0
+version=3.38.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
 distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=e1a3a47c38688cd538deda627c0eff113d05c316b1dde6243150437259d2d963
+checksum=b71dc961c277effa70dbd466657a81585f52ee8b35bc6e9da20c993568740cf7
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From 5572293a678ebbc6dd3c1487a91ad0f77b76f03a Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Thu, 4 Feb 2021 01:36:14 -0800
Subject: [PATCH 1007/3482] GoLand: update to 2020.3.2.

---
 srcpkgs/GoLand/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template
index 71067ad0f526..24209cb2e882 100644
--- a/srcpkgs/GoLand/template
+++ b/srcpkgs/GoLand/template
@@ -1,6 +1,6 @@
 # Template file for 'GoLand'
 pkgname=GoLand
-version=2020.3.1
+version=2020.3.2
 revision=1
 archs="i686 x86_64"
 depends="jetbrains-jdk-bin"
@@ -9,7 +9,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/go"
 distfiles="https://download.jetbrains.com/go/goland-${version}.tar.gz"
-checksum=b336e309edf51a3c6fa9b3424538a4cd9055d6516373fcf0f1d5a9ba840af189
+checksum=5f1bacaadac20259b58215fb3a5f58fe97ba1051279a7f9060693d1e1ea18b03
 repository=nonfree
 restricted=yes
 nopie=yes

From ab0f1f1187a49dc631f8837c197a8f2e5e5b2657 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 4 Feb 2021 15:14:55 +0100
Subject: [PATCH 1008/3482] isync: update to 1.3.4.

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 2800273dec6b..90bcda4d6c97 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.3.3
+version=1.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=f2213bf7f90266e1295deafe39b02d1ba0b4c7f3b897c09cd17c60f0d4f4c882
+checksum=e8eb449c46e53910bb56a71b1bdc8bfe9aad9ad8e5cab4affba1368dc3c72e71
 
 post_install() {
 	vsconf src/mbsyncrc.sample

From 92975a639c67c67db4e16a792d1b56a768ba78a6 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 4 Feb 2021 08:56:43 -0600
Subject: [PATCH 1009/3482] yara: update to 4.0.4.

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index f066214b73ba..5da018113562 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,6 +1,6 @@
 # Template file for 'yara'
 pkgname=yara
-version=4.0.3
+version=4.0.4
 revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://virustotal.github.io/yara/"
 distfiles="https://github.com/VirusTotal/yara/archive/v${version}.tar.gz"
-checksum=d95b7f5e2981328a10ea206e3384d661bd4d488e43e8d1785152bdea44d89880
+checksum=67fdc6f1050261914cf4a9e379b60961f62c2f76af676bafb2ceb47dd642d44f
 
 pre_configure() {
 	autoreconf -fi

From 830a4cf6543a0a9e8535116d191844c3df48a0a9 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Thu, 4 Feb 2021 10:03:08 -0700
Subject: [PATCH 1010/3482] youtube-dl: update to 2021.02.04.1

---
 srcpkgs/youtube-dl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index b78dd725ff65..f9b24b836220 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-dl'
 pkgname=youtube-dl
-version=2021.01.24.1
+version=2021.02.04.1
 revision=1
 wrksrc="${pkgname}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
 homepage="https://yt-dl.org"
 changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"
 distfiles="${homepage}/downloads/${version}/${pkgname}-${version}.tar.gz"
-checksum=de2516d3e6de73f2089dd0ccb0880364c7da34e5c902631feb96d4ebc6d13000
+checksum=0a4b3865ab0471d26c5977f1390b555e4e222c1cfff5bed9e2f52fd128bdc866
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 13fed47d42cef68ef383876d24dcd9b56a1716d1 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 4 Feb 2021 14:13:24 +0100
Subject: [PATCH 1011/3482] curl: update to 7.75.0.

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index eb1686696af7..6533875c7345 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,6 +1,6 @@
 # Template file for 'curl'
 pkgname=curl
-version=7.74.0
+version=7.75.0
 revision=1
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
@@ -21,7 +21,7 @@ license="MIT"
 homepage="https://curl.haxx.se"
 changelog="https://curl.haxx.se/changes.html#${version//./_}"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=0f4d63e6681636539dc88fa8e929f934cd3a840c46e0bf28c73be11e521b77a5
+checksum=50552d4501c178e4cc68baaecc487f466a3d6d19bbf4e50a01869effb316d026
 patch_args="-Np1"
 build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
 build_options_default="ssh ssl zstd"

From 69f21bc1c15cc345eae7942b76ab0ee005dfb061 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 14:06:34 +0000
Subject: [PATCH 1012/3482] gnome-user-docs: update to 3.38.2.

---
 srcpkgs/gnome-user-docs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index a217e5e85397..a4ab3218bd75 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-user-docs'
 pkgname=gnome-user-docs
-version=3.38.0
+version=3.38.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
 homepage="https://github.com/GNOME/gnome-user-docs"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=38d3db5b5dc5912812a2c6cb29765bfb39242cedcd7ee347df98fca777dcee8a
+checksum=f50cbb3a39dd6290c82f9476159606751ec9f25baafafb4c7c95b10f90f534c1

From d367a2f5fa5b042ca433ac23490ffecb6c322fd3 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Thu, 4 Feb 2021 19:30:53 +0100
Subject: [PATCH 1013/3482] pipewire: update to 0.3.21

---
 srcpkgs/pipewire/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index e39d7ab0511f..50d32828a47d 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.20
-revision=2
+version=0.3.21
+revision=1
 build_style=meson
 configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false
  -Dbluez5=true -Dffmpeg=true -Dpipewire-alsa=true -Dpipewire-jack=true
@@ -18,7 +18,7 @@ license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=7da6d8283aea6b37480e626b57f23b2bf70d6b73470105a5853b213786d1c097
+checksum=228e744f7acfac92e4c7a2606ed7f6ecd7460f53ec735e7c01176539e386432b
 conf_files="/etc/pipewire/pipewire.conf"
 
 replaces="libpulseaudio-pipewire>=0"

From 5372759b2bcf98ee86622e4bcbd657fa5a06f21d Mon Sep 17 00:00:00 2001
From: andry-dev <andry-dev@users.noreply.github.com>
Date: Mon, 1 Feb 2021 14:58:57 +0100
Subject: [PATCH 1014/3482] kdenlive: update to 20.12.1.

---
 srcpkgs/kdenlive/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 6dad06ea8074..0f39d8061bb3 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -1,6 +1,6 @@
 # Template file for 'kdenlive'
 pkgname=kdenlive
-version=20.08.3
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -17,7 +17,18 @@ maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9f8f3636f65f42a73fd1a97e29f8493fbcb8297ca755852eae93258ce12ceda0
+checksum=9b6e22ad311c33457e7f7147ad873286945fc6c3b610129856fd01cbb51da458
 
 # needed for mlt to work on musl
 CXXFLAGS="-DHAVE_LOCALE_H=1"
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}
+
+do_check() {
+	# Intentionally disable checks since tests won't run.
+	# See: https://github.com/void-linux/void-packages/pull/28390
+
+	true
+}

From 318b3778b12636a75794a105ddc4983c4619918b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:10:06 +0100
Subject: [PATCH 1015/3482] rem: update homepage and distfiles

---
 srcpkgs/rem/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/rem/template b/srcpkgs/rem/template
index 37de6f0230be..5278bb98653b 100644
--- a/srcpkgs/rem/template
+++ b/srcpkgs/rem/template
@@ -1,7 +1,7 @@
 # Template file for 'rem'
 pkgname=rem
 version=0.6.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="EXTRA_CFLAGS=$CFLAGS EXTRA_LFLAGS=$LDFLAGS RELEASE=1
  LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk \
@@ -11,11 +11,11 @@ make_install_args="${make_build_args}"
 make_use_env=yes
 makedepends="re-devel"
 short_desc="Library for real-time audio and video processing"
-maintainer="JohnZ <me@johnnynator.dev>"
+maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
-homepage="http://www.creytiv.com/"
-distfiles="http://www.creytiv.com/pub/rem-${version}.tar.gz"
-checksum=417620da3986461598aef327c782db87ec3dd02c534701e68f4c255e54e5272c
+homepage="https://github.com/creytiv/rem"
+distfiles="https://github.com/creytiv/rem/archive/v${version}.tar.gz"
+checksum=fb04e691161eea23c238362b210351d7a19a23691cf31db7d64e364320f18a33
 shlib_provides="librem.so"
 
 case $XBPS_TARGET_MACHINE in

From bebc343fea9629ca37b6782f751da41e1b2b12c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:11:19 +0100
Subject: [PATCH 1016/3482] re: update to 1.1.0.

---
 srcpkgs/re/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 8e16a8743126..1d866b465436 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,19 +1,20 @@
 # Template file for 're'
 pkgname=re
-version=0.6.1
-revision=2
+version=1.1.0
+revision=1
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
- EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes USE_DTLS_SRTP=yes"
+ EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
+ USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel"
+makedepends="libressl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
-maintainer="JohnZ <me@johnnynator.dev>"
+maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
-homepage="http://www.creytiv.com/"
-distfiles="http://www.creytiv.com/pub/re-${version}.tar.gz"
-checksum=cd5bfc79640411803b200c7531e4ba8a230da3806746d3bd2de970da2060fe43
+homepage="https://github.com/baresip/re/"
+distfiles="https://github.com/baresip/re/archive/v${version}.tar.gz"
+checksum=82afc903a6b1e436b357f05eb11560ec681712291dd9c83c408465c895f28b5d
 shlib_provides="libre.so"
 
 case $XBPS_TARGET_MACHINE in

From 07e96a3f79e61b6ee770068abb4bd7866e863bb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:11:28 +0100
Subject: [PATCH 1017/3482] baresip: update to 1.0.0.

closes #28498
---
 srcpkgs/baresip/patches/sndio.patch | 11 -----------
 srcpkgs/baresip/template            | 24 ++++++++++++------------
 2 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/baresip/patches/sndio.patch

diff --git a/srcpkgs/baresip/patches/sndio.patch b/srcpkgs/baresip/patches/sndio.patch
deleted file mode 100644
index 64540d9630df..000000000000
--- a/srcpkgs/baresip/patches/sndio.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mk/modules.mk	2019-12-01 10:35:22.000000000 +0100
-+++ -	2019-12-05 12:38:06.423746546 +0100
-@@ -242,7 +242,7 @@
- USE_WINWAVE := yes
- MODULES   += wincons
- endif
--ifeq ($(OS),openbsd)
-+ifeq ($(OS),linux)
- MODULES   += sndio
- endif
- ifeq ($(OS),freebsd)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 0e45d3976032..a731d5530907 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,15 +1,15 @@
 # Template file for 'baresip'
 pkgname=baresip
-version=0.6.5
-revision=2
+version=1.0.0
+revision=1
 build_style=gnu-makefile
-make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk
- SYSROOT=${XBPS_CROSS_BASE}/usr  LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
- LIBRE_SO=${XBPS_CROSS_BASE}/usr/lib EXTRA_MODULES=$(vopt_if video snapshot)
- USE_ALSA= USE_GST= USE_GST_VIDEO= USE_OSS= USE_SDL= USE_ZRTP=
- $(vopt_if video '' 'USE_AVCODEC= USE_AVFORMAT= USE_CAIRO= USE_SDL2= USE_V4L=
- USE_V4L2= USE_VIDEO= USE_VPX= USE_X11=') PREFIX=/usr
- $(vopt_if gtk '' 'USE_CAIRO= USE_GST1= USE_GST_VIDEO1= USE_GTK=')"
+make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
+ SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
+ LIBRE_SO=${XBPS_CROSS_BASE}/usr/lib LIBDIR=/usr/lib${XBPS_TARGET_WORDSIZE}
+ EXTRA_MODULES=$(vopt_if video snapshot) USE_ALSA=yes USE_GST=yes USE_GST_VIDEO=yes
+ USE_OSS=yes USE_SDL=yes $(vopt_if video '' 'USE_AVCODEC=tes USE_AVFORMAT=yes
+ USE_CAIRO=yes USE_SDL2=yes USE_V4L2=yes USE_VIDEO=yes USE_VPX=yes USE_X11=yes')
+ $(vopt_if gtk '' 'USE_CAIRO=yes USE_GST1=yes USE_GST_VIDEO1=yes USE_GTK=yes')"
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
@@ -23,9 +23,9 @@ makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
 short_desc="Modular SIP User-Agent with audio and video support"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
-homepage="http://www.creytiv.com/baresip.html"
-distfiles="http://www.creytiv.com/pub/baresip-${version}.tar.gz"
-checksum=2b035bd8b2121c72bec674768579a3bdcc5d1d567ecb0a84125864d69807b18d
+homepage="https://github.com/baresip/baresip"
+distfiles="https://github.com/baresip/baresip/archive/v${version}.tar.gz"
+checksum=7b008c0a5b4fccfa0a4003f86dc4aaafeaabbdd259ece4757898e9cb5f04fdcf
 
 # Package build options
 build_options="gtk video"

From b1ca86a333219614ac5902147e8115cb59bb4e9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:11 +0100
Subject: [PATCH 1018/3482] kde5-baseapps: update to 20.12.2.

---
 srcpkgs/kde5-baseapps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 5019a791eba7..60b9d96c4806 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=meta
 depends="

From 68a73c730fdf8a4914c57718268e986d77ab1623 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:16 +0100
Subject: [PATCH 1019/3482] dolphin: update to 20.12.2.

---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index ed971ca3c974..2a84e7d064b3 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b71652f40f28d92e790a0cdffbd0124c09a7a2264a7a798297b9238171454f58
+checksum=59f82f599fec19fc3065f034089b6d35a58ddc419e10c370d99d1ca0b7d0baa6
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From a4db63a9816e98cb5f7b92cdaec30b2f56e12ef1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:18 +0100
Subject: [PATCH 1020/3482] dolphin-plugins: update to 20.12.2.

---
 srcpkgs/dolphin-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index ef6802940c34..4f8f2ea873c8 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=926dc9f69b1a22553f8808b14634ab3760170bddaa4de44e03a763c3074bc74e
+checksum=b6ab8ce235574002346e8b273d8417c6d80be5d73b2b18ebd5d62ccc92205e7e

From edcfecf0710f778c479ad04478249a997c585977 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:23 +0100
Subject: [PATCH 1021/3482] khelpcenter: update to 20.12.2.

---
 srcpkgs/khelpcenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d4fa5aa9f9b..f013debd21c3 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=66e137a74bf79bc9af4320c7803c0e03d834f79b0e567295ece8bc81a3466ab1
+checksum=bddd9e63127adc9b04d757998da79c91b55a89ef3d24b87c435b11c36b04bad7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From 7c67766792c4580e4414c0fb94aeeda5c7f48237 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:29 +0100
Subject: [PATCH 1022/3482] kate5: update to 20.12.2.

---
 srcpkgs/kate5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 7cc920beb9e8..b57f205c393f 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=20.12.1
+version=20.12.2
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=739bbb0378b73245465b59ae961e325d3224e251ae8b97d30c2daceec622a28e
+checksum=a7ee1973da3534390ba45f937fec239d56b4aa3c26ea2b63561709887fb4bfcd
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From e17ff5fe979ada838ee27e1969a79543f94ebf6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:31 +0100
Subject: [PATCH 1023/3482] konsole: update to 20.12.2.

---
 srcpkgs/konsole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 13c87171b8bc..a90a9386c536 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=b690be392462cab5abac74d1e1010c3f991c3d00968b51ed5525040640d769ec
+checksum=fc1bbdd4b77cc94698dd4d7b90e95577dd5cc99f3b27633a52d49177efea0873
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous

From ece510772c4cdce6be996155da71f9786efe6607 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:34 +0100
Subject: [PATCH 1024/3482] baloo-widgets5: update to 20.12.2.

---
 srcpkgs/baloo-widgets5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 1cffc9d16fc1..532d2a85d590 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=20.12.1
+version=20.12.2
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=23fb018485b778ef1e9eaa2a8f35e0becb64a3e928bf130033fd374d1b03be84
+checksum=af20555e139865c94e929f7cc54149ed1b7aab9fa44bf395b07e865f45cf3271
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From be02c26b00f37a09b42795e4a2ca455118b76525 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:47 +0100
Subject: [PATCH 1025/3482] spectacle: update to 20.12.2.

---
 srcpkgs/spectacle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index a06767e0da58..d0ef91b75214 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=3414bcb536ea63876342dab7a33a4b005897985b10da8e01628c297723a85a12
+checksum=7e81047b78f2561aa8bb3a1af0c2b70dbbf9fb56d0427fea89986f90affe1b6c

From b4e6287fee053f38ac3be84d6782399cb85cdb0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:49 +0100
Subject: [PATCH 1026/3482] libkipi5: update to 20.12.2.

---
 srcpkgs/libkipi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 0641ea914f2f..1c59b915152a 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=20.12.1
+version=20.12.2
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=4f638ef8474527289f8dc1624625aa3bf3f339c3865f4a605a38c2976c70c4d2
+checksum=f39f211bb4bbea21b1984208ae21b1f5df475e1133d5e600f4fd6b59f3dcb2ab
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From b64b0567f6e3fe6f3b6a7e1be56c1c51dd71442b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:54 +0100
Subject: [PATCH 1027/3482] okular: update to 20.12.2.

---
 srcpkgs/okular/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 070c59893743..9bc27fda827c 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2ca17ad0b2a1a0f9f70c7ca4bc1f44a9ed758b0ca6a8e5c9935a467f883df53e
+checksum=78a9bb766b7ae79fba630aac6e8804876e1f99de2ede37d6d33ce7442975a9a4
 
 do_check() {
 	cd build

From 468de8b0e8903a8061ab87203ae1b9c1d3f83edc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:56 +0100
Subject: [PATCH 1028/3482] libkexiv25: update to 20.12.2.

---
 srcpkgs/libkexiv25/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 5753ae0a6a60..a2cc820cfe77 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=20.12.1
+version=20.12.2
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=60b3c6d16ea02b335ce5b377e153e39268726d9b80187674547dccfe06f5d4ef
+checksum=eb364ea254d8d72317124e725b4a5b2db0d45c627020ad934f6e1f7f66174882
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"

From 4ea12bada873c905ff85c74bca3effa4672b11f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:49:03 +0100
Subject: [PATCH 1029/3482] elisa: update to 20.12.2.

---
 srcpkgs/elisa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 0281b57dbd68..1beef7030d5a 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=3e360105dd08296bee61d2d92adfc7311b46bdb813be5842f4f2fbd64fecafd2
+checksum=59fef44232d8a9864fedcb9bda493909f7ee0b9a4d7e53dbf5aaf369fd2c85ea
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 31873f17704c32627c8cee5a43301eb05ab345b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:52:45 +0100
Subject: [PATCH 1030/3482] knights: update to 20.12.2.

---
 srcpkgs/knights/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 69dc6efcad3d..c2d9ce33fa94 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=4b2e0204584c1594ad5cba4ea6ea6003373300909854b44ec7232fa8e9e21e25
+checksum=a962dd2b666541bf4c180481e0f6edc2c4cfd4d980057aced565354a7a30bcdc

From fc7e7b79c6812e1b10025094d39e7c52f28dfd88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:55:18 +0100
Subject: [PATCH 1031/3482] kqtquickcharts: update to 20.12.2.

---
 srcpkgs/kqtquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index d2a070977087..a00386b4dd0b 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ec524f2ea26b2773e111bfcb719ee977ff08506fde6059f52a6f4c6089dc4500
+checksum=b62024e32005d5e113ca56efa021423422eb604b89453f43a0ddb75627db991a
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 18736b363425756cca00f7ae5237076fb6901cc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:55:27 +0100
Subject: [PATCH 1032/3482] ktouch: update to 20.12.2.

---
 srcpkgs/ktouch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktouch/template b/srcpkgs/ktouch/template
index e1057b284e2f..f6b172297235 100644
--- a/srcpkgs/ktouch/template
+++ b/srcpkgs/ktouch/template
@@ -1,6 +1,6 @@
 # Template file for 'ktouch'
 pkgname=ktouch
-version=20.08.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools
@@ -15,7 +15,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/education/org.kde.ktouch"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktouch-${version}.tar.xz"
-checksum=e098ebbccca743f678103a9adf54fc388fa4379cc6f667e48259d0b50f56b5fb
+checksum=76c80e85dcd30704341a5ed997915321a5daf2fc32f38ed2c2db59f84afd7d48
 
 post_configure() {
 	sed -e 's|/usr/bin/qmlcachegen|/usr/bin/qmlcachegen-qt5|g' \

From 63eaa9c29607d3e9f7fd70e4d1c5b2bc7e1f9748 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 00:04:30 +0100
Subject: [PATCH 1033/3482] konversation: update to 20.12.2.

---
 srcpkgs/konversation/patches/QPainterPath.patch | 10 ----------
 srcpkgs/konversation/patches/qmetamethod.patch  | 10 ----------
 srcpkgs/konversation/template                   | 10 +++++-----
 3 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/konversation/patches/QPainterPath.patch
 delete mode 100644 srcpkgs/konversation/patches/qmetamethod.patch

diff --git a/srcpkgs/konversation/patches/QPainterPath.patch b/srcpkgs/konversation/patches/QPainterPath.patch
deleted file mode 100644
index 7e59c1692c6f..000000000000
--- a/srcpkgs/konversation/patches/QPainterPath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/viewer/viewtree.cpp	2018-06-27 00:22:38.000000000 +0200
-+++ src/viewer/viewtree.cpp	2020-09-02 16:02:10.394756372 +0200
-@@ -21,6 +21,7 @@
- #include <QFontDatabase>
- #include <QGuiApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QItemSelectionModel>
- #include <QStyleHints>
- #include <QToolTip>
diff --git a/srcpkgs/konversation/patches/qmetamethod.patch b/srcpkgs/konversation/patches/qmetamethod.patch
deleted file mode 100644
index 5770cd64e07d..000000000000
--- a/srcpkgs/konversation/patches/qmetamethod.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/irc/outputfilter.cpp
-+++ src/irc/outputfilter.cpp
-@@ -40,6 +40,7 @@
- #include <KPasswordDialog>
- #include <KMessageBox>
- 
-+#include <QMetaMethod>
- #include <QTextDocument>
- #include <QTextBlock>
- #include <qdebug.h>
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 822371034460..b3f691e91d54 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,7 +1,7 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=1.7.5
-revision=2
+version=20.12.2
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
@@ -11,9 +11,9 @@ short_desc="User friendly IRC client for KDE"
 maintainer="TheNumb <me@thenumb.eu>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
-distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=60bf7533062b5fc63a37105461b4776437f4e24859e8ddaed1d48c4ba1470940
-python_version=2 #unverified
+distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
+checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+python_version=3
 
 # Package build options
 build_options="qca"

From 4ea65c31eb8a2ad1ff3ef074b47af586fa1c5560 Mon Sep 17 00:00:00 2001
From: Pierre Bourgin <pierre.bourgin@free.fr>
Date: Thu, 4 Feb 2021 20:12:08 +0100
Subject: [PATCH 1034/3482] okteta: update to 0.26.5

---
 .../patches/cmake.testing.working_dir.patch   | 36 -------------------
 srcpkgs/okteta/template                       |  4 +--
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/okteta/patches/cmake.testing.working_dir.patch

diff --git a/srcpkgs/okteta/patches/cmake.testing.working_dir.patch b/srcpkgs/okteta/patches/cmake.testing.working_dir.patch
deleted file mode 100644
index b2fae6dccaf5..000000000000
--- a/srcpkgs/okteta/patches/cmake.testing.working_dir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-fix https://invent.kde.org/utilities/okteta/-/issues/1
-
---- kasten/controllers/CMakeLists.txt.ORIG	2020-07-28 23:41:01.000000000 +0200
-+++ kasten/controllers/CMakeLists.txt	2020-11-01 11:15:35.947523996 +0100
-@@ -583,14 +583,29 @@
-     test/scriptvalueconvertertest.cpp
-     test/osdparsertest.cpp
-     test/commonparsertest.cpp
--    test/jsparsertest.cpp
--    test/customtostringtest.cpp
-     test/locktooffsettest.cpp
- 
-     NAME_PREFIX structures-
-     LINK_LIBRARIES structureview-tested-srcs Qt5::Test poddecoder-typeeditors
-   )
- 
-+  #these tests are using QFINDTESTDATA, that does not work since managed by
-+  #CMake from this parent directory: WORKING_DIRECTORY must be set accordindly
-+  add_executable(jsparsertest test/jsparsertest.cpp)
-+  add_test(
-+    NAME structures-jsparsertest
-+    COMMAND jsparsertest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test
-+  )
-+  target_link_libraries(jsparsertest structureview-tested-srcs Qt5::Test poddecoder-typeeditors)
-+  add_executable(customtostringtest test/customtostringtest.cpp)
-+  add_test(
-+    NAME structures-customtostringtest
-+    COMMAND customtostringtest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test
-+  )
-+  target_link_libraries(customtostringtest structureview-tested-srcs Qt5::Test poddecoder-typeeditors)
-+
-   #replace tool unit tests
-   ecm_add_test(
-     view/search/searchjob.cpp
diff --git a/srcpkgs/okteta/template b/srcpkgs/okteta/template
index 41881760f00f..6cef4e659fe5 100644
--- a/srcpkgs/okteta/template
+++ b/srcpkgs/okteta/template
@@ -1,7 +1,7 @@
 # Template file for 'okteta'
 pkgname=okteta
 reverts="4.14.3_1"
-version=0.26.4
+version=0.26.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext python qt5-qmake qt5-host-tools
@@ -15,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/utilities/org.kde.okteta"
 distfiles="${KDE_SITE}/okteta/${version}/src/okteta-${version}.tar.xz"
-checksum=ef22b096c4d8a682b5467ee7d8e9e05ede44cde116daef804312745c4bfd0f03
+checksum=9fc7edfff73e7b0583af540b0c052f9221ca3f11ea3fc3604c2bcedb09c29a97
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 63e897c2bbf9b5e271234d052dc3b1afb3fa067e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 4 Feb 2021 17:50:57 -0300
Subject: [PATCH 1035/3482] qutebrowser: update to 2.0.2.

---
 srcpkgs/qutebrowser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 32a464e07e70..554506252cf8 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.0.1
+version=2.0.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=aa988d61f1a396d7e7101054851291cf57e7cf19e7fc0eeffd30b672570ab242
+checksum=48a87e453b8932e259b7b3cabd8bc500606852f622d123388fb34e4ffe57b33b
 nostrip=yes
 
 build_options="webengine"

From c6fda284416a6c0ac8a7fee87bf18aae6f9b2b0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Feb 2021 23:09:49 -0300
Subject: [PATCH 1036/3482] wpa_supplicant: add security patches.

Taken from https://w1.fi/security/ , for security releases:

- 2019-7
- 2020-1
- 2020-2
---
 ...re-management-frame-from-unexpected-.patch |  75 +++++++++
 ...of-secondary-device-types-for-P2P-gr.patch |  40 +++++
 ...allow-event-subscriptions-with-URLs-.patch | 152 ++++++++++++++++++
 ...nt-message-generation-using-a-long-U.patch |  59 +++++++
 ...HTTP-initiation-failures-for-events-.patch |  47 ++++++
 .../patches/patch-src_utils_eloop_c.diff      |   4 +-
 srcpkgs/wpa_supplicant/template               |   3 +-
 7 files changed, 377 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/wpa_supplicant/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
 create mode 100644 srcpkgs/wpa_supplicant/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch
 create mode 100644 srcpkgs/wpa_supplicant/patches/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
 create mode 100644 srcpkgs/wpa_supplicant/patches/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
 create mode 100644 srcpkgs/wpa_supplicant/patches/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch

diff --git a/srcpkgs/wpa_supplicant/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch b/srcpkgs/wpa_supplicant/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
new file mode 100644
index 000000000000..512ba3d6db8d
--- /dev/null
+++ b/srcpkgs/wpa_supplicant/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
@@ -0,0 +1,75 @@
+From https://w1.fi/security/2019-7/
+
+From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j@w1.fi>
+Date: Thu, 29 Aug 2019 11:52:04 +0300
+Subject: [PATCH] AP: Silently ignore management frame from unexpected source
+ address
+
+Do not process any received Management frames with unexpected/invalid SA
+so that we do not add any state for unexpected STA addresses or end up
+sending out frames to unexpected destination. This prevents unexpected
+sequences where an unprotected frame might end up causing the AP to send
+out a response to another device and that other device processing the
+unexpected response.
+
+In particular, this prevents some potential denial of service cases
+where the unexpected response frame from the AP might result in a
+connected station dropping its association.
+
+Signed-off-by: Jouni Malinen <j@w1.fi>
+---
+ src/ap/drv_callbacks.c | 13 +++++++++++++
+ src/ap/ieee802_11.c    | 12 ++++++++++++
+ 2 files changed, 25 insertions(+)
+
+diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
+index 31587685fe3b..34ca379edc3d 100644
+--- a/src/ap/drv_callbacks.c
++++ b/src/ap/drv_callbacks.c
+@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
+ 			   "hostapd_notif_assoc: Skip event with no address");
+ 		return -1;
+ 	}
++
++	if (is_multicast_ether_addr(addr) ||
++	    is_zero_ether_addr(addr) ||
++	    os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) {
++		/* Do not process any frames with unexpected/invalid SA so that
++		 * we do not add any state for unexpected STA addresses or end
++		 * up sending out frames to unexpected destination. */
++		wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR
++			   " in received indication - ignore this indication silently",
++			   __func__, MAC2STR(addr));
++		return 0;
++	}
++
+ 	random_add_randomness(addr, ETH_ALEN);
+ 
+ 	hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
+diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+index c85a28db44b7..e7065372e158 100644
+--- a/src/ap/ieee802_11.c
++++ b/src/ap/ieee802_11.c
+@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len,
+ 	fc = le_to_host16(mgmt->frame_control);
+ 	stype = WLAN_FC_GET_STYPE(fc);
+ 
++	if (is_multicast_ether_addr(mgmt->sa) ||
++	    is_zero_ether_addr(mgmt->sa) ||
++	    os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) {
++		/* Do not process any frames with unexpected/invalid SA so that
++		 * we do not add any state for unexpected STA addresses or end
++		 * up sending out frames to unexpected destination. */
++		wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR
++			   " in received frame - ignore this frame silently",
++			   MAC2STR(mgmt->sa));
++		return 0;
++	}
++
+ 	if (stype == WLAN_FC_STYPE_BEACON) {
+ 		handle_beacon(hapd, mgmt, len, fi);
+ 		return 1;
+-- 
+2.20.1
+
diff --git a/srcpkgs/wpa_supplicant/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch b/srcpkgs/wpa_supplicant/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch
new file mode 100644
index 000000000000..3de6e842a29a
--- /dev/null
+++ b/srcpkgs/wpa_supplicant/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch
@@ -0,0 +1,40 @@
+Patch from https://w1.fi/security/2020-2/
+
+From 947272febe24a8f0ea828b5b2f35f13c3821901e Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Mon, 9 Nov 2020 11:43:12 +0200
+Subject: [PATCH] P2P: Fix copying of secondary device types for P2P group
+ client
+
+Parsing and copying of WPS secondary device types list was verifying
+that the contents is not too long for the internal maximum in the case
+of WPS messages, but similar validation was missing from the case of P2P
+group information which encodes this information in a different
+attribute. This could result in writing beyond the memory area assigned
+for these entries and corrupting memory within an instance of struct
+p2p_device. This could result in invalid operations and unexpected
+behavior when trying to free pointers from that corrupted memory.
+
+Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=27269
+Fixes: e57ae6e19edf ("P2P: Keep track of secondary device types for peers")
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+---
+ src/p2p/p2p.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
+index 74b7b52ae05c..5cbfc217fc1f 100644
+--- a/src/p2p/p2p.c
++++ a/src/p2p/p2p.c
+@@ -453,6 +453,8 @@ static void p2p_copy_client_info(struct p2p_device *dev,
+ 	dev->info.config_methods = cli->config_methods;
+ 	os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8);
+ 	dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types;
++	if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN)
++		dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN;
+ 	os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types,
+ 		  dev->info.wps_sec_dev_type_list_len);
+ }
+-- 
+2.25.1
+
diff --git a/srcpkgs/wpa_supplicant/patches/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch b/srcpkgs/wpa_supplicant/patches/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
new file mode 100644
index 000000000000..d30da5116dbd
--- /dev/null
+++ b/srcpkgs/wpa_supplicant/patches/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
@@ -0,0 +1,152 @@
+From https://w1.fi/security/2020-1/
+
+From 5b78c8f961f25f4dc22d6f2b77ddd06d712cec63 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Wed, 3 Jun 2020 23:17:35 +0300
+Subject: [PATCH 1/3] WPS UPnP: Do not allow event subscriptions with URLs to
+ other networks
+
+The UPnP Device Architecture 2.0 specification errata ("UDA errata
+16-04-2020.docx") addresses a problem with notifications being allowed
+to go out to other domains by disallowing such cases. Do such filtering
+for the notification callback URLs to avoid undesired connections to
+external networks based on subscriptions that any device in the local
+network could request when WPS support for external registrars is
+enabled (the upnp_iface parameter in hostapd configuration).
+
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+---
+ src/wps/wps_er.c     |  2 +-
+ src/wps/wps_upnp.c   | 38 ++++++++++++++++++++++++++++++++++++--
+ src/wps/wps_upnp_i.h |  3 ++-
+ 3 files changed, 39 insertions(+), 4 deletions(-)
+
+diff --git a/src/wps/wps_er.c b/src/wps/wps_er.c
+index 6bded14327f8..31d2e50e4cff 100644
+--- a/src/wps/wps_er.c
++++ b/src/wps/wps_er.c
+@@ -1298,7 +1298,7 @@ wps_er_init(struct wps_context *wps, const char *ifname, const char *filter)
+ 			   "with %s", filter);
+ 	}
+ 	if (get_netif_info(er->ifname, &er->ip_addr, &er->ip_addr_text,
+-			   er->mac_addr)) {
++			   NULL, er->mac_addr)) {
+ 		wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address "
+ 			   "for %s. Does it have IP address?", er->ifname);
+ 		wps_er_deinit(er, NULL, NULL);
+diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
+index 6e10e4bc0c3f..7d4b7439940e 100644
+--- a/src/wps/wps_upnp.c
++++ b/src/wps/wps_upnp.c
+@@ -303,6 +303,14 @@ static void subscr_addr_free_all(struct subscription *s)
+ }
+ 
+ 
++static int local_network_addr(struct upnp_wps_device_sm *sm,
++			      struct sockaddr_in *addr)
++{
++	return (addr->sin_addr.s_addr & sm->netmask.s_addr) ==
++		(sm->ip_addr & sm->netmask.s_addr);
++}
++
++
+ /* subscr_addr_add_url -- add address(es) for one url to subscription */
+ static void subscr_addr_add_url(struct subscription *s, const char *url,
+ 				size_t url_len)
+@@ -381,6 +389,7 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
+ 
+ 	for (rp = result; rp; rp = rp->ai_next) {
+ 		struct subscr_addr *a;
++		struct sockaddr_in *addr = (struct sockaddr_in *) rp->ai_addr;
+ 
+ 		/* Limit no. of address to avoid denial of service attack */
+ 		if (dl_list_len(&s->addr_list) >= MAX_ADDR_PER_SUBSCRIPTION) {
+@@ -389,6 +398,13 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
+ 			break;
+ 		}
+ 
++		if (!local_network_addr(s->sm, addr)) {
++			wpa_printf(MSG_INFO,
++				   "WPS UPnP: Ignore a delivery URL that points to another network %s",
++				   inet_ntoa(addr->sin_addr));
++			continue;
++		}
++
+ 		a = os_zalloc(sizeof(*a) + alloc_len);
+ 		if (a == NULL)
+ 			break;
+@@ -890,11 +906,12 @@ static int eth_get(const char *device, u8 ea[ETH_ALEN])
+  * @net_if: Selected network interface name
+  * @ip_addr: Buffer for returning IP address in network byte order
+  * @ip_addr_text: Buffer for returning a pointer to allocated IP address text
++ * @netmask: Buffer for returning netmask or %NULL if not needed
+  * @mac: Buffer for returning MAC address
+  * Returns: 0 on success, -1 on failure
+  */
+ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
+-		   u8 mac[ETH_ALEN])
++		   struct in_addr *netmask, u8 mac[ETH_ALEN])
+ {
+ 	struct ifreq req;
+ 	int sock = -1;
+@@ -920,6 +937,19 @@ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
+ 	in_addr.s_addr = *ip_addr;
+ 	os_snprintf(*ip_addr_text, 16, "%s", inet_ntoa(in_addr));
+ 
++	if (netmask) {
++		os_memset(&req, 0, sizeof(req));
++		os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name));
++		if (ioctl(sock, SIOCGIFNETMASK, &req) < 0) {
++			wpa_printf(MSG_ERROR,
++				   "WPS UPnP: SIOCGIFNETMASK failed: %d (%s)",
++				   errno, strerror(errno));
++			goto fail;
++		}
++		addr = (struct sockaddr_in *) &req.ifr_netmask;
++		netmask->s_addr = addr->sin_addr.s_addr;
++	}
++
+ #ifdef __linux__
+ 	os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name));
+ 	if (ioctl(sock, SIOCGIFHWADDR, &req) < 0) {
+@@ -1026,11 +1056,15 @@ static int upnp_wps_device_start(struct upnp_wps_device_sm *sm, char *net_if)
+ 
+ 	/* Determine which IP and mac address we're using */
+ 	if (get_netif_info(net_if, &sm->ip_addr, &sm->ip_addr_text,
+-			   sm->mac_addr)) {
++			   &sm->netmask, sm->mac_addr)) {
+ 		wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address "
+ 			   "for %s. Does it have IP address?", net_if);
+ 		goto fail;
+ 	}
++	wpa_printf(MSG_DEBUG, "WPS UPnP: Local IP address %s netmask %s hwaddr "
++		   MACSTR,
++		   sm->ip_addr_text, inet_ntoa(sm->netmask),
++		   MAC2STR(sm->mac_addr));
+ 
+ 	/* Listen for incoming TCP connections so that others
+ 	 * can fetch our "xml files" from us.
+diff --git a/src/wps/wps_upnp_i.h b/src/wps/wps_upnp_i.h
+index e87a93232df1..6ead7b4e9a30 100644
+--- a/src/wps/wps_upnp_i.h
++++ b/src/wps/wps_upnp_i.h
+@@ -128,6 +128,7 @@ struct upnp_wps_device_sm {
+ 	u8 mac_addr[ETH_ALEN]; /* mac addr of network i.f. we use */
+ 	char *ip_addr_text; /* IP address of network i.f. we use */
+ 	unsigned ip_addr; /* IP address of network i.f. we use (host order) */
++	struct in_addr netmask;
+ 	int multicast_sd; /* send multicast messages over this socket */
+ 	int ssdp_sd; /* receive discovery UPD packets on socket */
+ 	int ssdp_sd_registered; /* nonzero if we must unregister */
+@@ -158,7 +159,7 @@ struct subscription * subscription_find(struct upnp_wps_device_sm *sm,
+ 					const u8 uuid[UUID_LEN]);
+ void subscr_addr_delete(struct subscr_addr *a);
+ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
+-		   u8 mac[ETH_ALEN]);
++		   struct in_addr *netmask, u8 mac[ETH_ALEN]);
+ 
+ /* wps_upnp_ssdp.c */
+ void msearchreply_state_machine_stop(struct advertisement_state_machine *a);
+-- 
+2.20.1
+
diff --git a/srcpkgs/wpa_supplicant/patches/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch b/srcpkgs/wpa_supplicant/patches/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
new file mode 100644
index 000000000000..c7a449e0b5c6
--- /dev/null
+++ b/srcpkgs/wpa_supplicant/patches/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
@@ -0,0 +1,59 @@
+From f7d268864a2660b7239b9a8ff5ad37faeeb751ba Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Wed, 3 Jun 2020 22:41:02 +0300
+Subject: [PATCH 2/3] WPS UPnP: Fix event message generation using a long URL
+ path
+
+More than about 700 character URL ended up overflowing the wpabuf used
+for building the event notification and this resulted in the wpabuf
+buffer overflow checks terminating the hostapd process. Fix this by
+allocating the buffer to be large enough to contain the full URL path.
+However, since that around 700 character limit has been the practical
+limit for more than ten years, start explicitly enforcing that as the
+limit or the callback URLs since any longer ones had not worked before
+and there is no need to enable them now either.
+
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+---
+ src/wps/wps_upnp.c       | 9 +++++++--
+ src/wps/wps_upnp_event.c | 3 ++-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
+index 7d4b7439940e..ab685d52ecab 100644
+--- a/src/wps/wps_upnp.c
++++ b/src/wps/wps_upnp.c
+@@ -328,9 +328,14 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
+ 	int rerr;
+ 	size_t host_len, path_len;
+ 
+-	/* url MUST begin with http: */
+-	if (url_len < 7 || os_strncasecmp(url, "http://", 7))
++	/* URL MUST begin with HTTP scheme. In addition, limit the length of
++	 * the URL to 700 characters which is around the limit that was
++	 * implicitly enforced for more than 10 years due to a bug in
++	 * generating the event messages. */
++	if (url_len < 7 || os_strncasecmp(url, "http://", 7) || url_len > 700) {
++		wpa_printf(MSG_DEBUG, "WPS UPnP: Reject an unacceptable URL");
+ 		goto fail;
++	}
+ 	url += 7;
+ 	url_len -= 7;
+ 
+diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c
+index d7e6edcc6503..08a23612f338 100644
+--- a/src/wps/wps_upnp_event.c
++++ b/src/wps/wps_upnp_event.c
+@@ -147,7 +147,8 @@ static struct wpabuf * event_build_message(struct wps_event_ *e)
+ 	struct wpabuf *buf;
+ 	char *b;
+ 
+-	buf = wpabuf_alloc(1000 + wpabuf_len(e->data));
++	buf = wpabuf_alloc(1000 + os_strlen(e->addr->path) +
++			   wpabuf_len(e->data));
+ 	if (buf == NULL)
+ 		return NULL;
+ 	wpabuf_printf(buf, "NOTIFY %s HTTP/1.1\r\n", e->addr->path);
+-- 
+2.20.1
+
diff --git a/srcpkgs/wpa_supplicant/patches/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch b/srcpkgs/wpa_supplicant/patches/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
new file mode 100644
index 000000000000..9d0376043d0b
--- /dev/null
+++ b/srcpkgs/wpa_supplicant/patches/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
@@ -0,0 +1,47 @@
+From 85aac526af8612c21b3117dadc8ef5944985b476 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Thu, 4 Jun 2020 21:24:04 +0300
+Subject: [PATCH 3/3] WPS UPnP: Handle HTTP initiation failures for events more
+ properly
+
+While it is appropriate to try to retransmit the event to another
+callback URL on a failure to initiate the HTTP client connection, there
+is no point in trying the exact same operation multiple times in a row.
+Replve the event_retry() calls with event_addr_failure() for these cases
+to avoid busy loops trying to repeat the same failing operation.
+
+These potential busy loops would go through eloop callbacks, so the
+process is not completely stuck on handling them, but unnecessary CPU
+would be used to process the continues retries that will keep failing
+for the same reason.
+
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+---
+ src/wps/wps_upnp_event.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c
+index 08a23612f338..c0d9e41d9a38 100644
+--- a/src/wps/wps_upnp_event.c
++++ b/src/wps/wps_upnp_event.c
+@@ -294,7 +294,7 @@ static int event_send_start(struct subscription *s)
+ 
+ 	buf = event_build_message(e);
+ 	if (buf == NULL) {
+-		event_retry(e, 0);
++		event_addr_failure(e);
+ 		return -1;
+ 	}
+ 
+@@ -302,7 +302,7 @@ static int event_send_start(struct subscription *s)
+ 					 event_http_cb, e);
+ 	if (e->http_event == NULL) {
+ 		wpabuf_free(buf);
+-		event_retry(e, 0);
++		event_addr_failure(e);
+ 		return -1;
+ 	}
+ 
+-- 
+2.20.1
+
diff --git a/srcpkgs/wpa_supplicant/patches/patch-src_utils_eloop_c.diff b/srcpkgs/wpa_supplicant/patches/patch-src_utils_eloop_c.diff
index 58044e44aa98..bab2cee4e590 100644
--- a/srcpkgs/wpa_supplicant/patches/patch-src_utils_eloop_c.diff
+++ b/srcpkgs/wpa_supplicant/patches/patch-src_utils_eloop_c.diff
@@ -2,8 +2,8 @@ $OpenBSD: patch-src_utils_eloop_c,v 1.5 2015/09/29 11:57:54 dcoppa Exp $
 
 don't try to access list members to free them unless already initialised
 
---- src/utils/eloop.c.orig	Sun Sep 27 21:02:05 2015
-+++ src/utils/eloop.c	Mon Sep 28 09:35:05 2015
+--- a/src/utils/eloop.c.orig	Sun Sep 27 21:02:05 2015
++++ b/src/utils/eloop.c	Mon Sep 28 09:35:05 2015
 @@ -1064,6 +1064,9 @@ void eloop_destroy(void)
  	struct eloop_timeout *timeout, *prev;
  	struct os_reltime now;
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index 50bb4f4a7157..cee5bf9b3f15 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=3
+revision=4
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -9,6 +9,7 @@ license="BSD-3-Clause"
 homepage="http://w1.fi/wpa_supplicant/"
 distfiles="http://w1.fi/releases/${pkgname}-${version}.tar.gz"
 checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
+patch_args="-Np1"
 
 hostmakedepends="pkg-config"
 makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"

From 7e2a9871480397184282c9c02688b38ee27a9fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 4 Feb 2021 22:56:50 -0300
Subject: [PATCH 1037/3482] python3-gevent: fix dependencies.

Should depend on zope.event and zope.interface.
---
 srcpkgs/python3-gevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gevent/template b/srcpkgs/python3-gevent/template
index ce71112dc99c..c041e3e3ce8d 100644
--- a/srcpkgs/python3-gevent/template
+++ b/srcpkgs/python3-gevent/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-gevent'
 pkgname=python3-gevent
 version=20.9.0
-revision=4
+revision=5
 wrksrc="gevent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"
 makedepends="python3-devel libev-devel c-ares-devel"
-depends="python3-greenlet"
+depends="python3-greenlet python3-zope.event python3-zope.interface"
 short_desc="Coroutine-based Python3 networking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From c088340c6945eea1bc035b632e1d28d428f2e586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 4 Feb 2021 22:57:40 -0300
Subject: [PATCH 1038/3482] castero: remove unnecessary dependencies.

zope.event (and zope.interface) should be brought in by gevent.

Fixes #28105
---
 srcpkgs/castero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castero/template b/srcpkgs/castero/template
index 9cf9b3031566..217e0a0108eb 100644
--- a/srcpkgs/castero/template
+++ b/srcpkgs/castero/template
@@ -1,11 +1,11 @@
 # Template file for 'castero'
 pkgname=castero
 version=0.8.2
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-BeautifulSoup4 python3-cjkwrap python3-gevent
- python3-grequests python3-mpv python3-requests python3-zope.event"
+ python3-grequests python3-mpv python3-requests"
 short_desc="TUI podcast client for the terminal"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="MIT"

From 6eecab524be613022b8f75ff3aec2eacfdc0488e Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 4 Feb 2021 14:05:10 +0100
Subject: [PATCH 1039/3482] wofi: update to 1.2.4.

---
 srcpkgs/wofi/patches/fix-mode-thread.patch | 30 ----------------------
 srcpkgs/wofi/template                      |  4 +--
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/wofi/patches/fix-mode-thread.patch

diff --git a/srcpkgs/wofi/patches/fix-mode-thread.patch b/srcpkgs/wofi/patches/fix-mode-thread.patch
deleted file mode 100644
index 93888b1c45a0..000000000000
--- a/srcpkgs/wofi/patches/fix-mode-thread.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# HG changeset patch
-# User Scoopta <scoopta@scoopta.email>
-# Date 1601697276 25200
-#      Fri Oct 02 20:54:36 2020 -0700
-# Node ID 8a4a5e29ca9c1fb0a11ed9b329d275f5c02154a6
-# Parent  ac8dc17ab751b13b6d4ddcc1a1467e4beb8d7d26
-The mode thread will not be joined multiple times as this causes segfaults under musl
-
---- src/wofi.c
-+++ src/wofi.c
-@@ -103,6 +103,7 @@
- static bool dynamic_lines;
- static struct wl_list mode_list;
- static pthread_t mode_thread;
-+static bool has_joined_mode = false;
- 
- static struct map* keys;
- 
-@@ -596,7 +597,10 @@
- }
- 
- static gboolean insert_all_widgets(gpointer data) {
--	pthread_join(mode_thread, NULL);
-+	if(!has_joined_mode) {
-+		pthread_join(mode_thread, NULL);
-+		has_joined_mode = true;
-+	}
- 	struct wl_list* modes = data;
- 	if(modes->prev == modes) {
- 		return FALSE;
diff --git a/srcpkgs/wofi/template b/srcpkgs/wofi/template
index 80863c765efd..e9125320aed8 100644
--- a/srcpkgs/wofi/template
+++ b/srcpkgs/wofi/template
@@ -1,6 +1,6 @@
 # Template file for 'wofi'
 pkgname=wofi
-version=1.2.3
+version=1.2.4
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
@@ -11,4 +11,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://hg.sr.ht/~scoopta/wofi"
 distfiles="https://hg.sr.ht/~scoopta/wofi/archive/v${version}.tar.gz"
-checksum=@3ef3ff39eb6c72f20a70486a40f0060150044b701db84489f9773f309673f8e7
+checksum=@fee85efc35e97946d3a94562775b902982c4ab1f521208308ecc4bb41547a5e3

From 161985c274be16ab4aadd877b71e1f654a5ac49b Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 4 Feb 2021 18:30:24 +0100
Subject: [PATCH 1040/3482] zoom: update to 5.5.6981.0202

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 9784cc1ff02e..e92785da2126 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.4.57862.0110
+version=5.5.6981.0202
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -12,7 +12,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"
-checksum=640c1785b6779d3e8f1a4482d6f9d7db2fd750e65fa5e774af73ae79d23ada06
+checksum=2419bdd7257137c35f639b681aaf70e42da95181dcb15cd4be6b07cb025a5415
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 9d4e415cb04374913d1dad0e774e8b376c520435 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Thu, 4 Feb 2021 20:52:44 +0100
Subject: [PATCH 1041/3482] minio: update to 2021.02.01.

---
 srcpkgs/minio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 39d6b53a51b2..49b4b3eb7c7f 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,8 +1,8 @@
 # Template file for 'minio'
 pkgname=minio
-version=2021.01.16
+version=2021.02.01
 revision=1
-_version="${version//./-}T02-19-44Z"
+_version="${version//./-}T22-56-52Z"
 wrksrc=${pkgname}-RELEASE.${_version}
 build_style=go
 go_import_path="github.com/minio/minio"
@@ -13,7 +13,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/minio/minio"
 distfiles="${homepage}/archive/RELEASE.${_version}.tar.gz"
-checksum=78ec140c5cbe1a10774576147847f1bdef1e266017e28268be0cd6d76f538be1
+checksum=5ee70a2ba2f73fa1d019fcca03244dd792a5ba0633e678de29b88fb5441508cf
 system_accounts="_minio"
 _minio_homedir="/var/lib/minio"
 _minio_descr="Minio Daemon User"

From 82b77c1ab39dc3790e146388807e08888673ec26 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 4 Feb 2021 14:55:24 -0500
Subject: [PATCH 1042/3482] keybase: update to 5.6.1.

---
 srcpkgs/keybase/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index 7297f4b80ffe..8fc5882b5130 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -1,6 +1,6 @@
 # Template file for 'keybase'
 pkgname=keybase
-version=5.5.2
+version=5.6.1
 revision=1
 wrksrc="client-v${version}"
 build_style=go
@@ -17,7 +17,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://keybase.io/"
 distfiles="https://github.com/keybase/client/releases/download/v$version/keybase-v$version.tar.xz"
-checksum=8e33c0ec24b50325eb1ef4c80520294038e5d018a547758442013c8533c6d400
+checksum=d00a3c85d69ed554e155ea6aaf169f88ead8ec7957b628c90c871f39b75de583
 
 post_install() {
 	vlicense LICENSE

From 06521971b235d728d0daa5412cb5d72f811b6f1f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 4 Feb 2021 14:55:29 -0500
Subject: [PATCH 1043/3482] keybase-desktop: update to 5.6.1.

---
 srcpkgs/keybase-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index d65755f170dc..1033c1d0578b 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'keybase-desktop'
 pkgname=keybase-desktop
-version=5.5.2
+version=5.6.1
 revision=1
 wrksrc="client-${version}"
 hostmakedepends="git nodejs-lts yarn unzip"
@@ -10,7 +10,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="BSD-3-Clause"
 homepage="https://keybase.io"
 distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=2610dbc44d84b93822f9e4ec510aac473116c953f1073a45aef983898a2289fd
+checksum=d54c2444e18b83e6c3f39c3d96ee87d1c178fd2812cda0718b70d10289b76685
 nostrip_files="Keybase"
 
 case "${XBPS_TARGET_MACHINE}" in

From a10f6e7954031cb10634ab827bec7083bb852101 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 4 Feb 2021 15:09:37 -0500
Subject: [PATCH 1044/3482] python3-trimesh: update to 3.9.3.

---
 srcpkgs/python3-trimesh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template
index a0900d762ffb..4a03839937ed 100644
--- a/srcpkgs/python3-trimesh/template
+++ b/srcpkgs/python3-trimesh/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-trimesh'
 pkgname=python3-trimesh
-version=3.8.18
+version=3.9.3
 revision=1
 wrksrc="trimesh-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="MIT"
 homepage="https://trimsh.org/"
 distfiles="https://github.com/mikedh/trimesh/archive/${version}.tar.gz"
-checksum=202901fcdec3c379f8fdd7cb08978b19277e35d91f367dc9affe1a55e91fb452
+checksum=54f4f57a5fdbed7d95ddb4b26d34c3c7a2ddf3126833c9352515fb91b03b3eac
 
 post_install() {
 	vlicense LICENSE.md

From 317d0e30cd1d20d9a1df0e6693552b035c2a416f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 4 Feb 2021 15:19:49 -0500
Subject: [PATCH 1045/3482] python3-utils: update to 2.5.6.

---
 srcpkgs/python3-utils/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-utils/template b/srcpkgs/python3-utils/template
index b9678c4e43dc..3adb620d20b5 100644
--- a/srcpkgs/python3-utils/template
+++ b/srcpkgs/python3-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-utils'
 pkgname=python3-utils
-version=2.4.0
-revision=3
+version=2.5.6
+revision=1
 wrksrc="python-utils-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/WoLpH/python-utils"
 distfiles="https://github.com/WoLpH/python-utils/archive/v${version}.tar.gz"
-checksum=870b415913b380a76efa2efb1e99b174305b2a1fb4eab61a13ecc4307eccfd62
+checksum=e35044706c5c7863110ac31afc9fac66f5dc47d6450ebe26a6ac26473ce09d90
 
 post_install() {
 	vlicense LICENSE

From 517b80799dbc2f90da8c0fc2eecc029ce4707d6b Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 4 Feb 2021 15:07:19 -0500
Subject: [PATCH 1046/3482] python3-zeroconf: update to 0.28.8.

---
 srcpkgs/python3-zeroconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template
index 19f0d82d1451..61d6f48cedcf 100644
--- a/srcpkgs/python3-zeroconf/template
+++ b/srcpkgs/python3-zeroconf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-zeroconf'
 pkgname=python3-zeroconf
-version=0.28.7
+version=0.28.8
 revision=1
 wrksrc="python-zeroconf-${version}"
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/jstasiak/python-zeroconf"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=6c6cc54995acaa9f729eaa9e6f77875324415234d1b5e7a70c6e1e11b285c33b
+checksum=5272431bf88611c722119504504b86738f9366f518781deb24e520e382d1f337

From ac18bc12b9b66a648760689ebcf037b2a4a39554 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 10:02:40 +0000
Subject: [PATCH 1047/3482] gnome-terminal: update to 3.38.2.

---
 srcpkgs/gnome-terminal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index a41c8e12d36e..ca8dd08dc5f6 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-terminal'
 pkgname=gnome-terminal
-version=3.38.0
+version=3.38.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-nautilus-extension"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.3-only"
 homepage="https://wiki.gnome.org/Apps/Terminal"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0a0fc7a8b383c6ffd61469be1dea5ba63cffad812921780e7fad40c2e2ae54f5
+checksum=27bddc9d0ba614c86e5ecb4f54c75ebc3415e2887acd91442057548fd3206618
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

From e2d2a1ef5bdecb90c4f05738430ffad19b9511ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Feb 2021 00:44:27 -0300
Subject: [PATCH 1048/3482] konversation: mark as broken.

---
 srcpkgs/konversation/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index b3f691e91d54..69860827e869 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,3 +1,5 @@
+broken="https://build.voidlinux.org/builders/x86_64_builder/builds/30226/steps/shell_3/logs/stdio"
+
 # Template file for 'konversation'
 pkgname=konversation
 version=20.12.2

From c3e99cc9bc179b432a6103386675ee0b393a1ac7 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 10:28:53 +0000
Subject: [PATCH 1049/3482] nautilus: update to 3.38.2.

---
 srcpkgs/nautilus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index e38755f0806b..67fac293ac27 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=3.38.1
+version=3.38.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Nautilus"
 distfiles="${GNOME_SITE}/${pkgname}/${version::4}/${pkgname}-${version}.tar.xz"
-checksum=0a3e812b13b774b7fd6f222f55acd1f87fb2973d9af60c04b7d25cb52222d0fd
+checksum=d09ceb54c274e50084c8757a73cd247fee5bde02a0b0d13733b0006d1a4196a6
 
 if [ "$CROSS_BUILD" ]; then
 	# tests try to use tracker-sandbox from the wrong path, because of some confusion with libdir:

From 1d8c73c7c48f99a779c16c4dcad5cf370c4b2945 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 10:43:39 +0000
Subject: [PATCH 1050/3482] gnome-calendar: update to 3.38.2.

---
 srcpkgs/gnome-calendar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index d3c76b97f0d3..9e8666d3109e 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=3.38.0
+version=3.38.2
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calendar"
 changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c3684252a72bb59089d071514458a4aeba417f9551ff5d548e1a5984e47b4733
+checksum=d121bb34b08b6ea601f5dbba43a4b1613a6e5493fc0b1e2ecc90c666711a912d
 
 build_options="gir"
 build_options_default="gir"

From f744812b28b33d2638272d58b7b2d5294bd39692 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 11:54:06 +0000
Subject: [PATCH 1051/3482] gnome-music: update to 3.38.2.

---
 srcpkgs/gnome-music/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index 33eb2f04a23a..cba2e901581a 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-music'
 pkgname=gnome-music
-version=3.38.0
-revision=2
+version=3.38.2
+revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config"
@@ -16,5 +16,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Music"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=370aa97ee4610d11b4b8f691e5c9ce30fa55665870bf6d5f2319658bdfacd705
+checksum=5585b638564cfa1c7d9ebdc72d8c4d8544c6b09f65af425dcc72b86779284030
 lib32disabled=yes

From 00c7f30da203c3286c4d34960001f5e5a2f6bca7 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 11:13:49 +0000
Subject: [PATCH 1052/3482] gnome-maps: update to 3.38.3.

---
 srcpkgs/gnome-maps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index 6f15a99ba1db..a58df5438632 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-maps'
 pkgname=gnome-maps
-version=3.38.2
+version=3.38.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,4 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Maps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1a73ca6a47435add25f8fa022ed016c84dd2db3ef4976a8280721d3ea80465d
+checksum=9356d5d307384970af18e620dfc5836d247f7366fb632b152db3019d3cf66c07

From 892b60cc4448bfe7044f24b2593b82427f7ddbba Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 10:52:02 +0000
Subject: [PATCH 1053/3482] gnome-disk-utility: update to 3.38.1.

---
 srcpkgs/gnome-disk-utility/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index 6ef7be6103ed..be862d7fdc11 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-disk-utility'
 pkgname=gnome-disk-utility
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dlogind=none"
@@ -13,5 +13,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Disks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7734ce668d9ec31286abd7944f95190210288fbc54704f05bc55cbd0340b5223
+checksum=d53b85dc1303a1b5ce1e421c1f5c6ac0b318e07cd9a95939d2e1f0959a5ed7d9
 lib32disabled=yes

From de750976efdd48969523374d9874f50ced8ac61a Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 11:02:13 +0000
Subject: [PATCH 1054/3482] gnome-initial-setup: update to 3.38.3.

---
 srcpkgs/gnome-initial-setup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d24f6b4fa4d3..a0fc3e636157 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-initial-setup'
 pkgname=gnome-initial-setup
-version=3.38.2
+version=3.38.3
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa5889274f8b0b6de6a0512b47742b82ac3400daec82dd4effe2eea27464a3b8
+checksum=7bd2c906c79eaf6a9083dbf8172e193f52f4cd5fdd4a51496a7a21655a399af6

From 529a1143242c7ea669eb41a9f72b0faf981f7068 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Feb 2021 19:05:25 -0500
Subject: [PATCH 1055/3482] zfs: update to 2.0.2.

Closes: #28423.
---
 srcpkgs/zfs/patches/dkms.patch | 8 ++++----
 srcpkgs/zfs/template           | 6 ++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/zfs/patches/dkms.patch b/srcpkgs/zfs/patches/dkms.patch
index da097a96ff30..866cac25dab8 100644
--- a/srcpkgs/zfs/patches/dkms.patch
+++ b/srcpkgs/zfs/patches/dkms.patch
@@ -2,9 +2,9 @@
 # Avoids recompiling ZFS userland utilities with DKMS rebuilds
 # Also short-circuits a useless test for Debian in the DKMS source
 
---- a/scripts/dkms.mkconf	2020-05-05 12:56:14.424687887 -0400
-+++ b/scripts/dkms.mkconf	2020-08-12 10:20:16.673372895 -0400
-@@ -25,22 +25,7 @@
+--- scripts/dkms.mkconf	2021-01-19 19:19:08.000000000 -0500
++++ scripts/dkms.mkconf	2021-02-02 19:03:02.045984881 -0500
+@@ -26,22 +26,7 @@
  PRE_BUILD="configure
    --prefix=/usr
    --with-config=kernel
@@ -28,7 +28,7 @@
    --with-linux-obj=\${kernel_source_dir}
    \$(
      [[ -n \"\${ICP_ROOT}\" ]] && \\
-@@ -74,7 +59,7 @@
+@@ -75,7 +60,7 @@
  "
  AUTOINSTALL="yes"
  REMAKE_INITRD="no"
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 1af53405226f..544f80c8658f 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.0.1
+version=2.0.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -15,9 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CDDL-1.0"
 homepage="https://openzfs.github.io/openzfs-docs/"
 distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=71510a6381d9910d75fa52d7bbf0863aa80ff88f337c8a023e267f4ba8486978
-
-patch_args="-Np1"
+checksum=bde5067ce4577d26cc0f0313a09173ad40d590d01539b92c93f33f06ee150b24
 
 replaces="spl<=0.7.13_1" # Because SPL was merged into zfs in 0.8.0
 

From 35f188c7b6acd8065557a7aa01cb0e19a89628e4 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 12:43:15 +0000
Subject: [PATCH 1056/3482] gnome-sound-recorder: update to 3.38.1.

---
 srcpkgs/gnome-sound-recorder/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template
index c79cf30f59f6..2378517ae3f4 100644
--- a/srcpkgs/gnome-sound-recorder/template
+++ b/srcpkgs/gnome-sound-recorder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-sound-recorder'
 pkgname=gnome-sound-recorder
-version=3.38.0
-revision=2
+version=3.38.1
+revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SoundRecorder"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=23903f7361be410870fba947209167b96f4907630641d33ccbaa8e42f574b699
+checksum=d99ea4f963ec1089e9cd597a7d44398a11ecef131e4142271a1c90c15baa4521
 lib32disabled=yes

From fa073932ad7868fde9612c2f0cf0eabaed4170ab Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 12:34:47 +0000
Subject: [PATCH 1057/3482] gnome-passwordsafe: update to 4.1.

---
 srcpkgs/gnome-passwordsafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template
index 3c89ed03e599..7c34bd4a0a28 100644
--- a/srcpkgs/gnome-passwordsafe/template
+++ b/srcpkgs/gnome-passwordsafe/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-passwordsafe'
 pkgname=gnome-passwordsafe
-version=4.0
+version=4.1
 revision=1
 wrksrc="PasswordSafe-${version}"
 build_style=meson
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/PasswordSafe"
 distfiles="https://gitlab.gnome.org/World/PasswordSafe/-/archive/${version}/PasswordSafe-${version}.tar.bz2"
-checksum=96cc1bc4e7a2910e551fa848c1d389d14bdf6eeda477398902e1a9378061f1bf
+checksum=597e5d3d722e81b0ef28cc30d9b70f9a88b42165680ab811499524f68260fa21

From d17da50eadee4a4debdb196edc0ddf3348fbb826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 28 Jan 2021 01:18:43 -0300
Subject: [PATCH 1058/3482] glib: update to 2.66.6.

- build static libraries.

- remove LTO from build to avoid issues when linking qemu-user-static.
Thanks to leah for finding the fix.

- disable fileutils tests, broken on container where user is root.
---
 srcpkgs/glib/patches/disable-broken-tests.patch | 12 ++++++------
 srcpkgs/glib/template                           |  9 ++++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index c8d1967ff895..15e87215d276 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,4 +1,4 @@
-diff --git a/gio/tests/meson.build b/gio/tests/meson.build
+diff --git gio/tests/meson.build gio/tests/meson.build
 index d8ebd56..be72f5c 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
@@ -19,11 +19,11 @@ index d8ebd56..be72f5c 100644
  
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
-diff --git a/glib/tests/meson.build b/glib/tests/meson.build
-index 6eb23e8..59807ff 100644
+diff --git glib/tests/meson.build glib/tests/meson.build
+index 6eb23e8..d7aacfa 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,12 @@ glib_tests = {
+@@ -11,18 +11,11 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -35,14 +35,14 @@ index 6eb23e8..59807ff 100644
    'dir' : {},
    'environment' : {},
    'error' : {},
-   'fileutils' : {},
+-  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
 -  },
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +48,6 @@ glib_tests = {
+@@ -54,7 +47,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0d6de76ea889..c011c7ef7b4e 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,10 +1,12 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.66.2
+version=2.66.6
 revision=1
 build_style=meson
+# static version is necessary for qemu-user-static;
+# also disable LTO, otherwise there are multiple failures when linking qemu
 configure_args="-Dfam=false -Dman=true -Dselinux=disabled
- $(vopt_bool gtk_doc gtk_doc)"
+ $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
 checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
@@ -14,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=ec390bed4e8dd0f89e918f385e8d4cfd7470b1ef7c1ce93ec5c4fc6e3c6a17c4
+checksum=80fff9c63d2725834328071c42003c311f77f91caf2285195c587c62f5638329
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"
@@ -36,6 +38,7 @@ libglib-devel_package() {
 		vmove usr/lib/glib-2.0
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
 	}
 }
 

From 511b2b8904c8f40c25385afdf55ef7c33b6ed76a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:36:57 -0300
Subject: [PATCH 1059/3482] glibmm: update to 2.66.0.

Also drop glibmm-doc.
---
 srcpkgs/glibmm-doc                |  1 -
 srcpkgs/glibmm/template           | 16 ++++------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/glibmm-doc

diff --git a/srcpkgs/glibmm-doc b/srcpkgs/glibmm-doc
deleted file mode 120000
index d5491e56bc02..000000000000
--- a/srcpkgs/glibmm-doc
+++ /dev/null
@@ -1 +0,0 @@
-glibmm
\ No newline at end of file
diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template
index 6e51158ece06..3697ed41a021 100644
--- a/srcpkgs/glibmm/template
+++ b/srcpkgs/glibmm/template
@@ -1,8 +1,8 @@
 # Template file for 'glibmm'
 pkgname=glibmm
-version=2.64.2
-revision=2
-build_style=gnu-configure
+version=2.66.0
+revision=1
+build_style=meson
 hostmakedepends="glib-devel perl pkg-config"
 makedepends="libglib-devel libsigc++-devel"
 checkdepends="glib-networking"
@@ -11,15 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtkmm.org"
 distfiles="${GNOME_SITE}/glibmm/${version%.*}/glibmm-${version}.tar.xz"
-checksum=a75282e58d556d9b2bb44262b6f5fb76c824ac46a25a06f527108bec86b8d4ec
-
-glibmm-doc_package() {
-	short_desc+=" - documentation"
-	pkg_install() {
-		vmove usr/share/doc
-		vmove usr/share/devhelp
-	}
-}
+checksum=9e1db7d43d2e2d4dfa2771354e21a69a6beec7c446b711619cf8c779e13a581e
 
 glibmm-devel_package() {
 	depends="${makedepends} glibmm>=${version}_${revision}"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 229c78a6bccb..d50d4f980b0b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -38,6 +38,7 @@ replaces="
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
  gksu<=2.0.2_4
+ glibmm-doc<=2.64.2_2
  go1.4-bootstrap<=20171003_2
  goffice0.8<=0.8.17_6
  gst1-python<=1.18.3_1

From ceee40fdc1d05c9a06c3b1a53a725f5d636209f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:36:32 -0300
Subject: [PATCH 1060/3482] atkmm: update to 2.28.1.

---
 srcpkgs/atkmm/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/atkmm/template b/srcpkgs/atkmm/template
index a5453a1447a2..8e0a09ea9f28 100644
--- a/srcpkgs/atkmm/template
+++ b/srcpkgs/atkmm/template
@@ -1,9 +1,8 @@
 # Template file for 'atkmm'
 pkgname=atkmm
-version=2.28.0
+version=2.28.1
 revision=1
-build_style=gnu-configure
-configure_args="--disable-documentation"
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libsigc++-devel atk-devel glibmm-devel"
 short_desc="Set of interfaces for accessibility (C++ bindings)"
@@ -11,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtkmm.org"
 distfiles="${GNOME_SITE}/atkmm/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c4cfc917fd42d3879ce997b463428d6982affa0fb660cafcc0bc2d9afcedd3a
+checksum=116876604770641a450e39c1f50302884848ce9cc48d43c5dc8e8efc31f31bad
 
 atkmm-devel_package() {
 	depends="${makedepends} atkmm>=${version}_${revision}"

From a4ad19f733dc9ed3b89277106de25d805dbc2645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:36:08 -0300
Subject: [PATCH 1061/3482] pangomm: update to 2.46.0.

---
 srcpkgs/pangomm/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pangomm/template b/srcpkgs/pangomm/template
index 632236f5d963..29757083e843 100644
--- a/srcpkgs/pangomm/template
+++ b/srcpkgs/pangomm/template
@@ -1,9 +1,8 @@
 # Template file for 'pangomm'
 pkgname=pangomm
-version=2.42.1
+version=2.46.0
 revision=1
-build_style=gnu-configure
-configure_args="--disable-documentation"
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libsigc++-devel glibmm-devel cairomm-devel pango-devel"
 short_desc="C++ bindings for the pango library"
@@ -11,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gtkmm.org"
 distfiles="${GNOME_SITE}/pangomm/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=14bf04939930870d5cfa96860ed953ad2ce07c3fd8713add4a1bfe585589f40f
+checksum=d3787d04d6198b606f3efa357b3b452a7140e2a7dee56f9f9ce516d7d5fcec1b
 
 pangomm-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 1263aa1e21786367ece49729006c0c5a13274b26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:37:05 -0300
Subject: [PATCH 1062/3482] gtkmm: update to 3.24.3.

Add gdk-pixbuf to hostmakedepends, since gdk-pixbuf-pixdata is necessary
during build.
---
 srcpkgs/gtkmm/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template
index a4e24bcbf3bb..8efe5d72596d 100644
--- a/srcpkgs/gtkmm/template
+++ b/srcpkgs/gtkmm/template
@@ -1,10 +1,9 @@
 # Template file for 'gtkmm'
 pkgname=gtkmm
-version=3.24.2
+version=3.24.3
 revision=1
-build_style=gnu-configure
-configure_args="--disable-documentation"
-hostmakedepends="automake libtool pkg-config mm-common"
+build_style=meson
+hostmakedepends="pkg-config mm-common gdk-pixbuf"
 makedepends="gtk+3-devel glibmm-devel atkmm-devel pangomm-devel"
 checkdepends="xvfb-run"
 short_desc="C++ bindings for The GTK+ toolkit (v3)"
@@ -13,10 +12,10 @@ license="LGPL-2.1-or-later"
 homepage="https://gtkmm.org"
 changelog="https://gitlab.gnome.org/GNOME/gtkmm/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6d71091bcd1863133460d4188d04102810e9123de19706fb656b7bb915b4adc3
+checksum=60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435
 
 do_check() {
-	xvfb-run make check
+	xvfb-run ninja -C build test
 }
 
 gtkmm-devel_package() {

From 8024b7880b1304c6bdcc782053d0964519784c07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Feb 2021 01:51:29 -0300
Subject: [PATCH 1063/3482] libXpresent: don't depend on xproto.

xproto is provided by xorgproto, so the dependency can be fullfilled at
install time, but it can fail when building the package. Depending on a
non-existent package is also entirely wrong, this was likely a leftover
from the xproto removal.
---
 srcpkgs/libXpresent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libXpresent/template b/srcpkgs/libXpresent/template
index b68957b445f6..79e8db4e9de3 100644
--- a/srcpkgs/libXpresent/template
+++ b/srcpkgs/libXpresent/template
@@ -1,7 +1,7 @@
 # Template file for 'libXpresent'
 pkgname=libXpresent
 version=1.0.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
 makedepends="libXfixes-devel libXrandr-devel"
@@ -14,7 +14,7 @@ checksum=92f1bdfb67ae2ffcdb25ad72c02cac5e4912dc9bc792858240df1d7f105946fa
 
 libXpresent-devel_package() {
 	depends="${sourcepkg}-${version}_${revision} libX11-devel libXext-devel
-	 libXfixes-devel libXrandr-devel xorgproto xproto"
+	 libXfixes-devel libXrandr-devel xorgproto"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From ac69a53ba42dfff7812e59fe7f6f17fd2f99f7fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 1 Feb 2021 22:42:46 +0700
Subject: [PATCH 1064/3482] fcitx-libpinyin: update to 0.5.4.

---
 .../patches/libpinyin-2.6.0.patch             | 10 -----
 srcpkgs/fcitx-libpinyin/template              | 38 ++++++++++++-------
 2 files changed, 25 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/fcitx-libpinyin/patches/libpinyin-2.6.0.patch

diff --git a/srcpkgs/fcitx-libpinyin/patches/libpinyin-2.6.0.patch b/srcpkgs/fcitx-libpinyin/patches/libpinyin-2.6.0.patch
deleted file mode 100644
index 163367025497..000000000000
--- a/srcpkgs/fcitx-libpinyin/patches/libpinyin-2.6.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- data/table.conf.orig	2021-01-17 17:32:50.977868321 +0700
-+++ data/table.conf	2021-01-17 17:34:32.055849637 +0700
-@@ -3,6 +3,7 @@
- lambda parameter:0.347121
- 
- source table format:pinyin
-+database format:BerkeleyDB
- 
- default RESERVED NULL NULL NULL NOT_USED
- default GB_DICTIONARY gb_char.table gb_char.bin gb_char.dbin SYSTEM_FILE
diff --git a/srcpkgs/fcitx-libpinyin/template b/srcpkgs/fcitx-libpinyin/template
index 8372dbff322f..5cb3d78d6ca7 100644
--- a/srcpkgs/fcitx-libpinyin/template
+++ b/srcpkgs/fcitx-libpinyin/template
@@ -1,18 +1,22 @@
 # Template file for 'fcitx-libpinyin'
 pkgname=fcitx-libpinyin
-version=0.5.3
-revision=2
+_mversion=20161206
+version=0.5.4
+revision=1
 build_style=cmake
-configure_args="-DENABLE_QT=OFF"
-hostmakedepends="pkg-config gobject-introspection fcitx libpinyin"
+configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_QT=OFF"
+hostmakedepends="pkg-config fcitx libpinyin gettext"
 makedepends="libpinyin-devel fcitx-devel"
 depends="fcitx"
 short_desc="Fcitx wrapper for libpinyin"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fcitx/fcitx-libpinyin"
-distfiles="https://download.fcitx-im.org/$pkgname/$pkgname-${version}_dict.tar.xz"
-checksum=fccd408b9fad8becebf7f736e3309e775d045d6383742892385b69be91f89b4c
+distfiles="https://download.fcitx-im.org/$pkgname/$pkgname-${version}.tar.xz
+ https://download.fcitx-im.org/data/model.text.$_mversion.tar.gz"
+checksum="650a846f59a50af5e0ce2e493957885bac59995784bb4e211bf8ad1a83607af3
+ 5c7024e5735389c471f54b867eda0d98c5a40a5e5e75333a9febac107508f704"
+skip_extraction=model.text.$_mversion.tar.gz
 
 if [ "$XBPS_WORDSIZE$XBPS_TARGET_ENDIAN" = "${XBPS_TARGET_WORDSIZE}le" ]
 then
@@ -20,12 +24,20 @@ then
 	hostmakedepends+=" qt5-devel"
 	makedepends+=" libfcitx-qt5-devel qt5-webengine-devel
 	 qt5-declarative-devel qt5-webchannel-devel qt5-location-devel"
+else
+	# Non empty to forbid xbps-src from generating subpackages
+	# Other developers argue that conditional define _package is bad.
+	subpackages=" "
+fi
+
+post_extract() {
+	cp $XBPS_SRCDISTDIR/$pkgname-$version/model.text.$_mversion.tar.gz data
+}
 
-	fcitx-libpinyin-qt5_package() {
-		short_desc+=" - Qt5 IM module"
-		depends="fcitx-libpinyin-${version}_${revision}"
-		pkg_install() {
-			vmove usr/lib/fcitx/qt
-		}
+fcitx-libpinyin-qt5_package() {
+	short_desc+=" - Qt5 IM module"
+	depends="fcitx-libpinyin-${version}_${revision}"
+	pkg_install() {
+		vmove usr/lib/fcitx/qt
 	}
-fi
+}

From abc3dfb5f11b6fbf16425724822957dc1db1f046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 5 Feb 2021 16:12:34 +0700
Subject: [PATCH 1065/3482] evolution-ews: add missing makedepends

---
 srcpkgs/evolution-ews/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 98ee3a77fe72..095167847afc 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -5,7 +5,8 @@ revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
 hostmakedepends="cmake glib-devel intltool libmspack pkg-config"
-makedepends="evolution-devel libmspack-devel webkit2gtk-devel"
+makedepends="evolution-devel libmspack-devel webkit2gtk-devel
+ gnome-desktop-devel"
 short_desc="MS Exchange integration through Exchange Web Services"
 maintainer="Peter Kuchar <masaj@gmx.com>"
 license="LGPL-2.1-or-later"

From 90c54a2d7eb6a6c24345963d366566ffa2f04c49 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Feb 2021 10:21:03 +0100
Subject: [PATCH 1066/3482] open-isns: update to 0.101.

---
 srcpkgs/open-isns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index 03b06f358f6c..a92c52bfcf4b 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,7 +1,7 @@
 # Template file for 'open-isns'
 pkgname=open-isns
-version=0.100
-revision=2
+version=0.101
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
 makedepends="libressl-devel"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1"
 homepage="https://github.com/open-iscsi/open-isns"
 distfiles="https://github.com/open-iscsi/open-isns/archive/v${version}.tar.gz"
-checksum=b011edbb0f31690aaca902a8ecf4e1f17b01d6c9e9afc51909d26b0993b4328f
+checksum=f672ec86b6c9e984843a7a28d76f07e26393499c486f86034b8b18caa8deb556
 
 post_extract() {
 	sed -i 's/ -Werror / /' configure

From 6f9b412f8d1f7fbb015eaacc56b229720fcbc556 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Feb 2021 10:21:57 +0100
Subject: [PATCH 1067/3482] perl-Path-Tiny: update to 0.118.

---
 srcpkgs/perl-Path-Tiny/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Path-Tiny/template b/srcpkgs/perl-Path-Tiny/template
index 9de37780962e..ee0a2c963051 100644
--- a/srcpkgs/perl-Path-Tiny/template
+++ b/srcpkgs/perl-Path-Tiny/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Path-Tiny'
 pkgname=perl-Path-Tiny
-version=0.116
+version=0.118
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module

From 7613f826713128900115147d0bc68e541025d796 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Feb 2021 10:24:17 +0100
Subject: [PATCH 1068/3482] skaffold: update to 1.19.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 0638b06689f7..9af9fc87f7fb 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.18.0
+version=1.19.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=14c9640d32eb81e0b7a82159deab00f6e0f2d68a8d50a64ccea504cf3a2b19fe
+checksum=ee4ad5cf9c65d0f4827dd7763b96b8750d4e93676b0391bb6b267eb670a9f602

From e0c3607cc48c70a5dd3f36e2c4c2e2504137921b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Feb 2021 10:27:46 +0100
Subject: [PATCH 1069/3482] erlang: update to 23.2.4.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 69fda3b663cc..2b02c000c7d5 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=23.2.3
+version=23.2.4
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=3160912856ba734bd9c17075e72f469b9d4b913f3ab9652ee7e0fb406f0f0f2c
+checksum=e72aa084907e0f34f932cf00caa33aba93147b0a7c9c35569d6bd1c402f532de
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From a0e654bf8237cc41dac600b3d1c35d0992b11793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 5 Feb 2021 16:37:43 +0700
Subject: [PATCH 1070/3482] libfirm: fix ftbfs

> '.' is no longer in @INC
---
 srcpkgs/libfirm/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/libfirm/template b/srcpkgs/libfirm/template
index b44f313d6112..4dd8e28e9973 100644
--- a/srcpkgs/libfirm/template
+++ b/srcpkgs/libfirm/template
@@ -27,6 +27,7 @@ EOF
 }
 
 do_build() {
+	export PERL5LIB=$wrksrc
 	vsed -i Makefile -e 's;"\\#;"#;'
 	make ${makejobs}
 }

From c4329c58ae1ab18534fdf5721e4db42541a335dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 5 Feb 2021 18:04:13 +0700
Subject: [PATCH 1071/3482] quota: prepare for musl 1.2.2

---
 srcpkgs/quota/patches/reallocarray.patch | 29 ++++++++++++++++++++++++
 srcpkgs/quota/template                   |  7 +++---
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/quota/patches/reallocarray.patch

diff --git a/srcpkgs/quota/patches/reallocarray.patch b/srcpkgs/quota/patches/reallocarray.patch
new file mode 100644
index 000000000000..b269f5ab3b52
--- /dev/null
+++ b/srcpkgs/quota/patches/reallocarray.patch
@@ -0,0 +1,29 @@
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -38,6 +38,9 @@ AC_C_INLINE
+ AC_CHECK_FUNC([nl_langinfo], [
+     AC_DEFINE([HAVE_NL_LANGINFO], 1, [Use nl_langinfo for querying locale])
+ ])
++AC_CHECK_DECLS([reallocarray],[
++    AC_DEFINE([HAVE_REALLOCARRAY], 1, [Have reallocarray])
++])
+ 
+ # ===============
+ # Gettext support
+Index: quota.c
+===================================================================
+--- quota.c.orig
++++ quota.c
+@@ -48,6 +48,10 @@
+ #define FL_SHOW_DEVICE 32768
+ #define FL_PROJECT 65536
+ 
++#ifndef HAVE_REALLOCARRAY
++#define reallocarray(o,n,s) realloc(o,n*s)
++#endif
++
+ static int flags, fmt = -1;
+ static enum s2s_unit spaceunit = S2S_NONE, inodeunit = S2S_NONE;
+ char *progname;
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index d4fa3d04edb9..2751287061fd 100644
--- a/srcpkgs/quota/template
+++ b/srcpkgs/quota/template
@@ -14,10 +14,9 @@ homepage="https://sourceforge.net/projects/linuxquota/"
 distfiles="${SOURCEFORGE_SITE}/linuxquota/quota-tools/${pkgname}-${version}.tar.gz"
 checksum=2f3e03039f378d4f0d97acdb49daf581dcaad64d2e1ddf129495fd579fbd268d
 
-case "$XBPS_TARGET_MACHINE" in
-	# Only used in places where overflow is not possible.
-	*-musl)	CFLAGS+=' -Dreallocarray\(o,n,s\)=realloc\(o,n*s\)';;
-esac
+pre_configure() {
+	autoreconf -fi
+}
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/include/rpcsvc ${DESTDIR}/usr/share/doc/quota

From 2990ebbaef3c38c1ad832f9b7891a884803b212d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 5 Feb 2021 18:26:45 +0700
Subject: [PATCH 1072/3482] sysprof: prepare for musl 1.2.2

---
 srcpkgs/sysprof/patches/musl.patch | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
index 51f42128891f..217b7fb6e828 100644
--- a/srcpkgs/sysprof/patches/musl.patch
+++ b/srcpkgs/sysprof/patches/musl.patch
@@ -123,3 +123,29 @@ index a80ab89..05bd590 100644
 -- 
 2.28.0
 
+From here onward, blame sgn
+Index: meson.build
+===================================================================
+--- meson.build.orig
++++ meson.build
+@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
+ config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
+ 
+ config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
++config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
+ 
+ if get_option('libunwind')
+   libunwind_dep = dependency('libunwind-generic', required: false)
+Index: src/libsysprof-capture/sysprof-compat.h
+===================================================================
+--- src/libsysprof-capture/sysprof-compat.h.orig
++++ src/libsysprof-capture/sysprof-compat.h
+@@ -2,7 +2,7 @@
+ 
+ #pragma once
+ 
+-#ifndef __GLIBC__
++#ifndef HAVE_REALLOCARRAY
+ 
+ #include <stdlib.h>
+ #include <errno.h>

From aeee19254b35b97d4dd1baef72b53aad1322b3d6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Feb 2021 14:31:36 +0100
Subject: [PATCH 1073/3482] perl-Path-Tiny: fix hash.

---
 srcpkgs/perl-Path-Tiny/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Path-Tiny/template b/srcpkgs/perl-Path-Tiny/template
index ee0a2c963051..19dcf6e01de6 100644
--- a/srcpkgs/perl-Path-Tiny/template
+++ b/srcpkgs/perl-Path-Tiny/template
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Path-Tiny"
 distfiles="${CPAN_SITE}/Object/DAGOLDEN/Path-Tiny-${version}.tar.gz"
-checksum=0379108b2aee556f877760711e03ce8775a98859cdd03cb94aaf4738a37a62d3
+checksum=32138d8d0f4c9c1a84d2a8f91bc5e913d37d8a7edefbb15a10961bfed560b0fd

From 25dd5e7ec26088e25f7faef962bbbdc692979b2b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 2 Feb 2021 10:30:50 +0100
Subject: [PATCH 1074/3482] New package: glab-1.14.0

---
 srcpkgs/glab/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/glab/template

diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
new file mode 100644
index 000000000000..0a9e24b29972
--- /dev/null
+++ b/srcpkgs/glab/template
@@ -0,0 +1,17 @@
+# Template file for 'glab'
+pkgname=glab
+version=1.14.0
+revision=1
+build_style=go
+go_import_path=github.com/profclems/glab
+go_package="${go_import_path}/cmd/glab"
+short_desc="Command line tool bringing GitLab's features to your command line"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/profclems/glab"
+distfiles=https://github.com/profclems/glab/archive/v$version.tar.gz
+checksum=927206802cda67f0b725d0ed2b355a67ab9eb560a9e8b8c6e4ca994d9aba3daa
+
+post_install() {
+	vlicense LICENSE
+}

From d60a301642cd106b4345b6d53b443b44c3d7d743 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 5 Feb 2021 08:35:54 -0600
Subject: [PATCH 1075/3482] sqlmap: update to 1.5.2.

---
 srcpkgs/sqlmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 76de464a5a6f..2ab71edfb778 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5
+version=1.5.2
 revision=1
 pycompile_dirs="usr/share/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=18c38c4ccf04e81e540527abc63130eced72b157da1d705e3af26b1d4768671d
+checksum=d567aee3390b39f64215ec7ae53f6b654c28b136b5d2e18629e00b94eb233d06
 python_version=3
 
 do_install() {

From 5f84c963d60389f3f108d3ca15a45744ddc25c48 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Feb 2021 09:40:49 -0500
Subject: [PATCH 1076/3482] wlr-randr: update to 0.2.0.

---
 srcpkgs/wlr-randr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wlr-randr/template b/srcpkgs/wlr-randr/template
index b40866b71834..5ae6079bb86b 100644
--- a/srcpkgs/wlr-randr/template
+++ b/srcpkgs/wlr-randr/template
@@ -1,6 +1,6 @@
 # Template file for 'wlr-randr'
 pkgname=wlr-randr
-version=0.1.0
+version=0.2.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/emersion/wlr-randr"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=dbf2f02aa4d4f48dc9cef1edd1137a8ee68daa85f3c824a28c92376fd1591844
+checksum=e1b60992e41aebf733f13c2bdd2c70375fd3ddf7f0735bc4183858fda9c18e51
 
 post_install() {
 	vlicense LICENSE

From 7e15e137fa0685a20428dbf837dd316bcc69066c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 29 Jan 2021 08:22:19 -0600
Subject: [PATCH 1077/3482] libgcrypt: update to 1.9.1.

---
 srcpkgs/libgcrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index 650f022ad7a6..de41e5db73d7 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -1,6 +1,6 @@
 # Template file for 'libgcrypt'
 pkgname=libgcrypt
-version=1.8.7
+version=1.9.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-static --without-capabilities"
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gnupg.org"
 distfiles="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2"
-checksum=03b70f028299561b7034b8966d7dd77ef16ed139c43440925fe8782561974748
+checksum=c5a67a8b9b2bd370fb415ed1ee31c7172e5683076493cf4a3678a0fbdf0265d9
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" ac_cv_sys_symbol_underscore=no"

From ae9fa6c628ca0fab0e7d880ccefa13016a6c7c44 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Feb 2021 18:56:36 +0100
Subject: [PATCH 1078/3482] maturin: add support for ppc*-musl, ppcle*

---
 srcpkgs/maturin/patches/add-ppc-tier3.patch   |  83 +++++++++++++
 .../patches/platforms-add-ppc-tier3.patch     | 116 ++++++++++++++++++
 srcpkgs/maturin/template                      |  13 +-
 3 files changed, 210 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/maturin/patches/add-ppc-tier3.patch
 create mode 100644 srcpkgs/maturin/patches/platforms-add-ppc-tier3.patch

diff --git a/srcpkgs/maturin/patches/add-ppc-tier3.patch b/srcpkgs/maturin/patches/add-ppc-tier3.patch
new file mode 100644
index 000000000000..6f99f304bdf2
--- /dev/null
+++ b/srcpkgs/maturin/patches/add-ppc-tier3.patch
@@ -0,0 +1,83 @@
+From 88434b211f9e4219fe7b6d9adc737351091324cd Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Fri, 5 Feb 2021 18:32:38 +0100
+Subject: [PATCH] add support for tier 3 ppc targets
+
+---
+ setup.py      |  2 +-
+ src/target.rs | 18 ++++++++++++++++++
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git setup.py setup.py
+index 228267f..8fa1c1e 100644
+--- setup.py
++++ setup.py
+@@ -62,7 +62,7 @@ class PostInstallCommand(install):
+ 
+             cargo_args = [cargo, "rustc", "--bin", "maturin", "--message-format=json"]
+ 
+-            if platform.machine() in ("ppc64le", "ppc64"):
++            if platform.machine() in ("ppc64le", "ppc64", "ppcle", "ppc"):
+                 cargo_args.extend(
+                     ["--no-default-features", "--features=auditwheel,log,human-panic"]
+                 )
+diff --git src/target.rs src/target.rs
+index d13cc34..66cc823 100644
+--- src/target.rs
++++ src/target.rs
+@@ -58,6 +58,8 @@ enum Arch {
+     ARMV7L,
+     POWERPC64LE,
+     POWERPC64,
++    POWERPCLE,
++    POWERPC,
+     X86,
+     X86_64,
+ }
+@@ -69,6 +71,8 @@ impl fmt::Display for Arch {
+             Arch::ARMV7L => write!(f, "armv7l"),
+             Arch::POWERPC64LE => write!(f, "ppc64le"),
+             Arch::POWERPC64 => write!(f, "ppc64"),
++            Arch::POWERPCLE => write!(f, "ppcle"),
++            Arch::POWERPC => write!(f, "ppc"),
+             Arch::X86 => write!(f, "i686"),
+             Arch::X86_64 => write!(f, "x86_64"),
+         }
+@@ -109,6 +113,16 @@ impl Target {
+             platforms::target::Arch::X86 => Arch::X86,
+             platforms::target::Arch::ARM => Arch::ARMV7L,
+             platforms::target::Arch::AARCH64 => Arch::AARCH64,
++            platforms::target::Arch::POWERPC
++                if platform.target_triple.starts_with("powerpc-") =>
++            {
++                Arch::POWERPC
++            }
++            platforms::target::Arch::POWERPC
++                if platform.target_triple.starts_with("powerpcle-") =>
++            {
++                Arch::POWERPCLE
++            }
+             platforms::target::Arch::POWERPC64
+                 if platform.target_triple.starts_with("powerpc64-") =>
+             {
+@@ -147,6 +161,8 @@ impl Target {
+         match self.arch {
+             Arch::AARCH64 => 64,
+             Arch::ARMV7L => 32,
++            Arch::POWERPC => 32,
++            Arch::POWERPCLE => 32,
+             Arch::POWERPC64 => 64,
+             Arch::POWERPC64LE => 64,
+             Arch::X86 => 32,
+@@ -210,6 +226,8 @@ impl Target {
+             (OS::FreeBSD, _) => "", // according imp.get_suffixes(), there are no such
+             (OS::Linux, Arch::AARCH64) => "aarch64-linux-gnu", // aka armv8-linux-gnueabihf
+             (OS::Linux, Arch::ARMV7L) => "arm-linux-gnueabihf",
++            (OS::Linux, Arch::POWERPC) => "powerpc-linux-gnu",
++            (OS::Linux, Arch::POWERPCLE) => "powerpcle-linux-gnu",
+             (OS::Linux, Arch::POWERPC64) => "powerpc64-linux-gnu",
+             (OS::Linux, Arch::POWERPC64LE) => "powerpc64le-linux-gnu",
+             (OS::Linux, Arch::X86) => "i386-linux-gnu", // not i686
+-- 
+2.30.0
+
diff --git a/srcpkgs/maturin/patches/platforms-add-ppc-tier3.patch b/srcpkgs/maturin/patches/platforms-add-ppc-tier3.patch
new file mode 100644
index 000000000000..52195d55322c
--- /dev/null
+++ b/srcpkgs/maturin/patches/platforms-add-ppc-tier3.patch
@@ -0,0 +1,116 @@
+From 27a70f351da0289119f39964a3c661ae05a24856 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Fri, 5 Feb 2021 18:46:51 +0100
+Subject: [PATCH] add ppc*-musl and ppcle support into platform crate
+
+---
+ platforms/README.md             | 10 ++++++++
+ platforms/src/platform.rs       |  5 ++++
+ platforms/src/platform/tier3.rs | 45 +++++++++++++++++++++++++++++++++
+ 3 files changed, 60 insertions(+)
+
+diff --git platforms/README.md platforms/README.md
+index a8a7fba..5038fed 100644
+--- platforms/README.md
++++ platforms/README.md
+@@ -117,6 +117,11 @@ accompanied by a minor version bump.
+ | [mips-unknown-linux-uclibc]       | mips        | linux      | uclibc     |
+ | [mipsel-unknown-linux-uclibc]     | mips        | linux      | uclibc     |
+ | [msp430-none-elf]                 | msp430      | unknown    | ""         |
++| [powerpc-unknown-linux-musl]      | powerpc     | linux      | musl       |
++| [powerpcle-unknown-linux-gnu]     | powerpc     | linux      | gnu        |
++| [powerpcle-unknown-linux-musl]    | powerpc     | linux      | musl       |
++| [powerpc64-unknown-linux-musl]    | powerpc64   | linux      | musl       |
++| [powerpc64le-unknown-linux-musl]  | powerpc64   | linux      | musl       |
+ | [sparc64-unknown-netbsd]          | sparc64     | netbsd     | ""         |
+ | [thumbv6m-none-eabi]              | thumbv6     | unknown    | ""         |
+ | [thumbv7em-none-eabi]             | thumbv7     | unknown    | ""         |
+@@ -206,8 +211,13 @@ additional terms or conditions.
+ [mipsel-unknown-linux-gnu]: https://docs.rs/platforms/latest/platforms/platform/tier2/constant.MIPSEL_UNKNOWN_LINUX_GNU.html
+ [mipsel-unknown-linux-musl]: https://docs.rs/platforms/latest/platforms/platform/tier2/constant.MIPSEL_UNKNOWN_LINUX_MUSL.html
+ [powerpc-unknown-linux-gnu]: https://docs.rs/platforms/latest/platforms/platform/tier2/constant.POWERPC_UNKNOWN_LINUX_GNU.html
++[powerpc-unknown-linux-musl]: https://docs.rs/platforms/latest/platforms/platform/tier3/constant.POWERPC_UNKNOWN_LINUX_MUSL.html
++[powerpcle-unknown-linux-gnu]: https://docs.rs/platforms/latest/platforms/platform/tier3/constant.POWERPCLE_UNKNOWN_LINUX_GNU.html
++[powerpcle-unknown-linux-musl]: https://docs.rs/platforms/latest/platforms/platform/tier3/constant.POWERPCLE_UNKNOWN_LINUX_MUSL.html
+ [powerpc64-unknown-linux-gnu]: https://docs.rs/platforms/latest/platforms/platform/tier2/constant.POWERPC64_UNKNOWN_LINUX_GNU.html
++[powerpc64-unknown-linux-musl]: https://docs.rs/platforms/latest/platforms/platform/tier3/constant.POWERPC64_UNKNOWN_LINUX_MUSL.html
+ [powerpc64le-unknown-linux-gnu]: https://docs.rs/platforms/latest/platforms/platform/tier2/constant.POWERPC64LE_UNKNOWN_LINUX_GNU.html
++[powerpc64le-unknown-linux-musl]: https://docs.rs/platforms/latest/platforms/platform/tier3/constant.POWERPC64LE_UNKNOWN_LINUX_MUSL.html
+ [s390x-unknown-linux-gnu]: https://docs.rs/platforms/latest/platforms/platform/tier2/constant.S390X_UNKNOWN_LINUX_GNU.html
+ [sparc64-unknown-linux-gnu]: https://docs.rs/platforms/latest/platforms/platform/tier2/constant.SPARC64_UNKNOWN_LINUX_GNU.html
+ [sparcv9-sun-solaris]: https://docs.rs/platforms/latest/platforms/platform/tier2/constant.SPARCV9_SUN_SOLARIS.html
+diff --git platforms/src/platform.rs platforms/src/platform.rs
+index 8b1f049..30c0516 100644
+--- platforms/src/platform.rs
++++ platforms/src/platform.rs
+@@ -142,6 +142,11 @@ impl Platform {
+             tier3::MIPS_UNKNOWN_LINUX_UCLIBC,
+             tier3::MIPSEL_UNKNOWN_LINUX_UCLIBC,
+             tier3::MSP430_NONE_ELF,
++            tier3::POWERPC_UNKNOWN_LINUX_MUSL,
++            tier3::POWERPCLE_UNKNOWN_LINUX_GNU,
++            tier3::POWERPCLE_UNKNOWN_LINUX_MUSL,
++            tier3::POWERPC64_UNKNOWN_LINUX_MUSL,
++            tier3::POWERPC64LE_UNKNOWN_LINUX_MUSL,
+             tier3::SPARC64_UNKNOWN_NETBSD,
+             tier3::THUMBV6M_NONE_EABI,
+             tier3::THUMBV7EM_NONE_EABI,
+diff --git platforms/src/platform/tier3.rs platforms/src/platform/tier3.rs
+index 519db6a..32ba2f7 100644
+--- platforms/src/platform/tier3.rs
++++ platforms/src/platform/tier3.rs
+@@ -56,6 +56,51 @@ pub const MSP430_NONE_ELF: Platform = Platform {
+     tier: Tier::Three,
+ };
+ 
++/// `powerpc-unknown-linux-musl`: PowerPC Linux with MUSL
++pub const POWERPC_UNKNOWN_LINUX_MUSL: Platform = Platform {
++    target_triple: "powerpc-unknown-linux-musl",
++    target_arch: Arch::POWERPC,
++    target_os: OS::Linux,
++    target_env: Some(Env::Musl),
++    tier: Tier::Three,
++};
++
++/// `powerpcle-unknown-linux-gnu`: PowerPCLE Linux
++pub const POWERPCLE_UNKNOWN_LINUX_GNU: Platform = Platform {
++    target_triple: "powerpcle-unknown-linux-gnu",
++    target_arch: Arch::POWERPC,
++    target_os: OS::Linux,
++    target_env: Some(Env::GNU),
++    tier: Tier::Three,
++};
++
++/// `powerpcle-unknown-linux-musl`: PowerPCLE Linux with MUSL
++pub const POWERPCLE_UNKNOWN_LINUX_MUSL: Platform = Platform {
++    target_triple: "powerpcle-unknown-linux-musl",
++    target_arch: Arch::POWERPC,
++    target_os: OS::Linux,
++    target_env: Some(Env::Musl),
++    tier: Tier::Three,
++};
++
++/// `powerpc64-unknown-linux-musl`: PPC64 Linux with MUSL
++pub const POWERPC64_UNKNOWN_LINUX_MUSL: Platform = Platform {
++    target_triple: "powerpc64-unknown-linux-musl",
++    target_arch: Arch::POWERPC64,
++    target_os: OS::Linux,
++    target_env: Some(Env::Musl),
++    tier: Tier::Three,
++};
++
++/// `powerpc64le-unknown-linux-musl`: PPC64LE Linux with MUSL
++pub const POWERPC64LE_UNKNOWN_LINUX_MUSL: Platform = Platform {
++    target_triple: "powerpc64le-unknown-linux-musl",
++    target_arch: Arch::POWERPC64,
++    target_os: OS::Linux,
++    target_env: Some(Env::Musl),
++    tier: Tier::Three,
++};
++
+ /// `sparc64-unknown-netbsd`: NetBSD/sparc64
+ pub const SPARC64_UNKNOWN_NETBSD: Platform = Platform {
+     target_triple: "sparc64-unknown-netbsd",
+-- 
+2.30.0
+
diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index cce53cf58cce..268d12ffd7ad 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -13,8 +13,17 @@ short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/PyO3/maturin"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=22e8082a743e1dc11f5909b596f9053deb7dc1a56336003677381ba02cf67da8
+# bump platforms version if it changes in Cargo.lock
+distfiles="${homepage}/archive/v${version}.tar.gz
+ https://github.com/RustSec/platforms-crate/archive/v1.1.0.tar.gz"
+checksum="22e8082a743e1dc11f5909b596f9053deb7dc1a56336003677381ba02cf67da8
+ 2524984c2ef547bb54515828e4afad0e781a439d74cf0197cf168ec6c818594c"
+
+post_extract() {
+	mv ../platforms-crate* platforms
+	echo "[patch.crates-io]" >> Cargo.toml
+	echo "platforms = { path = './platforms' }" >> Cargo.toml
+}
 
 post_patch() {
 	# setup.py is broken, just use it for the pure python part

From 9230c5f1ce96fb1344b4b667b499549b5670fb56 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 5 Feb 2021 19:05:46 +0100
Subject: [PATCH 1079/3482] dumb-init: update to 1.2.5.

---
 srcpkgs/dumb-init/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dumb-init/template b/srcpkgs/dumb-init/template
index f3e5898f81e7..59871708c3da 100644
--- a/srcpkgs/dumb-init/template
+++ b/srcpkgs/dumb-init/template
@@ -1,6 +1,6 @@
 # Template file for 'dumb-init'
 pkgname=dumb-init
-version=1.2.4
+version=1.2.5
 revision=1
 build_style=gnu-makefile
 short_desc="Minimal init system for Linux containers"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/Yelp/dumb-init"
 changelog="https://github.com/Yelp/dumb-init/releases"
 distfiles="https://github.com/Yelp/dumb-init/archive/v${version}.tar.gz"
-checksum=8834ce3a520991607e38e2df2f74624db1f28114cb670427745370fcde08cdcb
+checksum=3eda470d8a4a89123f4516d26877a727c0945006c8830b7e3bad717a5f6efc4e
 
 do_install() {
 	vbin dumb-init

From ab6b90e896f744837666273f97f0a6bea2d11c27 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 5 Feb 2021 19:07:55 +0100
Subject: [PATCH 1080/3482] lowdown: update to 0.8.0.

---
 srcpkgs/lowdown/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index ccc87496f246..3451c957cb1d 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.7.9
+version=0.8.0
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=a7c0cbb7d878005a8c8951b0dc960612bdf715a81881a6dc18b2ce62319a7340
+checksum=39db499ad2d584ab0dd5be99ad2dfc5e584e0c710d449411bdb7f0ea2550fc2d
 
 post_install() {
 	vlicense LICENSE.md

From 6df4126d2ddf3070f2e3dd5e63c8402afecd87c1 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 5 Feb 2021 08:56:24 -0800
Subject: [PATCH 1081/3482] dstat: patch to silence collections warnings

Development on dstat is dead so whenever Python makes good on their
threat of removing direct access to collections.Sequence it will fail.
---
 srcpkgs/dstat/patches/dstat.patch | 20 ++++++++++++++++++++
 srcpkgs/dstat/template            |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dstat/patches/dstat.patch

diff --git a/srcpkgs/dstat/patches/dstat.patch b/srcpkgs/dstat/patches/dstat.patch
new file mode 100644
index 000000000000..4866b0247553
--- /dev/null
+++ b/srcpkgs/dstat/patches/dstat.patch
@@ -0,0 +1,20 @@
+--- dstat.orig  2020-11-21 17:50:21.000000000 -0800
++++ dstat       2021-02-04 22:50:28.970723977 -0800
+@@ -19,7 +19,7 @@
+ from __future__ import absolute_import, division, generators, print_function
+ __metaclass__ = type
+ 
+-import collections
++import collections.abc
+ import fnmatch
+ import getopt
+ import getpass
+@@ -512,7 +512,7 @@
+                 scale = self.scales[i]
+             else:
+                 scale = self.scale
+-            if isinstance(self.val[name], collections.Sequence) and not isinstance(self.val[name], six.string_types):
++            if isinstance(self.val[name], collections.abc.Sequence) and not isinstance(self.val[name], six.string_types):
+                 line = line + cprintlist(self.val[name], ctype, self.width, scale)
+                 sep = theme['frame'] + char['colon']
+                 if i + 1 != len(self.vars):
diff --git a/srcpkgs/dstat/template b/srcpkgs/dstat/template
index 43a7efd6ded9..9e9d9d3217ac 100644
--- a/srcpkgs/dstat/template
+++ b/srcpkgs/dstat/template
@@ -1,7 +1,7 @@
 # Template file for 'dstat'
 pkgname=dstat
 version=0.7.4
-revision=3
+revision=4
 makedepends="python3"
 depends="python3-six"
 short_desc="Versatile tool for generating system resource statistics"

From fb09b180f49c29d54839b39bf314511fbe0b3826 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:35 +0100
Subject: [PATCH 1082/3482] akonadi-calendar: update to 20.12.2.

---
 srcpkgs/akonadi-calendar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0255eab78183..b8714b057e38 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=85db4f06e8af322eb65ad1dd37a8a2eec6277b99d0012f3323f2fa3f8023fe7f
+checksum=fc43b16e7f150d98b1698e9a1abf84f67180c004bb79ed62f9d68ac5bc27fb6f
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From ac4a6d0bda5b760b33efe562e7ff6855796330a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:37 +0100
Subject: [PATCH 1083/3482] akonadi-contacts: update to 20.12.2.

---
 srcpkgs/akonadi-contacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index c207df976d49..a7a1e0082b00 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=34ab825e7a6e155363fc5d0b2505661dff612a836de9ea8ba5c61f602dd2ac3f
+checksum=7fab1fc1833d80a1a1b0040b723c57546bfa4401d3148a1fc511ea80f7cdc117
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From d3ed714e4c3b70584530dc2a3229509e488f4b55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:39 +0100
Subject: [PATCH 1084/3482] akonadi-import-wizard: update to 20.12.2.

---
 srcpkgs/akonadi-import-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index 0cfa412f286c..14a6a32d4010 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ff9fff17f16cbdcc1fd76cc3612dab0d2642068bc7af9d3b839eae2ff67eb0f1
+checksum=d57fd7fc268381ba2eefda4816a3961b87916b61d53880f739b1cf6966c912bf
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e143676110489b850721f339208a4d7edc156d3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:41 +0100
Subject: [PATCH 1085/3482] akonadi-mime: update to 20.12.2.

---
 srcpkgs/akonadi-mime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 358d62080e2d..9988e59ce9b5 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=e58f1c794cfc0891ec920366572f588d2392352a751e6297a29a7e710a6259f7
+checksum=24a55af289751077222c5b8f6ba28d404e698a2b4844e845168a7f31bc9daf7d
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From 5073908774346d268b7e621ca7f0826f290188e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:43 +0100
Subject: [PATCH 1086/3482] akonadi-notes: update to 20.12.2.

---
 srcpkgs/akonadi-notes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index cc0ced117eed..fcad443286da 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=959f6964407e03801faf1b6f563b97ed57feed85e0c6c53a73b1fa092a1fa295
+checksum=5b48c2f5b16abce7027e11b013bd91e7aaef4797e05756b85b3f2830f9166f65
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From a5f63f2935d3f37eb6d723a6530b7cc4b3cbb096 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:45 +0100
Subject: [PATCH 1087/3482] akonadi-search: update to 20.12.2.

---
 srcpkgs/akonadi-search/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 2b1edd1077a0..2d5a5da600f0 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=08115ac4fd33a423d6b9f68d6cdde360808b84961029bb0074e408e4ecb8b818
+checksum=4a96b8e96b4e195d73f3ab5f7fb742c94f1c7bad6fdd784b4301c867843bf454
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 602448dc33f7b7f2ad8361a92fbe573172389f4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:48 +0100
Subject: [PATCH 1088/3482] akonadi5: update to 20.12.2.

---
 srcpkgs/akonadi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index a0c971b03010..b2b8229dd4c7 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=20.12.1
+version=20.12.2
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=b3f48ffe85fd5010138a7af3ec857b64f474dbaa9a2e54ec2ed811c48a19e384
+checksum=7cd28bb436c8a06d6137d49aa28d4444b93e0d575271deba02f11c8fe4dba918
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel qt5-devel kconfig kcoreaddons"

From aa11efafeb5cff1c9582eb19a66c2f7e4c4d6328 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:50 +0100
Subject: [PATCH 1089/3482] ark: update to 20.12.2.

---
 srcpkgs/ark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 653c81d49b71..27f8bfe9514e 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=357366960c4b1621ccc943465800938da3a8711985ca3fe1109151c8b952eaa3
+checksum=0baf950fc330b7e7cd3a825415592579b31d6308e9e7db5cada28747e6a61edd
 
 do_check() {
 	:

From 79b2211f3e74b9af2e467ba9ade78099ba4797b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:52 +0100
Subject: [PATCH 1090/3482] calendarsupport: update to 20.12.2.

---
 srcpkgs/calendarsupport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 993e4c024764..3c8d9224f48f 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=37738b20a369350d90cec17d186927e5dd9f092e88952886b9787fd3b7908ca9
+checksum=6de55515093422eabb5218f440d971ca3e2abf6312d3faf8078324f215b9e33f
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From e55a10906b00428a86a2e66c9347433651f5eea4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:54 +0100
Subject: [PATCH 1091/3482] grantleetheme: update to 20.12.2.

---
 srcpkgs/grantleetheme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index cf4c46d5e824..91a8441a873a 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=9ded145cfa1f5fa11f1bdcc7c31e7e449e3018383962c04328762c9ac0bf07f1
+checksum=c29c73388f9a75f3b705dfc7dbcf97a3dbe3860b623a82ea27b79aa1551c62b3
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 49ad79ec145395d98f1d9149c0d9961955e155fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:57 +0100
Subject: [PATCH 1092/3482] kalarmcal: update to 20.12.2.

---
 srcpkgs/kalarmcal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 42e8a5871326..3076139c482e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=45f3aca13d0c124bd3c057503a67d6a0a189cd80e6f4a3f331170857055e8e80
+checksum=eb0840c3b7054b2afecb751afec249abfc1e068c4adadb616f288c704ca2949e
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 829017e41b2c2d7ed201238098a0c70aac71f792 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:59 +0100
Subject: [PATCH 1093/3482] kcalutils: update to 20.12.2.

---
 srcpkgs/kcalutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index c65ce324cd70..18ba18cf964a 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=baebb2b8d3f1bf7d46b284ee255caf8668da48eb28251efb5d380ca7914dfc2c
+checksum=0c9ab114ad1f7c4d87bf65d6e5d581735437110f7ab83298d1bf908463c88ccc
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From a33626c2be6d8869c8c92733c822fee2d11f8ba3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:01 +0100
Subject: [PATCH 1094/3482] kdepim-runtime: update to 20.12.2.

---
 srcpkgs/kdepim-runtime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index 9abba2b0acf3..d01b12764f3c 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f82aa8448d01e0e5a3af69581a9188411072541159574640fd8c8b0adbeae7da
+checksum=56ffb1dba356b8abf5485e974b894064723b549722e67afabf9bf5d80925ac5c
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From 044fae59b72975857f1f3ac8cb9d09fdc271ac13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:03 +0100
Subject: [PATCH 1095/3482] kidentitymanagement: update to 20.12.2.

---
 srcpkgs/kidentitymanagement/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index 9b863b07af7f..810901e36855 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c9d3a6aa4bef1b3864e7c5dd8def3f323c086321d9cedd142c131fcf574714b9
+checksum=f2693527a0f95c39e0afa075efb7a31533014140467c393ef7a0db18337397ed
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From 3b443c9323f843e4afade7ce63d2cd5c41c74ef0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:05 +0100
Subject: [PATCH 1096/3482] kimap: update to 20.12.2.

---
 srcpkgs/kimap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index dad2145ca22a..f64df83532d9 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=9bd0b19ec6f8bacb6cf6d2e47949eaa470dde4a7359fd8da1d3cebb1ea55d4f4
+checksum=ad809073b32a98b07d08bff09d3ac687d8121c1f278facffc8cee2b08c7d7292
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From ad294638693ce9211789f91bc99652645e606307 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:07 +0100
Subject: [PATCH 1097/3482] kldap: update to 20.12.2.

---
 srcpkgs/kldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index ee9f1808428e..e1e3a8bcb855 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=63923db7e4a8985a3f2c6020e232ef62f20e89ccbf210966402db820d384840b
+checksum=cbd06f4f2adfb2f0e539e36572eda31af582c4c62519f714ce0ffc8757d74fda
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 86bb4ddf2ebb469727c7dc773c0b5884701f3dd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:09 +0100
Subject: [PATCH 1098/3482] kmail-account-wizard: update to 20.12.2.

---
 srcpkgs/kmail-account-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 21993aaa5e4c..8011adda5bac 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=365e917e68b8427c3dbda3f3f7c99d6ab53b632dd78333754ecc7b7aecbe84be
+checksum=c88c5496b88e1cbd71e95d87c4b3aa4fc320337640329a6d107129396af83729

From b1cb47ecebd3848990b506039ed0997cd73e9b8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:12 +0100
Subject: [PATCH 1099/3482] kmail: update to 20.12.2.

---
 srcpkgs/kmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index 5e98eb1b8625..34a961b535b1 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=fc35e6d433f47d7764fed5caf58535fc1dda3c8e1b82d2991b0fd724fa291489
+checksum=12ef9001bc570bb798a8c394214d8758554f88105c1611e09707190260732d26

From d21b20a25a155e1768e28d49eb5d162c51d2680c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:14 +0100
Subject: [PATCH 1100/3482] kmailtransport: update to 20.12.2.

---
 srcpkgs/kmailtransport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index b8b8eb4fe08b..dc4df71fb10f 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=95dea10d1b4b0f2c3abc2bce14ea9400745214ec8500bb0d3e34f63b61752422
+checksum=fbd35cd8f119fe13a21c23a59d6cd0dd7479d55cdf0d1ef4192617e644b17686
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 518cd58d63c8adf023f06fec2585843fc5398be1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:16 +0100
Subject: [PATCH 1101/3482] kmbox: update to 20.12.2.

---
 srcpkgs/kmbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index c7c26677853f..fffcf2399e9e 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=0d6fc76613d5cc84ecc0764cef68458ffa99aba6c230981aabf342abf01327f0
+checksum=14068aab474b36075c4eb422fd0ed5fc2121de7e62186f74d34235f206d0e664
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 4d641ba9811ee65a99ad6d6ca8443c3dd4f06e32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:18 +0100
Subject: [PATCH 1102/3482] kmime: update to 20.12.2.

---
 srcpkgs/kmime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 49c50776d0df..4d231e0a6974 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=4299c59e65a4c74e5104d2349d3ce6eabc782be9a5008d1b882b2da210ac2543
+checksum=f18520bd2c4106edf996ea01ab6060071f4c5359ca83a61840515ec19486eeca
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From ba080e7a81a991ee3a52ad2fbfcd4c15cb69d2ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:20 +0100
Subject: [PATCH 1103/3482] kontactinterface: update to 20.12.2.

---
 srcpkgs/kontactinterface/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index d5dfd7bebdf7..a1c522ba813a 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=923c18164e5973494cb30a0dc407714a3895895c241a43b44f5ae4b8797db469
+checksum=5a3982efe09e28d2b4af7e024df648eb19102052e0198029de95b04c6aec7344
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 2d0e00024f226781f337c9ca2e42d985b39e234d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:22 +0100
Subject: [PATCH 1104/3482] kpimtextedit: update to 20.12.2.

---
 srcpkgs/kpimtextedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 809a0470476e..8bca15a786ef 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=64a532c9cefbc9127c51c92c4820b4f1d9240c1e588652c3ee1620ae3536a296
+checksum=7e9833d9210be7f5d4261d81f5a55f6111b21d186e4b07cb226be9d517ff9bb1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From 627843b72efb02f1460c1a22b871e214c058baee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:25 +0100
Subject: [PATCH 1105/3482] ksmtp: update to 20.12.2.

---
 srcpkgs/ksmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index a78f93de115c..342071353e66 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=affb69fb3efcd8a1eb761906bd01cfd250eac412f95668ac20674207d96350f9
+checksum=9c527e4358228120ef5f65d257b4ed3efe2157b3a46f0041665a2399d92f9a65
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7689a62fae46e75f993920a9822d4996a42cfd25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:27 +0100
Subject: [PATCH 1106/3482] ktnef: update to 20.12.2.

---
 srcpkgs/ktnef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index e2eb34247fe3..b75383e97574 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=cd9155107c2358d0c03ffdd22d9eeba6931ab9cbb9481e05ed97be0397aa04df
+checksum=b8bf4d1bb1af6b55dc5ff31d60263bb7e8095e5f9710073253d5e1f7a9eaed90
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From da7a864e3aa5d799e97f82efb0281cfecb23e4d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:29 +0100
Subject: [PATCH 1107/3482] libgravatar: update to 20.12.2.

---
 srcpkgs/libgravatar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index e492061dac35..b657dc4a3fff 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=327d019bd0d1cb4c4517a3b6608b979ffd81e112216cf682f14e7307ee717e89
+checksum=6df8d34f6444b44f14bed6edd3e0e83c511d64ea7a0b797cad6e678ec091f61e
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 2b76b763db45ed872f9bfd7b36b7d5612e0b068d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:31 +0100
Subject: [PATCH 1108/3482] libkdepim: update to 20.12.2.

---
 srcpkgs/libkdepim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index 1986e56926e6..e1b164d53b42 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=8e6811dbed7ac89428345346275a19cca2eb378483f6a9e31f74e140b5eee24e
+checksum=a6646fec62ff0a7225b216f52fc607d615e014e78983dcd2739bca78b8492c39
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 8e7cdf59da205e9c4ed559b68dd52395430ddf9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:33 +0100
Subject: [PATCH 1109/3482] libkgapi: update to 20.12.2.

---
 srcpkgs/libkgapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 7abbc5207392..100bcd339b62 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0df9a24e68d50f67e171ff5c6404891956c7fe675351bda8f8ab2a84ffa2a833
+checksum=d1161dc2a0b4cd93251894a6dc320273038da71e09b733545956f61e0fd04af9
 
 do_check() {
 	:

From fbfabccc88602824da48e890596009bc6c739657 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:35 +0100
Subject: [PATCH 1110/3482] libkleo: update to 20.12.2.

---
 srcpkgs/libkleo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 1ec0abf11405..f242c0c70742 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=8a64e16316ab0365e2db1ef60ae4c4efdd81392f658069bdbe143209de350837
+checksum=612244d28d4f2f221e9c23ebb366d1ad31f5a8b132c7c3c2b8ed3d8ca3935477
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 9c861b017452b1be00e630739e9997d923c921b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:38 +0100
Subject: [PATCH 1111/3482] libksieve: update to 20.12.2.

---
 srcpkgs/libksieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index d6804955122f..5416c2f5db31 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=bfdd5e2602ebfb568978be45fe75fa77d4738bcca1dca96ff1cda1419b66ef1f
+checksum=72605f5fc2786b28df98b676b27236096211b4c130adb1a31ea56bc22e834c66
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 1280c8233eb95a9a0e38fb2ee563cb59267bfea8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:40 +0100
Subject: [PATCH 1112/3482] mailcommon: update to 20.12.2.

---
 srcpkgs/mailcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 9c9aab610e27..768116cf0d1d 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=680c0592555a80211dcda96edb4ffde94f392bc6e7437c8490545a1206352da4
+checksum=651b66ca7e0bee98a300068bb3ca62edfa23b4cb535235603e97d1576ac96b61
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 3219d2ebd4e5d7748b68cea8cdac0777469224b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:42 +0100
Subject: [PATCH 1113/3482] mailimporter: update to 20.12.2.

---
 srcpkgs/mailimporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 164072202d55..74b589cb727d 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=ac4b84cc505da734cdb8ed8cfc208029c44c08d57e5bdefb27ec46caef640d4b
+checksum=db2314d02327bdc9b3e083d08a0549145c4deb82aeeeef4e4c30f2b7bdcb5499
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 0cc047087fd2b4c8bbe6a9365a630a7e594ad3d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:47 +0100
Subject: [PATCH 1114/3482] messagelib: update to 20.12.2.

---
 srcpkgs/messagelib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 2780ded22c48..f3838308d593 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=c77b7f87fceea1c0eda3ce540e6ffc4ed7155c8984cbbed189deeb09903e507a
+checksum=a474d64dceaa4e66cfe85b1e00d6188df498f93cbf526eaccedad505ace6bf1e
 
 #TODO: fix build without qca-qt5
 

From 5da8a2687240e9ab3d1faefd2d973192164ed3ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:49 +0100
Subject: [PATCH 1115/3482] pim-data-exporter: update to 20.12.2.

---
 srcpkgs/pim-data-exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index 3274ea3bc5ec..a638639c258e 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c06f5c36614fd1ff25f86883c41a89fcd2ce59a90048c7ab1a0ff49e980344d
+checksum=30ae10e158d0d506dc8e6bfb87281228f4b18b2fcecabbf3fda39080b3c8e88f

From e8c2967bebdd129bac90c8b0a7750118241545b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:51 +0100
Subject: [PATCH 1116/3482] pimcommon: update to 20.12.2.

---
 srcpkgs/pimcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 27634640049f..4b56b655f6f1 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=a7644e6a49b5fc29ff729ff688b841031b6d5d0f90e61e06eddb62ad77ddaaf0
+checksum=3a170f4db0cd9f691ddf5f43831cfa688c2113b8f5bd6c84895f869a2e547539
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From d7381cfbc56ab8e1f2d0e32e6c13b6e02c5a60c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 19:24:02 +0100
Subject: [PATCH 1117/3482] konversation: fix build

---
 srcpkgs/konversation/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 69860827e869..1160895e97c5 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,5 +1,3 @@
-broken="https://build.voidlinux.org/builders/x86_64_builder/builds/30226/steps/shell_3/logs/stdio"
-
 # Template file for 'konversation'
 pkgname=konversation
 version=20.12.2
@@ -8,7 +6,7 @@ build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
 short_desc="User friendly IRC client for KDE"
 maintainer="TheNumb <me@thenumb.eu>"
 license="GPL-2.0-or-later"

From b27b42979c6089aebc2caaa6964262d7712ff106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 4 Feb 2021 23:51:40 -0300
Subject: [PATCH 1118/3482] efl: update to 1.25.1.

Disable avif evas-loader, since we don't package libavif.

Closes #28104.
---
 srcpkgs/efl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 513cb4dfff46..efb3019a969a 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,6 +1,6 @@
 # Template file for 'efl'
 pkgname=efl
-version=1.24.4
+version=1.25.1
 revision=1
 build_style=meson
 configure_args="
@@ -9,7 +9,7 @@ configure_args="
  -Dcrypto=openssl
  -Dnetwork-backend=none
  -Decore-imf-loaders-disabler=$(vopt_if ibus '' ibus,)scim
- -Devas-loaders-disabler=$(vopt_if lottie '[]' json)
+ -Devas-loaders-disabler=avif,$(vopt_if lottie '[]' json)
  -Demotion-loaders-disabler=$(vopt_if gstreamer '' gstreamer1,)$(vopt_if vlc '' libvlc,)gstreamer,xine
  -Demotion-generic-loaders-disabler=vlc
  -Dopengl=$(vopt_if opengl $(vopt_if gles2 es-egl full) none)
@@ -54,7 +54,7 @@ license="LGPL-2.1-only"
 homepage="https://enlightenment.org"
 changelog="https://git.enlightenment.org/core/efl.git/plain/NEWS"
 distfiles="https://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.xz"
-checksum=617e6b29d2478259acac72e2867d1908249c01a323ff3284948e999d4787f901
+checksum=351ca0211ca000234527a503585f039f985607ec9439e34b49d8b8bbf35a7e6b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dbuild-tests=true"

From 68c199fb37bdd817d7fca97bcb2eae7ff31a2b14 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Feb 2021 14:35:38 -0500
Subject: [PATCH 1119/3482] sssd: fix broken shlib dependencies in sssd-python3

---
 srcpkgs/sssd/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 7549109ee4fb..e3d2114fdd01 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora
@@ -30,6 +30,8 @@ distfiles="https://github.com/SSSD/sssd/releases/download/${pkgname}-${version//
 checksum=13d7eeff15e582279f70a3aad32daeb40d3749ec14947a4eded35adce7490cdd
 python_version=3
 nocross="configure attempts to run compiled output"
+# These modules in /usr/lib/sssd are required by sssd-python3
+shlib_provides="libsss_util.so libsss_crypt.so libsss_debug.so"
 
 do_check() {
 	export CK_TIMEOUT_MULTIPLIER=10

From 4da37b723ec6a1c47cab48f11ca88fe0ab4213cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 2 Feb 2021 22:53:42 +0100
Subject: [PATCH 1120/3482] shlibs: remove libs from removed packages

libEGL, libGL, libGLES left as they are virtuals now.
---
 common/shlibs | 46 ----------------------------------------------
 1 file changed, 46 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 35263ec4744a..9c7ca7b2c51c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -56,8 +56,6 @@ libitm.so.1 libitm-4.7.3_1
 liblto_plugin.so.0 gcc-4.7.3_1
 libgcc_s.so.1 libgcc-4.4.0_1
 libgo.so.16 libgo-10.2.0_1
-libmpx.so.2 libmpx-6.2.1_1
-libmpxwrappers.so.2 libmpx-6.2.1_1
 libperl.so.5.32 perl-5.32.0_1
 libgmp.so.10 gmp-5.0.1_1
 libgmpxx.so.4 gmpxx-6.0.0_2
@@ -128,7 +126,6 @@ libbrcmGLESv2.so rpi-userland-20180103_2
 libbrcmOpenVG.so rpi-userland-20180103_2
 libwayland-egl.so.1 wayland-1.15.0_4
 libnvidia-ml.so.1 nvidia-libs-346.47_1 ignore
-libnvidia-ml.so.1 nvidia304-libs-304.00_1 ignore
 libnvidia-ml.so.1 nvidia390-libs-390.87_1 ignore
 libnvidia-tls.so.346.47 nvidia-libs-346.47_1 ignore
 libnvidia-glcore.so.346.47 nvidia-libs-346.47_1 ignore
@@ -314,7 +311,6 @@ libtiffxx.so.5 tiff-4.0.0_1
 libnotify.so.4 libnotify-0.7_1
 libexo-1.so.0 exo-0.7.3_1
 libexo-2.so.0 exo-0.12.0_1
-libvte.so.9 vte-0.20.1_1
 libglade-2.0.so.0 libglade-2.6.4_1
 libglademm-2.4.so.1 libglademm-2.6.7_1
 libthunarx-3.so.0 Thunar-1.8.1_1
@@ -430,26 +426,6 @@ libmpeg2.so.0 libmpeg2-0.5.1_1
 libmpeg2convert.so.0 libmpeg2-0.5.1_1
 libmng.so.2 libmng-2.0.2_1
 libQgpsmm.so.25 gpsd-qt-3.20_1
-libQtAssistantClient.so qt-4.5.3_1
-libQtXmlPatterns.so.4 qt-4.5.3_1
-libQtScriptTools.so.4 qt-4.5.3_1
-libQtCLucene.so.4 qt-4.5.3_1
-libQtMultimedia.so.4 qt-4.5.3_1
-libQtGui.so.4 qt-4.5.3_1
-libQtDBus.so.4 qt-4.5.3_1
-libQtNetwork.so.4 qt-4.5.3_1
-libQtOpenGL.so.4 qt-4.5.3_1
-libQtXml.so.4 qt-4.5.3_1
-libQtTest.so.4 qt-4.5.3_1
-libQt3Support.so.4 qt-4.5.3_1
-libQtSvg.so.4 qt-4.5.3_1
-libQtScript.so.4 qt-4.5.3_1
-libQtHelp.so.4 qt-4.5.3_1
-libQtCore.so.4 qt-4.5.3_1
-libQtSql.so.4 qt-4.5.3_1
-libQtDeclarative.so.4 qt-4.5.3_1
-libQtDesignerComponents.so.4 qt-designer-libs-4.7.8_13
-libQtDesigner.so.4 qt-designer-libs-4.7.8_13
 libsysfs.so.2 libsysfs-2.1.0_1
 libsensors.so.5 libsensors-3.5.0_1
 libcap-ng.so.0 libcap-ng-0.6.2_1
@@ -1025,7 +1001,6 @@ libnilfscleaner.so.0 libnilfs-2.1.0_1
 libchicken.so.11 libchicken-5.1.0_1
 libmdb.so.0 libmdb-0.5_1
 libmdbsql.so.0 libmdb-0.5_1
-libkeybinder.so.0 libkeybinder2-0.3.0_1
 libkmod.so.2 libkmod-5_1
 libestr.so.0 libestr-0.1.2_1
 libee.so.0 libee-0.3.2_1
@@ -1388,7 +1363,6 @@ libsolarus.so.1 solarus-1.6.2_1
 libsolarus-gui.so.1 solarus-1.6.2_1
 libplank.so.1 plank-0.11.0_1
 libssh.so.4 libssh-0.5.4_1
-libqjson.so.0 qjson-0.8.1_1
 libxcb-render-util.so.0 xcb-util-renderutil-0.3.8_1
 libKPimGAPIContacts.so.5 libkgapi-17.12.3_1
 libKPimGAPIBlogger.so.5 libkgapi-17.12.3_1
@@ -1782,9 +1756,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
-libtls.so.17 libtls17-2.7.2_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
@@ -2098,7 +2069,6 @@ libopencv_stereo.so.4.3 libopencv4-4.3.0_1
 libopencv_rapid.so.4.3 libopencv4-4.3.0_1
 libopencv_intensity_transform.so.4.3 libopencv4-4.3.0_1
 libopencv_alphamat.so.4.3 libopencv4-4.3.0_1
-libcgmanager.so.0 libcgmanager-0.33_1
 libuniconf.so.4.6 wvstreams-4.6.1_2
 libwvbase.so.4.6 wvstreams-4.6.1_1
 libwvutils.so.4.6 wvstreams-4.6.1_1
@@ -2113,7 +2083,6 @@ libfcitx-core.so.0 libfcitx-4.2.8_1
 libfcitx-gclient.so.1 libfcitx-4.2.9.5_1
 libfcitx-utils.so.0 libfcitx-4.2.8_1
 libfcitx-config.so.4 libfcitx-4.2.8_1
-libfcitx-qt.so.0 libfcitx-qt-4.2.8_1
 libFcitxQt5DBusAddons.so.1 libfcitx-qt5-1.2.1_1
 libFcitxQt5WidgetsAddons.so.1 libfcitx-qt5-1.2.1_1
 libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1
@@ -2324,7 +2293,6 @@ libtbb.so.2 tbb-4.3_1
 libtbbmalloc_debug.so.2 tbb-4.3_1
 libembree.so.2 embree-2.5.1_1
 libgtkimageview.so.0 gtkimageview-1.6.4_1
-libgoocanvas.so.3 goocanvas1-1.0.0_1
 libgoocanvas-2.0.so.9 goocanvas-2.0.4_1
 libp8-platform.so.2 p8-platform-2.1.0.1_1
 libOIS.so.1.5.0 ois-1.5_1
@@ -2807,8 +2775,6 @@ libmono-btls-shared.so mono-5.2.0.215_1
 libxcb-xrm.so.0 xcb-util-xrm-1.0_1
 libinchi.so.0 openbabel-2.3.2_1
 libopenbabel.so.5 openbabel-2.4.1_1
-libavogadro.so.1 avogadro-1.2.0_1
-libavogadro_OpenQube.so.0 avogadro-1.2.0_1
 libcourier-unicode.so.4 courier-unicode-2.0_1
 libzstd.so.1 libzstd-1.0.0_1
 libudis86.so.0 udis86-1.7.2_4
@@ -3093,10 +3059,6 @@ libccext2-1.8.so.0 commoncpp2-1.8.1_1
 libucommon.so.8 ucommon-7.0.0_1
 libusecure.so.8 ucommon-7.0.0_1
 libcommoncpp.so.8 ucommon-7.0.0_1
-libmupdf.so.1.13.0 libmupdf-1.13.0_1
-libmupdfthird.so.1.13.0 libmupdf-1.13.0_1
-libmuthreads.so.1.13.0 libmupdf-1.13.0_1
-libmupkcs7.so.1.13.0 libmupdf-1.13.0_1
 libdatrie.so.1 libdatrie-0.2.10_1
 libthai.so.0 libthai-0.1.26_1
 libm17n-flt.so.0 m17n-lib-1.7.0_1
@@ -3379,7 +3341,6 @@ libvtkverdict-9.0.so.1 vtk-9.0.1_1
 libvolume_key.so.1 volume_key-0.3.9_1
 librand48_r.so.0 rand48_r-0.1_1
 libxxhash.so.0 libxxHash-0.6.5_2
-libfwup.so.1 libfwup-11_1
 libcapnp_c.so.0 c-capnproto-0.3_1
 libTKBin.so.7 occt-7.2.0p1_1
 libTKDraw.so.7 occt-7.2.0p1_1
@@ -3545,12 +3506,6 @@ libmanette-0.2.so.0 libmanette-0.2.1_1
 libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
-libcrypto.so.44 libcrypto44-2.8.2_1
-libtls.so.18 libtls18-2.8.2_1
-libssl.so.46 libssl46-2.8.2_1
-libcrypto.so.45 libcrypto45-2.9.2_1
-libtls.so.19 libtls19-2.9.2_1
-libssl.so.47 libssl47-2.9.2_1
 libcrypto.so.46 libcrypto46-3.1.1_1
 libtls.so.20 libtls20-3.1.1_1
 libssl.so.48 libssl48-3.1.1_1
@@ -3896,7 +3851,6 @@ librdkafka++.so.1 librdkafka-1.3.0_1
 libco.so.0 libco-20_1
 libraft.so.0 raft-0.9.16_1
 libmdnsd.so.1 libmdnsd-0.9_1
-libPtex.so ptex-2.3.2_1
 libosdGPU.so.3.4.3 OpenSubdiv-3.4.3_1
 libosdCPU.so.3.4.3 OpenSubdiv-3.4.3_1
 libdino.so.0 dino-0.1.0_1

From 319db93512e04707c2e39c2f08ffd84c2afd7808 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 1 Feb 2021 16:50:47 +0100
Subject: [PATCH 1121/3482] platformio: update to 5.1.0.

---
 srcpkgs/platformio/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/platformio/template b/srcpkgs/platformio/template
index 2b884b9520ff..e4ea76674913 100644
--- a/srcpkgs/platformio/template
+++ b/srcpkgs/platformio/template
@@ -1,20 +1,24 @@
 # Template file for 'platformio'
 pkgname=platformio
-version=5.0.1
+version=5.1.0
 revision=1
 wrksrc="platformio-core-${version}"
 build_style=python3-module
+# According to https://github.com/platformio/platformio-core/blob/9c20ab81cb68f1ffb7a8cac22ce95c4c797643ec/Makefile#L13
+make_check_target="tests/test_examples.py"
 hostmakedepends="python3-setuptools"
 depends="python3-bottle python3-click python3-colorama python3-marshmallow
  python3-pyelftools python3-pyserial python3-requests
  python3-semanticversion python3-setuptools python3-tabulate"
+checkdepends="python3-pytest python3-jsondiff python3-wheel python3-pip
+ python3-Twisted python3-certifi git $depends"
 short_desc="Ecosystem for embedded development"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/platformio/platformio-core"
 changelog="https://raw.githubusercontent.com/platformio/platformio-core/develop/HISTORY.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=0c1224f1d593c6fbccdf73de2ce02a412521a3095965c7eee19b2a4d6dc83c89
+checksum=3579411f44f490282be3eba552a672bd8afe8d7198faefca25a3c5e0d19d34b7
 
 post_install() {
 	vinstall scripts/99-platformio-udev.rules 644 usr/lib/udev/rules.d

From 28875bab4e146eeec5cfcf7a9106f8b152ac3dcf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Feb 2021 15:39:20 -0500
Subject: [PATCH 1122/3482] duiadns: always chown conf file in INSTALL

---
 srcpkgs/duiadns/INSTALL  | 4 +---
 srcpkgs/duiadns/template | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/duiadns/INSTALL b/srcpkgs/duiadns/INSTALL
index c652719da22f..c74e7d971509 100644
--- a/srcpkgs/duiadns/INSTALL
+++ b/srcpkgs/duiadns/INSTALL
@@ -1,8 +1,6 @@
 # INSTALL
 case "$ACTION" in
 post)
-	if [ "$UPDATE" != "yes" ]; then
-		chown _duiadns:_duiadns etc/duiadns.conf
-	fi
+	chown _duiadns:_duiadns etc/duiadns.conf
 	;;
 esac
diff --git a/srcpkgs/duiadns/template b/srcpkgs/duiadns/template
index e124007898e0..8f9c4343060f 100644
--- a/srcpkgs/duiadns/template
+++ b/srcpkgs/duiadns/template
@@ -1,7 +1,7 @@
 # Template file for 'duiadns'
 pkgname=duiadns
 version=1.1
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-netifaces python3-netaddr python3-requests"

From 157c7fefa56de8b70c0e7b92b2b78df360d08f83 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Feb 2021 20:37:37 +0100
Subject: [PATCH 1123/3482] firefox: update to 85.0.1

---
 .../firefox/patches/ff85-ppc64-xptcall.patch  | 63 +++++++++++++++++++
 srcpkgs/firefox/template                      |  4 +-
 2 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/firefox/patches/ff85-ppc64-xptcall.patch

diff --git a/srcpkgs/firefox/patches/ff85-ppc64-xptcall.patch b/srcpkgs/firefox/patches/ff85-ppc64-xptcall.patch
new file mode 100644
index 000000000000..b270d836f2f4
--- /dev/null
+++ b/srcpkgs/firefox/patches/ff85-ppc64-xptcall.patch
@@ -0,0 +1,63 @@
+diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
+--- xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
++++ xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
+@@ -91,7 +91,13 @@
+         if (!s->IsIndirect() && s->type == nsXPTType::T_DOUBLE) {
+             if (nr_fpr < FPR_COUNT) {
+                 fpregs[nr_fpr++] = s->val.d;
+-                nr_gpr++;
++                // Even if we have enough FPRs, still skip space in
++                // the parameter area if we ran out of placeholder GPRs.
++                if (nr_gpr < GPR_COUNT) {
++                    nr_gpr++;
++                } else {
++                    d++;
++                }
+             } else {
+                 *((double *)d) = s->val.d;
+                 d++;
+@@ -101,7 +107,11 @@
+             if (nr_fpr < FPR_COUNT) {
+                 // Single-precision floats are passed in FPRs too.
+                 fpregs[nr_fpr++] = s->val.f;
+-                nr_gpr++;
++                if (nr_gpr < GPR_COUNT) {
++                    nr_gpr++;
++                } else {
++                    d++;
++                }
+             } else {
+ #ifdef __LITTLE_ENDIAN__
+                 *((float *)d) = s->val.f;
+diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp b/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
+--- xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
++++ xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
+@@ -103,7 +103,13 @@
+         if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
+             if (nr_fpr < FPR_COUNT) {
+                 dp->val.d = fpregs[nr_fpr++];
+-                nr_gpr++;
++                // Even if we have enough FPRs, still skip space in
++                // the parameter area if we ran out of placeholder GPRs.
++                if (nr_gpr < GPR_COUNT) {
++                    nr_gpr++;
++                } else {
++                    ap++;
++                }
+             } else {
+                 dp->val.d = *(double*)ap++;
+             }
+@@ -113,7 +119,11 @@
+             if (nr_fpr < FPR_COUNT) {
+                 // Single-precision floats are passed in FPRs too.
+                 dp->val.f = (float)fpregs[nr_fpr++];
+-                nr_gpr++;
++                if (nr_gpr < GPR_COUNT) {
++                    nr_gpr++;
++                } else {
++                    ap++;
++                }
+             } else {
+ #ifdef __LITTLE_ENDIAN__
+                 dp->val.f = *(float*)ap++;
+
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index f671bbee7371..0af96b675059 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=85.0
+version=85.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=5f03712642f5e77de4581d2ba3ee3e87cfa44c3d2fdd8fe0fb56ea05a57f7b50
+checksum=e98f586aa4d58e7418da41a2d19cd30030d072f86edd24a3fd6f769284287cee
 
 lib32disabled=yes
 

From b2fc1a87317cccda3aea2961f51ddc21d7c216d9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Feb 2021 21:51:05 +0100
Subject: [PATCH 1124/3482] firefox-i18n: update to 85.0.1

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 6af9409ff63c..9b6aa78334cb 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=85.0
+version=85.0.1
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="1e3ebceef5e6157c1d79a7a420fad27611da0f4c7f78e2a3e63a9b6cee06bbc8
- a1004ed9e3755ffdb5376664012d977373e7f46da7b1c268cd3756d5ced2bc57
- e7cc6da27234dab24edfa6d1dc1d28c6bbf547e0da15253494b180d14b334081
- b16a3898e25fa7ff559b6c58117ff4da45f342d5e1300cc07992369d2da0cc71
- 614f975906e5ac26cb11d9679bd6d9ea0275294f33b6d2fc9f138114f1bcb2e6
- d2610c15a353a92af5b23cf2e04e27e55eb9edb3a3a72d155dc6eea25825edd9
- 21fd164f9ff33d0541d523f3502f04edcc12be6faf028dad2623ec78efef3811
- 9950615c19258eddafa63765bc1632d7cad3a4a14a2f5d8e333e1666e5e35e9c
- ccf4e4a36ad99134f122546a3eb5f6045380e7aca4164fdf1d09946a39d0ce4b
- 86d6ef20ec182cb46dea1e993229aa3394599c708d218bb8dc96aa4577d3234a
- 2611baa78b1a46e6d55ca5350527a2da4d8e4e71eee22a1c5b33adfb2e3544e3
- f7a98ee9f2073133f5b9ec18504a49c512957e4705640893d0f61d39a03ed95a
- f2e0718027aea24938f05c97061d2c8717bac28bc9d5396afb8d12384b75111e
- 6f67c36378526a228e89e8638e1d57b7a6c0d81c6c2eca07cb0218151f93c42b
- e38a55feab1f94ccb20e01dc81964a3c2c52770964d224c544c820b9642a387c
- 3a753754399c7d5cafe88d546c8ee7c0fe5d05932c75e0322f18d55a047ca018
- beecf7a11e167b2d7ecfddbd1708eb905518e93cbebb56dcd4fb87883bd6db3e
- 417a112dcbee84076bb1462e9719a14a13846ad2b783779f44232e936e305187
- 99ce36f9dd309d25aa45f168f6403edf4ae48a028864a38ce9010cb9b0f19dd1
- 61d28874ec0d998982e087237a8d41288f30d8375c590c58da98611a67466e3b
- e2d8748a8f6488bbb39c7f47ba91926c5ae74be20198792a87a43749efd8d7c5
- 859f942ba799d238efb190ef27d64230c67b6052bc180a0ce3eb1f82c266197f
- a58a015c60b3481b9456c091c54361c4dca6405d7fd901306e54c66184ce977f
- 43262ac8204ebcec69eff003307627306e05fb202f1ffaf2ecd3dd66590f8d1b
- 1919e4e0ae8ff4556df7226405985fdc3a951a9bcdb4cb25fb34ba67b240c83b
- 04b18d8c7e99e56fac9ebe3512c14816d7b0ed0c5dca364d6321593b32756002
- 122df58cb44a1d0aeebea86f7ba52432bd838ebf15efb81246d6666c52d4fe11
- d5e2c2d61cb24eda50f67793cf40f302b41853803e06b6e7e8eeb09b33fb5079
- bc8d7b16044f6f1a96abe369886575f6a7f60de32a675fcc51e577f070af2065
- 19f6ad8dbcc607e04865b194a24c2dcc626d9c254f85e1f86f268cb438f28252
- cdb1a1f475a0a341f3ed5e27fa53c48133c92f8a9d1fa550c4184ffafb9d51cd
- eaa53a8f97216fe96e4d92fbb937c387481b2017ec3ca508c00066e6b3836803
- 17d9944779de63759cec174c047cf0046b83f2c3b0cae9d066fe1f552f3de583
- ff4411a9fab2bbb6a7bd3364d3dc1fe1748ae947cb1248d8cce7ab73c94977fe
- 31143a33a3c1b4dc5a58d2acb50bfe8bb826fa384bcc7ff26ec5452a7e318c22
- 4e66e4b7ce1739888cf54e9327f5c77ced6efa67b2dd03db5f5a1962a1cdf375
- 1965af4bbef784dc22e5721850762e8eacce0939c471a63270cccd9f8903a659
- cc40f44b0e509cde3c26b2b4e016be9b4e48e995ade40754841e67df69251ceb
- c706426b8861fa03c406b2e1ce76853c12e5db473d2bb28634a54b7eb733c5af
- 32dafce8ee2c792e53fffbdfe3153077a33af80ab11e0d2ddd94087969d096a7
- cab75dc867ce4fff7fe55153bfeb9da2846b5815b54eab6073f54591fbc92ead
- 41433526cc62d21b6c2c64d6f19fcbf071b04b7dc85a301458082680a508274c
- 51a0a243354013c2026e13da0141c081ded12e373229948d95a3e32d60ac7988
- d023425a39c5aa243e63db3ecc44795d83c58176e62da75992e719547a5a4a5d
- 00d3f2385ad3d7b419f88d28b3ae74d24f67730da8e4df567431291d77e35a27
- 25bb21d49a4bc83ce73bcc181101e8d9accba10a828c09025aadb0f6266d34b9
- 2b74deea42c22f8176bd3d4968c2d8727980f2b4d94bba25c0fcc6e2931737e2
- 948dd6979c874aedd956f764f0a8dd11df51f8c299fd15b91edb1388d3dc2ff4
- b912d9bccd7770a1df13ccca727bc56534787f9698dafed21ab9a0cc587d6200
- e167af1d333d88228bc66b9f875dc618d1d41c967ca56ab6aa1a973d27ad26dc
- 67993e40150a07aa1e74b74b24bdc3900bf42f57e0d6cc9426fb8346d76a4912
- 3f2c8cba88f756f673ef310040b81723ad6dd184e338d7fc4957fbaaeaa77e8d
- d3cc0c70843e17ea1e74530099581a8cdcc9255a27bda9a027c062547b5ebb01
- 34f1a289bdb2ffde7734dd44b0c0574af070beebfe7d8f32bfdd4f49ccaba509
- a549248502f78559af5891a43011cee4673b10f24cafa3cf0fb3cafbdc7d58c7
- 931e44906a15a19bf157e0dc7f8917e70dccad6c32d17468c72b50753e251b2f
- 5d3786da797df6c2e0cfc89370beeba05318f9a1244e9cf2a97d240972da4cee
- 5759dd18c45d3a2e5678a9d89ea577192eaa7d2eebeacc8d86fd01d01619051b
- d118ea187615e19d3851249ed04a2df0fcd46b0997a825615aeeaf6aa66985b2
- b9e649a26e8f6cc2ad8f4ac61e5043c9becc08e383c1005327f2b9e064355859
- 1c4023f435db4831a07b01b3fb934db4a00e7033d49ff5611285d925ca6f88e7
- c2ad46026bbb2dd505abdd27c706e5490bf56789a0dc21688b78963f2f6867b3
- 307b8aa877e07f573213eeb61bda5114ba73606bba70ebc237fb91c7c5749795
- 40ea4bab889523f1d5e31b11df77a8f15f28e86544ed5ed3ab84eb83da988e95
- f0483acc0420799927c46c85c2f619ee6a618eb475c7122bd8ef13e88140a744
- 35b6a0fc2fdf6668864aaa96ef67f451171ed4127a5996086d6ffad452dbf216
- b8441e6cf11cfd88eb71a17532140641771e4f16b9ac9e652a69c85d32f69d00
- b5e01938b9759cf35a5a59b6536ce605d8f678e3e2bd50fecb506d474876169a
- 33129282982bc729920bf7a69901cda39d48a7f7eea9872522eebb9635a2a283
- caa28beda74a3f02e49740f5623196768e943304cb0ead1ef5f227822f5a9db0
- 8ed5ec0ed82b648e3a3368c570e02c1107b91c0981fbf30ba1073f7f0f0e7fd8
- d857483bfa8c99914fa0ebb3e59c7e64a8af2d857915616665f996282db3088b
- 57ea0c05fbb9d402a89f98df27114cd595715f6903af222eb0cf53cf42ad6b83
- 7330582179035c4a8414292524459d1c03bac11d9f209215b1a22e10d3690b93
- 1d376d6d7bab26ba9f96da126a609c9d0983e5f5d4f4cd00474ac920412b0cb6
- 815cc6e1b25bbcc4fe8bacd0ba07d1cbe6e2232632cdc62b038e86cf95471ed0
- 3df1938caf420cb804a4fb25c83c025792b0e5498011ed01930d2ed9d94a9dd1
- 9234bf80ba9100f07a07741673866657c957529fb5d561c279af0b09ff181bd2
- 3752e8efc2ed8b6cca7db2309e4b6463f0f60702f3735d17134fe0634a1bc283
- 0f0f125dc6042d63ae0ab00787fdc9cf508335d28fba5bfb5e2f0eb71c875fab
- 4bf3dca87023e36edb5921ceee8400bd86c0ca4e317a521b4d4bae319e8996e6
- 2be7d9604b6f6097f8da00732047bdefc6b7c5ff3f3810e4f80e11b0c3f589cf
- 104d34b529920526708290d119b752182a48abdcf6c8f1b9acde2a82d94001c9
- 6fb032533842f8c35fbc6a1abdaaf5d4b86bc3c352424ff34988acbd54ff3cac
- 3eac9e3d081d70661e6966b404db7b0da1e36b744a75ff123409ab431c161795
- 09fe0e97d966e3ea22bbed30be8c4d23650cb54c5dd2cb1eebb2627ec436fbf0
- 3bc75dfd85e49ed8a62169a7153e74efd9417d29720f9618d8029da5dda30db4
- c573b5e8e388bfdbe67f5e5180b85063161b5bd0499f01fcf959d99f1f09b18e
- 3fdc8d7d0af797bff359ebb3748c51cbfeb8cc0e90647856864e0a36156644c9
- c90881fa1d30432e9ad20f779e48784721e18c764d03c5276a46b4f0139d186d
- a5ef72d48637a0b0e1f9c28fa5308d3b7316a38e1841c73415f7f659b8f154c3
- 8a232fd83b888a783f400fede59c6a3fcca356f94068d9af3c5b7f8a26ddd0b6
- d301f87e512fb66ac2136d0a11eaae083c36c2a887c7e27fce74a1529854cb30
- 5c6d4cef98afda2a14248452ba0e91a7b11b0abd220560609e05458d8ef1dbd5
- f906c118a32e20043da297e745fd15adfc4c00a7603a86e7ddb5bcb642a4e5db
- 68b5fd0418f3594805b2197f5b1b16449b8e3cbffe8a3b2d2726b56b146a25c1"
+checksum="3b96795fb242e7e79a9f7bef3908c094e5e7726e3ad449abfc9966f7da77461e
+ 3e7897cc7fc60929d0cd7f4b63475e7951c5709d1cb08566cbd5e5842cd85968
+ b2c1179f4f1b116af7414283d085e0d14886f6dbed4b192ab56d4692b6a435d3
+ bb68357a8cf5a21fbb8df4d48356cec6588ef6dfd71404f5f43b896e7612c75d
+ 9d0740dfa35179dbebfc778bbadcd163a7175aa243f680ef5d46c8ef84fa9291
+ 419d23cabf506610d58ada457d752867bb62172b33782d64687284278aca9bfb
+ 8981dd8f3edc763af427ebb48339aade0857af9034ed684ad814ec1534c605a1
+ 2565ef2feca7d763fed989b05c631f484dc253d4b3606fabe1a27c11f1367481
+ 80cceae6d97c7ff3a9ae76464abad123e6c7079e3214f2dceaeeec1e869d1884
+ 9758649244e07be52d9d42eb249a50749c0eb59fa6097247c9e2d178cd1f1d00
+ ecf06a051142efec8b8bcec0e7abed53fdd3e87326dbc25539bb864931e1b30e
+ 192e757af71184082590ebaac253a1416cf22e50baf034ebc00a484de4ad8d6e
+ e603063372e931564f580ad16eb2a5b99457acb8fcc8927c264e183f51d2827e
+ 0729d18a3d15e39f9cfdac22cdf7229166dc91e4f532a10458a66d7ac4c0caa0
+ 411b1f5d95accb1517737535df9b1fbb7f753e2747127f65cc4b9b1d9fcc7613
+ 040d0fa10d2e9cfdb56807606ae0d90d5c117b0cd3de9efef99bbcbbcfbd9775
+ ef5a3676443adf64cce7f1bb1cc16b800738db1ec7b5f0a0c82f1aafec79b5b6
+ fa8b829386b9a6e18191bfff90dd93fcfcc4d9a12ec0c8542f46db500c9d0501
+ d0b90678a67cacce8e4298cb4a04349f6cae8db277e94abb7b3a870228f79a01
+ 859bb12ed766c545d27cadc12980917ef9a783bb324ed6438a634224e6bf0f9e
+ d47f02ef757fbf28ce33622f713c4667c7e5623e71350368076510f08193392a
+ 7d85aee53c07d14953364bfa097780b376ccf0cc0cf818bad40f02e63d042cd6
+ e6c6e0aced825f702dee1ff0871f75789defad70316ac2dd1295181540dd86d0
+ 0633f2924d081574d9a31ccb20c47c1e08d97284c800ab2f9d344ed76f13b54d
+ acbea187dbaaee83254238cc757e088a13ba324e50c92c719378c6e27df05872
+ 492d6a2d7309defd7498a923743f9b3a540a17cab60ae08ecf362fc3d652b2bd
+ 19854ffeb4d031f4d0dc87d60bda6c028ba24753d3ca4aa5cb6c7603e26ccf33
+ 28149d66c557db176401b93a792368c2a235f1ef87523fc3d68092d52c37825a
+ bcb5cd9f7ecbfc0ae163d67074dd155a2ce8ce1ec0d710f19c4911937efa3b1b
+ 9c6621bee65e062645db176d380a64ccb628b6bbdbfaf695a9f6581ddf4c8954
+ 1d73c69292a60f2fb2c3f72a2e774537b654d150fac7e07db93306ecb78fa5a2
+ 61ddf696355b2a6d30dda11c4e842394268b97270e0bd11ff7a35b8968433467
+ 72dc3dd94d995b96df081bb874167f3beaa0b15bb0a370d4f188b08572c9fea9
+ eb95c2c67e0e30af8a439e01d687bf835aa6c2fa469612493b6ebc3312281465
+ 7964b6af70aaccb6e11031c6c7c5aab1c05b5058b7b4bc3743c84378fbfca595
+ 998a2ff2e3737a796fafc18a47bcaa1d941c59f4071c7e0b72cbb3e8f24d7195
+ 74b79fa7095e5404463dc9cbe2f078f988dcae28fc693a32c66e398de5680cd1
+ e8e3aa4ba254a224ae818403930bf7ddb352138fad15dacfcde629c5ec9bc2c4
+ 8957edcffa6e3d03d2606ed3e00834cccf716622b2d737c717151cb4a2c0e33e
+ 58e101dd6184fbc21f4d7563e57e9df39522107c22a4444a157495e6e5ca27c1
+ b085486014dff57b05426749ad0fc4a654e6a186f94aa1e34a24e6f79c040fde
+ e9c291cea71aa2ab8803c0fe7f006245d232fe8533cb1996355b9b68e8132847
+ 1b536167e5ab5aec4425b26b6617318674d76621e4eebcff404bcb019e2c9d4f
+ e4c6044926e1d7890b0cc667eac3278363a8a3f4731dc61bbcc4ec6b4fcb1969
+ 7cfc8e09337da6041f935d1b9ca689bdcad6667365a8caee0b97b1875efdb58d
+ f0c62d98338e5965686ef03eced37d09cb68c16bdf1b47a6c3aebfe590d9afd5
+ e2b839e90873d2f232690e1032217063e8bb23f255b32eff2d2cbca8b95f0098
+ f30ce3cec2e2d6d18ad0820746082966d240e2c570b90fcf004e8332e54913cd
+ 5c566cb9dc160eb9c15e47c6ebf1b9615fedb93913fc00cad3acaf519b45af85
+ 9dcfbfbf6d4e3ab1d8bbc6d0ce22f182c677817a167d6985aee7a51346cf2cf0
+ 48164457085ae1ae245800ee5a37c583cba622060b24eb11f0c0f0b312d727ba
+ a2626ca5c8d494720206fb393356848123c1356a4f71b4deed0ff75fd084c68f
+ 47d4c1a1855e1feef294d893c8fc6acad5ff82a1edad4560c43b50d4f9a5793f
+ be425d384dcac4e3bac946c4ca1827583f6be89f7d08325877e3b1527eb6093b
+ 2ff0079445bc9344004be33d959df8eeb264af76dac71c3cf0a17b129e90c283
+ 35e254920364d8384c5c169744035911aede00394a345b51101f746ab31eb25a
+ d76a2d5c1d0d51087771e09ca511f3199e8980e2a261f25c7cbc52a953674b57
+ 0213f16d50325345949ed2cb5c8328fc8d8479f8c8bb1bcfefa53ad08680de22
+ 9a477b4da7ac1b64e252b850365ba612ba101e37f6118f872fba3d4bbfa8bc0e
+ 86c99d656933b9c5509f561f5825a15cd55e7402fc793bf50d8b196fe1b0276d
+ 1bdf18c7c5023ab2ee4cdb9d405165b3e2b01487e59d8f4a8b96ce1a183a70ae
+ 621a031b7e451f4429a9112cd861aedb7cfb0021d05e53216200addcd1efc781
+ f842412309eec508d90505d1203e94cb64a8a25a3e0c20b7d7408784504dec5a
+ 4e1a0ac57ab536db4b4fb1f70a301822269dcd44b92b995576a8386438482092
+ e6b4fc2b5d98826f247102544b5ecd2fc549ae3704a698941e94cc04cab45c8a
+ 89fe173ee181e1c463b619c5bd63456eedf67035a0cf2ff18db89febd4c6709b
+ b40c342f4f6b587786f3a720bddf44ffbaf4af402eea5faf1941b7b0e57816db
+ b7775be3215c4c723648f72ecc8e614f21a995990e9639fec5e313c6dde8f389
+ 47378629d0e551dd7f9f6cb3df9620d0bf7048eb8c6099f5a4fe706b94151115
+ d9658ba9a5042507063131d95721c8c7aec87a673269c617b906dc8b49a5dba7
+ 80ee004e2a11a895607025905fc1d043158f3db1235d9179a047df4595acaa0f
+ b980c637738f08d59204ea433c99096fc5e9e6d56a67ea899fc6ab7b4105fa4c
+ 98ad40c82bbd3e9fa467e3e9980fede8c03b8236e55711f78d64d34711b2afbb
+ 69567e62873eef724d6247a07243aec958fa3d687197bee5e8c687121840a5b5
+ 81de087c71b27a8089bc83ac09a61e85af5527fb44d122e50f0bd017642beb2d
+ d6eec4c549dd9fe8cb575588ba4bc58453034f5d31d97421d59d37cf2aeafcf0
+ 2187fb2682a6b677f0689c79b0c89954a77907461fb5021cd16cb1495a5c6f70
+ 0125ce75ed1dcad9724b7e624c99469fec49e5c72d091672ea996dd1880ea89a
+ 8a7345d60a4d457d21a7b3cfa954bdf3292db476722394dca99d80d237474183
+ 0d2db6c943d79b9c2b3046668022acc5765c4d5cdbb573cec3ca7f61fa99c90f
+ d300466057f4e5081bf2fd73774eac6723ce162ed46b7de9111ef04cfc9c2f40
+ 19f5174c598fa4efed6f753aaab681c6c732007ad2f935486b803a3c1152033c
+ c9c1661af636ebbbff94388ca89a32b139f882cdc89753325f1467de3ff457e6
+ 779fa0621c77cc1ef9bc29e8c91b993f804235559ea913271c32bd219d98fba5
+ ab161cc5a1f14dc2b9f199e1d5b4dd52ebb0f1f0434a41020dad66530f954aa1
+ e38612c3e685925990f6a172b2d0cce2a3d1aa8f9b34ede3b0e5d62c2fa2ff00
+ ef1689ab30ec75dca367496c3c617095dfdbe2d0fb37cd04f93e58b2ba1390d0
+ fb41438a8a1f6a054db4abf03cec3de88a72f9c030b8e7a0d128fa8cacff8709
+ 4897b0f6d9a52cf5aab7668c6ab17261509f0f7b26e10a2120cc0ea51360f738
+ aa65caa0b2ffdcd930f6c84ff697b87398c43649493041c5da81cb7035599214
+ d66644b0686c7e26a6828963292e08dd8b5d2e32932f4f56e14b057bcff75950
+ 8097b0f16f6a64b8e40dece3b6754f4b8fddb52c79d6c470d1b0e1b444f89a10
+ af21de550e72d11d19016a4d676982358ce0764355fee9e725f13dad54a5af74
+ e8352040a426ec70f468df86b17da0d39369a8ac5c7913a22f62b3b88c3ad2f7
+ 453b5afc99112a29c6bfddab11fd2acdb180ee7fd9fbb66d284777ab238dcd45
+ 7eac38fe1a2377b1964f6dd5c18357a569393553b6b44587f01503dd999c4e72"

From 03662a248a3852b9a7b6944b5f2c2f51c5f89a73 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Feb 2021 22:43:10 +0100
Subject: [PATCH 1125/3482] firefox-esr: add ppc64 xptcall patch too

---
 .../patches/ff85-ppc64-xptcall.patch          | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 srcpkgs/firefox-esr/patches/ff85-ppc64-xptcall.patch

diff --git a/srcpkgs/firefox-esr/patches/ff85-ppc64-xptcall.patch b/srcpkgs/firefox-esr/patches/ff85-ppc64-xptcall.patch
new file mode 100644
index 000000000000..b270d836f2f4
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/ff85-ppc64-xptcall.patch
@@ -0,0 +1,63 @@
+diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
+--- xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
++++ xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
+@@ -91,7 +91,13 @@
+         if (!s->IsIndirect() && s->type == nsXPTType::T_DOUBLE) {
+             if (nr_fpr < FPR_COUNT) {
+                 fpregs[nr_fpr++] = s->val.d;
+-                nr_gpr++;
++                // Even if we have enough FPRs, still skip space in
++                // the parameter area if we ran out of placeholder GPRs.
++                if (nr_gpr < GPR_COUNT) {
++                    nr_gpr++;
++                } else {
++                    d++;
++                }
+             } else {
+                 *((double *)d) = s->val.d;
+                 d++;
+@@ -101,7 +107,11 @@
+             if (nr_fpr < FPR_COUNT) {
+                 // Single-precision floats are passed in FPRs too.
+                 fpregs[nr_fpr++] = s->val.f;
+-                nr_gpr++;
++                if (nr_gpr < GPR_COUNT) {
++                    nr_gpr++;
++                } else {
++                    d++;
++                }
+             } else {
+ #ifdef __LITTLE_ENDIAN__
+                 *((float *)d) = s->val.f;
+diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp b/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
+--- xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
++++ xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
+@@ -103,7 +103,13 @@
+         if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
+             if (nr_fpr < FPR_COUNT) {
+                 dp->val.d = fpregs[nr_fpr++];
+-                nr_gpr++;
++                // Even if we have enough FPRs, still skip space in
++                // the parameter area if we ran out of placeholder GPRs.
++                if (nr_gpr < GPR_COUNT) {
++                    nr_gpr++;
++                } else {
++                    ap++;
++                }
+             } else {
+                 dp->val.d = *(double*)ap++;
+             }
+@@ -113,7 +119,11 @@
+             if (nr_fpr < FPR_COUNT) {
+                 // Single-precision floats are passed in FPRs too.
+                 dp->val.f = (float)fpregs[nr_fpr++];
+-                nr_gpr++;
++                if (nr_gpr < GPR_COUNT) {
++                    nr_gpr++;
++                } else {
++                    ap++;
++                }
+             } else {
+ #ifdef __LITTLE_ENDIAN__
+                 dp->val.f = *(float*)ap++;
+

From 273b9e8e8719bd2a388695444d51eed3c2651f22 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Feb 2021 22:44:07 +0100
Subject: [PATCH 1126/3482] thunderbird: also add ppc64 xptcall patch

---
 .../patches/ff85-ppc64-xptcall.patch          | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 srcpkgs/thunderbird/patches/ff85-ppc64-xptcall.patch

diff --git a/srcpkgs/thunderbird/patches/ff85-ppc64-xptcall.patch b/srcpkgs/thunderbird/patches/ff85-ppc64-xptcall.patch
new file mode 100644
index 000000000000..b270d836f2f4
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/ff85-ppc64-xptcall.patch
@@ -0,0 +1,63 @@
+diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
+--- xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
++++ xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
+@@ -91,7 +91,13 @@
+         if (!s->IsIndirect() && s->type == nsXPTType::T_DOUBLE) {
+             if (nr_fpr < FPR_COUNT) {
+                 fpregs[nr_fpr++] = s->val.d;
+-                nr_gpr++;
++                // Even if we have enough FPRs, still skip space in
++                // the parameter area if we ran out of placeholder GPRs.
++                if (nr_gpr < GPR_COUNT) {
++                    nr_gpr++;
++                } else {
++                    d++;
++                }
+             } else {
+                 *((double *)d) = s->val.d;
+                 d++;
+@@ -101,7 +107,11 @@
+             if (nr_fpr < FPR_COUNT) {
+                 // Single-precision floats are passed in FPRs too.
+                 fpregs[nr_fpr++] = s->val.f;
+-                nr_gpr++;
++                if (nr_gpr < GPR_COUNT) {
++                    nr_gpr++;
++                } else {
++                    d++;
++                }
+             } else {
+ #ifdef __LITTLE_ENDIAN__
+                 *((float *)d) = s->val.f;
+diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp b/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
+--- xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
++++ xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
+@@ -103,7 +103,13 @@
+         if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
+             if (nr_fpr < FPR_COUNT) {
+                 dp->val.d = fpregs[nr_fpr++];
+-                nr_gpr++;
++                // Even if we have enough FPRs, still skip space in
++                // the parameter area if we ran out of placeholder GPRs.
++                if (nr_gpr < GPR_COUNT) {
++                    nr_gpr++;
++                } else {
++                    ap++;
++                }
+             } else {
+                 dp->val.d = *(double*)ap++;
+             }
+@@ -113,7 +119,11 @@
+             if (nr_fpr < FPR_COUNT) {
+                 // Single-precision floats are passed in FPRs too.
+                 dp->val.f = (float)fpregs[nr_fpr++];
+-                nr_gpr++;
++                if (nr_gpr < GPR_COUNT) {
++                    nr_gpr++;
++                } else {
++                    ap++;
++                }
+             } else {
+ #ifdef __LITTLE_ENDIAN__
+                 dp->val.f = *(float*)ap++;
+

From 81f317d88c35a3ec16d78767df48438b9943bd89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 5 Feb 2021 23:18:29 +0100
Subject: [PATCH 1127/3482] psutils: add safety margin to buffer

The combination of gcc-10.2.1 and musl-1.2.2 detects a possible buffer
overrun psutil.c line 305. Add a safety margin of 24 byts to buffer.
---
 srcpkgs/psutils/patches/buffer-safety.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/psutils/patches/buffer-safety.patch

diff --git a/srcpkgs/psutils/patches/buffer-safety.patch b/srcpkgs/psutils/patches/buffer-safety.patch
new file mode 100644
index 000000000000..7f2165fd595c
--- /dev/null
+++ b/srcpkgs/psutils/patches/buffer-safety.patch
@@ -0,0 +1,20 @@
+--- psutils/psutil.c	2021-02-05 23:12:50.141587998 +0100
++++ psutils/psutil.c	2021-02-05 23:15:17.861925136 +0100
+@@ -38,7 +38,7 @@
+ extern char pagelabel[BUFSIZ];
+ extern int pageno;
+ 
+-static char buffer[BUFSIZ];
++static char buffer[BUFSIZ+24];
+ static long bytes = 0;
+ static off_t pagescmt = 0;
+ static off_t headerpos = 0;
+@@ -97,7 +97,7 @@
+   long r, w ;
+ #endif
+   char *p;
+-  char buffer[BUFSIZ] ;
++  char buffer[BUFSIZ+24] ;
+ #if defined(WINNT)
+   struct _stat fs ;
+ #else

From 82fa82299e16ef15fd5a41e538ced65f41dd6f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 5 Feb 2021 23:49:44 +0100
Subject: [PATCH 1128/3482] sysprof: fix the musl.patch

We still need a TEMP_FAILURE_RETRY definition.
---
 srcpkgs/sysprof/patches/musl.patch | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
index 217b7fb6e828..2a4cd9d927b5 100644
--- a/srcpkgs/sysprof/patches/musl.patch
+++ b/srcpkgs/sysprof/patches/musl.patch
@@ -138,14 +138,20 @@ Index: meson.build
    libunwind_dep = dependency('libunwind-generic', required: false)
 Index: src/libsysprof-capture/sysprof-compat.h
 ===================================================================
---- src/libsysprof-capture/sysprof-compat.h.orig
-+++ src/libsysprof-capture/sysprof-compat.h
-@@ -2,7 +2,7 @@
- 
- #pragma once
+--- src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
++++ src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
+@@ -17,6 +17,7 @@
+        __result; }))
+ #endif
  
--#ifndef __GLIBC__
 +#ifndef HAVE_REALLOCARRAY
- 
- #include <stdlib.h>
- #include <errno.h>
+ static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
+     if (sz && (nmemb > ((size_t)-1 / sz))) {
+         errno = ENOMEM;
+@@ -24,5 +25,5 @@
+     }
+     return realloc(p, nmemb * sz);
+ }
+-
++#endif
+ #endif

From 49e35c3f28657f31370d643a7a7e780767dcf109 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 6 Feb 2021 00:09:04 +0100
Subject: [PATCH 1129/3482] thermald: update to 2.4.2.

---
 srcpkgs/thermald/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index af5821b77e76..ecc17f3f7e32 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.1
+version=2.4.2
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7dc5c4e850a044f1ce11b746b048384372ad23bb1092bd9de1215f0dbb64eef7
+checksum=02deb2127934eec036771ec4028c106fb156d85784f58ac6e9906f7aa142793c
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then

From a033077175fd60900340b1fe7a5194a381befb82 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 5 Feb 2021 23:04:48 +0000
Subject: [PATCH 1130/3482] docker: update to 19.03.15.

---
 srcpkgs/docker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 16af17ca4fb3..ec79c20b11a7 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,6 +1,6 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.14
+version=19.03.15
 revision=1
 create_wrksrc=yes
 build_style=go
@@ -20,7 +20,7 @@ distfiles="
  https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
  https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
  https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="0b8838b0da1f1368fc1a0809a2ed11840bd7d58df1f090e668de209faddcef7c
+checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
  1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
  753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
 

From 54cdcbcffe6730621a5f41b0211bd2fd85605289 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 5 Feb 2021 23:16:47 +0000
Subject: [PATCH 1131/3482] terraform: update to 0.14.6.

---
 srcpkgs/terraform/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 0bf22d7f0a04..1c0eb78a2bc1 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=0.14.5
+version=0.14.6
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=bf4e60f5da3f2d461d730ddc4d34ee9cc7ab57f29c22bdd518c7267697f30e50
+checksum=84b10f2944a5074b3d42fe1c378f2228cb9451691edf46a7870706d5a8b2749c

From d80544d2fd739ce07d7dc7f5a86c990b326bcec0 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 5 Feb 2021 23:20:42 +0000
Subject: [PATCH 1132/3482] terragrunt: update to 0.28.2.

---
 srcpkgs/terragrunt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 2215e7ab7276..e2cce1be99c4 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.28.1
+version=0.28.2
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/$pkgname"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=d72f24dd94d3ec7112766c0b5defb67863f52d9bb41bd06b707312dcfb11a246
+checksum=e85e4c4d6d1641a12093af9d036e38d05f5c0ec6e768b9655d8d2f7a4ccadcfd
 
 post_install() {
 	vlicense LICENSE.txt

From e5fe09970b4a3586e6553826103850481291abf0 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Fri, 5 Feb 2021 09:21:40 +0300
Subject: [PATCH 1133/3482] wofi: revert the old patch for musl

---
 srcpkgs/wofi/patches/fix-mode-thread.patch | 30 ++++++++++++++++++++++
 srcpkgs/wofi/template                      |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/wofi/patches/fix-mode-thread.patch

diff --git a/srcpkgs/wofi/patches/fix-mode-thread.patch b/srcpkgs/wofi/patches/fix-mode-thread.patch
new file mode 100644
index 000000000000..51a24f93f1c1
--- /dev/null
+++ b/srcpkgs/wofi/patches/fix-mode-thread.patch
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User Scoopta <scoopta@scoopta.email>
+# Date 1601697276 25200
+#      Fri Oct 02 20:54:36 2020 -0700
+# Node ID 8a4a5e29ca9c1fb0a11ed9b329d275f5c02154a6
+# Parent  ac8dc17ab751b13b6d4ddcc1a1467e4beb8d7d26
+The mode thread will not be joined multiple times as this causes segfaults under musl
+
+--- src/wofi.c
++++ src/wofi.c
+@@ -103,6 +103,7 @@
+ static bool dynamic_lines;
+ static struct wl_list mode_list;
+ static pthread_t mode_thread;
++static bool has_joined_mode = false;
+
+ static struct map* keys;
+
+@@ -596,7 +597,10 @@
+ }
+
+ static gboolean insert_all_widgets(gpointer data) {
+-	pthread_join(mode_thread, NULL);
++	if(!has_joined_mode) {
++		pthread_join(mode_thread, NULL);
++		has_joined_mode = true;
++	}
+ 	struct wl_list* modes = data;
+ 	if(modes->prev == modes) {
+ 		return FALSE;
diff --git a/srcpkgs/wofi/template b/srcpkgs/wofi/template
index e9125320aed8..5fe2c5b63ed2 100644
--- a/srcpkgs/wofi/template
+++ b/srcpkgs/wofi/template
@@ -1,7 +1,7 @@
 # Template file for 'wofi'
 pkgname=wofi
 version=1.2.4
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=meson
 hostmakedepends="pkg-config"

From 34df0aa77f3839d89d0b0c1cdf934c6aaccd3884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 6 Feb 2021 09:45:43 +0700
Subject: [PATCH 1134/3482] avr-binutils: really cleanup template

- --host and --build should be set by
  common/environment/configure/gnu-configure-args.sh
- The current setting is broken from b7840fa4cec. No need to rev-bump
  because the original template is correct.
- It's --enable-install-libbfd  not --enable-install-libbbfd
---
 srcpkgs/avr-binutils/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/avr-binutils/template b/srcpkgs/avr-binutils/template
index 24fc7ed059fc..7d3a15725c57 100644
--- a/srcpkgs/avr-binutils/template
+++ b/srcpkgs/avr-binutils/template
@@ -5,8 +5,7 @@ revision=1
 wrksrc="binutils-$version"
 build_style=gnu-configure
 configure_args="--disable-werror --enable-shared --enable-gold
- --enable-plugins --enable-install-libbbfd --build=${XBPS_TRIPLET}
- --host=${XBPX_CROSS_TRIPLET} --target=avr --with-pic"
+ --enable-plugins --enable-install-libbfd --target=avr --with-pic"
 make_install_args="tooldir=/usr"
 makedepends="zlib-devel"
 short_desc="GNU binary utilities for AVR"

From 70f1132879f4337fb0c70fa6111017e5d5fa44df Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 6 Feb 2021 00:24:27 +0200
Subject: [PATCH 1135/3482] dutree: update to 0.2.16.

---
 srcpkgs/dutree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dutree/template b/srcpkgs/dutree/template
index 8450eb65ef6d..4bf082f3b7d5 100644
--- a/srcpkgs/dutree/template
+++ b/srcpkgs/dutree/template
@@ -1,6 +1,6 @@
 # Template file for 'dutree'
 pkgname=dutree
-version=0.2.15
+version=0.2.16
 revision=1
 build_style=cargo
 short_desc="Tool to analyze file system usage written in Rust"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/nachoparker/dutree"
 distfiles="https://github.com/nachoparker/dutree/archive/v${version}.tar.gz"
-checksum=8f5caa4f8e1d261ec3274218196e89319507bf866de6f658829f6a03be58ea83
+checksum=288e52f897785a03cae48eac581faf7d3743d36152f152ba25b8847528bf0a5f
 
 pre_build() {
 	# default version too old for ppc musl systems

From da339649e20d186986bbee874618dbc868766439 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 6 Feb 2021 00:45:55 +0200
Subject: [PATCH 1136/3482] bacon: update to 4.3.1.

---
 srcpkgs/bacon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacon/template b/srcpkgs/bacon/template
index 89405034d6c1..08c0b782e6cd 100644
--- a/srcpkgs/bacon/template
+++ b/srcpkgs/bacon/template
@@ -1,6 +1,6 @@
 # Template file for 'bacon'
 pkgname=bacon
-version=4.3
+version=4.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-bash --enable-gui-fltk"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://www.basic-converter.org"
 changelog="https://www.basic-converter.org/stable/CHANGES"
 distfiles="http://www.basic-converter.org/stable/bacon-${version}.tar.gz"
-checksum=657eabca5870fb7db1e34100392af1c0f841d4a4ba7910b44c50302ca288b4f0
+checksum=96bbfeebb506018a6e208dc85e6daded49778ec8b4d037854bda721af890e501
 disable_parallel_build=yes
 nocross=yes
 

From 18155b7da58b157292dc05bb59e930b4b103e17a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 6 Feb 2021 01:01:37 +0200
Subject: [PATCH 1137/3482] lsd: update to 0.19.0.

---
 srcpkgs/lsd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template
index 028aad319d6c..31d9e65fb33e 100644
--- a/srcpkgs/lsd/template
+++ b/srcpkgs/lsd/template
@@ -1,6 +1,6 @@
 # Template file for 'lsd'
 pkgname=lsd
-version=0.18.0
+version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Next gen ls command with lots of pretty colors and awesome icons"
@@ -9,4 +9,4 @@ license="Apache-2.0"
 homepage="https://github.com/Peltoche/lsd"
 changelog="https://raw.githubusercontent.com/Peltoche/${pkgname}/${version}/CHANGELOG.md"
 distfiles="https://github.com/Peltoche/${pkgname}/archive/${version}.tar.gz"
-checksum=2905e5d8d61d98d60c65544f3d41ae77459c8a92a4c7acafadcfb0233b2b7f95
+checksum=11e2c925562142d224eaa1c0d4ddec23989e5b8af93a747fe61389fba02cf808

From 2e5fa9df28aef074c7616fbbb98015ac522958df Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 5 Feb 2021 21:45:25 +0200
Subject: [PATCH 1138/3482] asciidoc: update to 9.0.5.

---
 srcpkgs/asciidoc/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/asciidoc/template b/srcpkgs/asciidoc/template
index 1e70bf7f85d8..bee49904ba4b 100644
--- a/srcpkgs/asciidoc/template
+++ b/srcpkgs/asciidoc/template
@@ -1,6 +1,6 @@
 # Template file for 'asciidoc'
 pkgname=asciidoc
-version=9.0.4
+version=9.0.5
 revision=1
 wrksrc=${pkgname}-py3-${version}
 build_style=gnu-configure
@@ -11,8 +11,9 @@ short_desc="Text based document generation"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://asciidoc.org/"
+changelog="https://asciidoc.org/CHANGELOG.html"
 distfiles="https://github.com/asciidoc/asciidoc-py3/archive/${version}.tar.gz"
-checksum=9e269f336a71e8685d03a00c71b55ca029eed9f7baf1afe67c447be32206b176
+checksum=b73248717403fe49ef239b2bdb95f2b603e0af15ddd8f5e420f27707010bf95f
 
 pre_configure() {
 	autoreconf -fi

From 1a3e9f379c520bc5a6493c890b3c171211c849ef Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 5 Feb 2021 19:17:54 +0100
Subject: [PATCH 1139/3482] gron: update to 0.6.1

---
 srcpkgs/gron/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gron/template b/srcpkgs/gron/template
index 566d222a1951..84d8276b246c 100644
--- a/srcpkgs/gron/template
+++ b/srcpkgs/gron/template
@@ -1,16 +1,15 @@
 # Template file for 'gron'
 pkgname=gron
-version=0.6.0
-revision=2
+version=0.6.1
+revision=1
 build_style=go
 go_import_path=github.com/tomnomnom/gron
-hostmakedepends="git"
 short_desc="Tool to make JSON greppable"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="MIT"
 homepage="https://github.com/tomnomnom/gron"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=fe75b1b4922b591723f48cb9cd2c31cb60bb3ab9f8d0398df75a08b781d8591c
+checksum=eef150a425aa4eaa8b2e36a75ee400d4247525403f79e24ed32ccb346dc653ff
 
 post_install() {
 	vlicense LICENSE

From f3dbb1e22a08924072702e16f5963bb169d86ad8 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 5 Feb 2021 12:19:09 +0100
Subject: [PATCH 1140/3482] go: update to 1.15.8

---
 srcpkgs/go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index e89f2599d292..186575b0676d 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.15.7
+version=1.15.8
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://golang.org/"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=8631b3aafd8ecb9244ec2ffb8a2a8b4983cf4ad15572b9801f7c5b167c1a2abc
+checksum=540c0ab7781084d124991321ed1458e479982de94454a98afab6acadf38497c2
 nostrip=yes
 noverifyrdeps=yes
 

From c536e93c285399d8f45fc5c7890530997e7ddca5 Mon Sep 17 00:00:00 2001
From: Evan Deaubl <evan@deaubl.name>
Date: Wed, 13 Jan 2021 05:14:49 -0700
Subject: [PATCH 1141/3482] git-annex: update to 8.20210127

---
 srcpkgs/git-annex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index 53a796cab1ae..2cb308fc66cd 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,6 +1,6 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20200908
+version=8.20210127
 revision=1
 build_style=haskell-stack
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
@@ -12,7 +12,7 @@ maintainer="Evan Deaubl <evan@deaubl.name>"
 license="AGPL-3.0-or-later, MIT, BSD-2-Clause, GPL-3.0-or-later, custom:Expat, custom:MIT-twitter, GPL-2.0-only, custom:icon-license"
 homepage="http://git-annex.branchable.com"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=61719d57d9389716aac9e6e12931e41b3b8a157d5fa8959201953810a88d2384
+checksum=636f439420f28a92a8250b9f8b422567e439315f3f2d23cb0bea3b0a0e5755c3
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

From 62cfcaa653a5f1dc280efb730052043da06d7e42 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 3 Feb 2021 15:13:04 -0500
Subject: [PATCH 1142/3482] chromium: update to 88.0.4324.150.

- Built for x86_64, x86_64-musl, i686.
- Tested on x86_64.
---
 .../patches/chromium-88-glibc-2.33.patch      | 144 ++++++++++++++++++
 srcpkgs/chromium/template                     |   4 +-
 2 files changed, 146 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/chromium/patches/chromium-88-glibc-2.33.patch

diff --git a/srcpkgs/chromium/patches/chromium-88-glibc-2.33.patch b/srcpkgs/chromium/patches/chromium-88-glibc-2.33.patch
new file mode 100644
index 000000000000..64306d5e429e
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-glibc-2.33.patch
@@ -0,0 +1,144 @@
+# Patch made by Kevin Kofler <Kevin@tigcc.ticalc.org>
+# https://bugzilla.redhat.com/show_bug.cgi?id=1904652
+
+diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.fstatfix chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+--- sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.fstatfix	2021-01-25 10:11:45.427436398 -0500
++++ sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc	2021-01-25 10:12:51.337699003 -0500
+@@ -257,6 +257,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictKillTarget(current_pid, sysno);
+   }
+ 
++#if defined(__NR_newfstatat)
++  if (sysno == __NR_newfstatat) {
++    return RewriteFstatatSIGSYS();
++  }
++#endif
++
++#if defined(__NR_fstatat64)
++  if (sysno == __NR_fstatat64) {
++    return RewriteFstatatSIGSYS();
++  }
++#endif
++
+   if (SyscallSets::IsFileSystem(sysno) ||
+       SyscallSets::IsCurrentDirectory(sysno)) {
+     return Error(fs_denied_errno);
+diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.fstatfix chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
+--- sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.fstatfix	2021-01-25 10:13:10.179774081 -0500
++++ sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc	2021-01-25 10:16:18.790525746 -0500
+@@ -6,6 +6,8 @@
+ 
+ #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"
+ 
++#include <errno.h>
++#include <fcntl.h>
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <string.h>
+@@ -355,6 +357,35 @@ intptr_t SIGSYSSchedHandler(const struct
+   return -ENOSYS;
+ }
+ 
++intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,
++                              void* aux) {
++  switch (args.nr) {
++#if defined(__NR_newfstatat)
++    case __NR_newfstatat:
++#endif
++#if defined(__NR_fstatat64)
++    case __NR_fstatat64:
++#endif
++#if defined(__NR_newfstatat) || defined(__NR_fstatat64)
++      if (*reinterpret_cast<const char *>(args.args[1]) == '\0'
++          && args.args[3] == static_cast<uint64_t>(AT_EMPTY_PATH)) {
++        return sandbox::sys_fstat64(static_cast<int>(args.args[0]),
++                                    reinterpret_cast<struct stat64 *>(args.args[2]));
++      } else {
++        errno = EACCES;
++        return -1;
++      }
++      break;
++#endif
++  }
++
++  CrashSIGSYS_Handler(args, aux);
++
++  // Should never be reached.
++  RAW_CHECK(false);
++  return -ENOSYS;
++}
++
+ bpf_dsl::ResultExpr CrashSIGSYS() {
+   return bpf_dsl::Trap(CrashSIGSYS_Handler, NULL);
+ }
+@@ -387,6 +418,10 @@ bpf_dsl::ResultExpr RewriteSchedSIGSYS()
+   return bpf_dsl::Trap(SIGSYSSchedHandler, NULL);
+ }
+ 
++bpf_dsl::ResultExpr RewriteFstatatSIGSYS() {
++  return bpf_dsl::Trap(SIGSYSFstatatHandler, NULL);
++}
++
+ void AllocateCrashKeys() {
+ #if !defined(OS_NACL_NONSFI)
+   if (seccomp_crash_key)
+diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.fstatfix chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
+--- sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.fstatfix	2021-01-25 10:16:36.982598236 -0500
++++ sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h	2021-01-25 10:18:45.705111027 -0500
+@@ -62,6 +62,10 @@ SANDBOX_EXPORT intptr_t SIGSYSPtraceFail
+ // sched_setparam(), sched_setscheduler()
+ SANDBOX_EXPORT intptr_t SIGSYSSchedHandler(const arch_seccomp_data& args,
+                                            void* aux);
++// If the fstatat syscall is actually a disguised fstat, calls the regular fstat
++// syscall, otherwise, crashes in the same way as CrashSIGSYS_Handler.
++SANDBOX_EXPORT intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args, 
++                                             void* aux);
+ 
+ // Variants of the above functions for use with bpf_dsl.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYS();
+@@ -72,6 +76,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Crash
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSFutex();
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSPtrace();
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteSchedSIGSYS();
++SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteFstatatSIGSYS();
+ 
+ // Allocates a crash key so that Seccomp information can be recorded.
+ void AllocateCrashKeys();
+diff -up chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.cc.fstatfix chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.cc
+--- sandbox/linux/services/syscall_wrappers.cc.fstatfix	2021-01-25 10:18:53.307141311 -0500
++++ sandbox/linux/services/syscall_wrappers.cc	2021-01-25 10:19:46.982355293 -0500
+@@ -261,4 +261,13 @@ int sys_sigaction(int signum,
+ 
+ #endif  // defined(MEMORY_SANITIZER)
+ 
++SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf)
++{
++#if defined(__NR_fstat64)
++    return syscall(__NR_fstat64, fd, buf);
++#else
++    return syscall(__NR_fstat, fd, buf);
++#endif
++}
++
+ }  // namespace sandbox
+diff -up chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.h.fstatfix chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.h
+--- sandbox/linux/services/syscall_wrappers.h.fstatfix	2021-01-25 10:19:53.115379741 -0500
++++ sandbox/linux/services/syscall_wrappers.h	2021-01-25 10:20:45.485588421 -0500
+@@ -17,6 +17,7 @@ struct sock_fprog;
+ struct rlimit64;
+ struct cap_hdr;
+ struct cap_data;
++struct stat64;
+ 
+ namespace sandbox {
+ 
+@@ -84,6 +85,9 @@ SANDBOX_EXPORT int sys_sigaction(int sig
+                                  const struct sigaction* act,
+                                  struct sigaction* oldact);
+ 
++// Recent glibc rewrites fstat to fstatat.
++SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf);
++
+ }  // namespace sandbox
+ 
+ #endif  // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 348389798a2e..b543051ccf70 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See http://www.chromium.org/developers/calendar for the latest version
-version=88.0.4324.96
+version=88.0.4324.150
 revision=1
 archs="i686* x86_64* aarch64* armv7l* ppc64le*"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=8995c5bb28559579f3bed51841420253637f912c425908fe5aa389ce40e9c79f
+checksum=ae12e94392986c6b8ea4413356a49bae0a19356ffe2ea95495303cf2decb38c3
 nocross=yes
 
 lib32disabled=yes

From ffef083b01273e8e60a6cdc4fa56f0486dcdad1f Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 4 Feb 2021 15:39:38 -0500
Subject: [PATCH 1143/3482] chromium-widevine: update to 88.0.4324.150.

---
 srcpkgs/chromium-widevine/INSTALL  | 2 +-
 srcpkgs/chromium-widevine/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chromium-widevine/INSTALL b/srcpkgs/chromium-widevine/INSTALL
index de1264d34d68..703be9f5101f 100644
--- a/srcpkgs/chromium-widevine/INSTALL
+++ b/srcpkgs/chromium-widevine/INSTALL
@@ -1,6 +1,6 @@
 # INSTALL
 
-checksum=4c3fca6ba917db4635368c99df61cd811c5138daa1ad890d4dc4271dd0014124
+checksum=404f13af1288a824898674e83c42bcdffba098178ff96d266525cd7e2fdcd077
 _baseUrl="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable"
 _filename="google-chrome-stable_${VERSION%_*}-1_amd64.deb"
 DISTFILE="${_baseUrl}/${_filename}"
diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template
index 8dc78d1edecf..b54e4b56f395 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
 _channel="stable"
 
 pkgname=chromium-widevine
-version=88.0.4324.96
+version=88.0.4324.150
 revision=1
 archs="x86_64"
 create_wrksrc=yes

From b3478f05bcd20637eab78c350f6f76248c6c0c84 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 5 Feb 2021 11:14:48 +0100
Subject: [PATCH 1144/3482] orage: remove package

* abandoned by upstream
* depends on GTK2

Closes: #28515 [via git-merge-pr]
---
 srcpkgs/orage/patches/libical3.patch | 59 ----------------------------
 srcpkgs/orage/template               | 20 ----------
 srcpkgs/removed-packages/template    |  1 +
 3 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 srcpkgs/orage/patches/libical3.patch
 delete mode 100644 srcpkgs/orage/template

diff --git a/srcpkgs/orage/patches/libical3.patch b/srcpkgs/orage/patches/libical3.patch
deleted file mode 100644
index 80906024f84e..000000000000
--- a/srcpkgs/orage/patches/libical3.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -up src/ical-code.c.libical-3.0 orage-4.12.1/src/ical-code.c
---- src/ical-code.c.libical-3.0	2017-11-14 08:41:30.917375493 +0100
-+++ src/ical-code.c	2017-11-14 08:41:56.823375135 +0100
-@@ -129,7 +129,6 @@ static struct icaltimetype ical_get_curr
-         &&   (strcmp(g_par.local_timezone, "floating") != 0))
-         ctime = icaltime_current_time_with_zone(local_icaltimezone);
-     else { / * use floating time * /
--        ctime.is_utc      = 0;
-         ctime.is_date     = 0;
-         ctime.is_daylight = 0;
-         ctime.zone        = NULL;
-@@ -2579,7 +2578,6 @@ static struct icaltimetype count_first_a
-  * when counting alarm time. */
-         if (rel == ICAL_RELATED_START) {
-             per.stime.is_date       = 0;
--            per.stime.is_utc        = 1;
-             per.stime.is_daylight   = 0;
-             per.stime.zone          = utc_icaltimezone;
-             per.stime.hour          = 0;
-@@ -2588,7 +2586,6 @@ static struct icaltimetype count_first_a
-         }
-         else {
-             per.etime.is_date       = 0;
--            per.etime.is_utc        = 1;
-             per.etime.is_daylight   = 0;
-             per.etime.zone          = utc_icaltimezone;
-             per.etime.hour          = 0;
-@@ -2613,7 +2610,6 @@ static struct icaltimetype count_next_al
- /* HACK: convert to UTC time so that we can use time arithmetic
-  * when counting alarm time. */
-         start_time.is_date       = 0;
--        start_time.is_utc        = 1;
-         start_time.is_daylight   = 0;
-         start_time.zone          = utc_icaltimezone;
-         start_time.hour          = 0;
-@@ -2768,7 +2764,6 @@ static alarm_struct *process_alarm_trigg
-      */
-     if (icaltime_is_date(per.stime)) {
-         if (local_icaltimezone != utc_icaltimezone) {
--            next_alarm_time.is_utc        = 0;
-             next_alarm_time.is_daylight   = 0;
-             next_alarm_time.zone          = local_icaltimezone;
-         }
-@@ -2850,7 +2845,6 @@ orage_message(120, P_N "Alarm rec loop n
-          */
-         if (icaltime_is_date(per.stime)) {
-             if (local_icaltimezone != utc_icaltimezone) {
--                next_alarm_time.is_utc        = 0;
-                 next_alarm_time.is_daylight   = 0;
-                 next_alarm_time.zone          = local_icaltimezone;
-             }
-@@ -2944,7 +2938,6 @@ orage_message(120, P_N "*****After loop
-          */
-         if (icaltime_is_date(per.stime)) {
-             if (local_icaltimezone != utc_icaltimezone) {
--                next_alarm_time.is_utc        = 0;
-                 next_alarm_time.is_daylight   = 0;
-                 next_alarm_time.zone          = local_icaltimezone;
-             }
diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
deleted file mode 100644
index fa79744cd366..000000000000
--- a/srcpkgs/orage/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'orage'
-pkgname=orage
-version=4.12.1
-revision=7
-build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
-hostmakedepends="pkg-config intltool flex"
-makedepends="libical-devel libnotify-devel gtk+3-devel
- popt-devel libxfce4util-devel gtk+-devel"
-depends="hicolor-icon-theme desktop-file-utils"
-short_desc="Simple calendar application for Xfce"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://xfce.org/"
-distfiles="https://archive.xfce.org/src/apps/orage/${version%.*}/orage-$version.tar.bz2"
-checksum=3cf9aa441ae83c8688865f82217025cdf3ebaa152cce4571777b8c2aa8dd9062
-
-post_patch() {
-	vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d50d4f980b0b..7862526a37d4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -167,6 +167,7 @@ replaces="
  mongroup<=0.4.1_2
  mozjs52<=52.9.0_7
  mozjs68<=68.11.0_1
+ orage<=4.12.1_7
  phonon-backend-gstreamer<=4.9.0_2
  phonon-backend-vlc<=0.9.1_3
  polkit-qt<=0.112.0_5

From ba1128f6373626deca0a1890517e48869a91fdda Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 5 Feb 2021 16:06:01 +0100
Subject: [PATCH 1145/3482] detox: update to 1.3.3.

---
 srcpkgs/detox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/detox/template b/srcpkgs/detox/template
index aaa8f10ff3d1..6d02ea19904b 100644
--- a/srcpkgs/detox/template
+++ b/srcpkgs/detox/template
@@ -1,6 +1,6 @@
 # Template file for 'detox'
 pkgname=detox
-version=1.3.0
+version=1.3.3
 revision=1
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/detox"
@@ -11,7 +11,7 @@ maintainer="Martin Födinger <foedinger.martin@autistici.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/dharple/detox"
 distfiles="https://github.com/dharple/detox/archive/v${version}.tar.gz"
-checksum=00daf6b019b51c7bbc3ac96deeeec18fd886c144eeee97c3372dd297bb134c84
+checksum=d57b6b8909046e66e2d992c126aba59c350d8aebfae55937397ef0b88abb4ae0
 
 pre_configure() {
 	autoreconf --install

From 34a18bc9c907a477e11178e34d8e733e78d69ded Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 5 Feb 2021 13:35:04 +0100
Subject: [PATCH 1146/3482] ubridge: update to 0.9.18.

---
 srcpkgs/ubridge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ubridge/template b/srcpkgs/ubridge/template
index 80d26e0183ae..d3fb96e88491 100644
--- a/srcpkgs/ubridge/template
+++ b/srcpkgs/ubridge/template
@@ -1,6 +1,6 @@
 # Template file for 'ubridge'
 pkgname=ubridge
-version=0.9.16
+version=0.9.18
 revision=1
 build_style=gnu-makefile
 make_build_args="SYSTEM_INIPARSER=1"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/GNS3/ubridge"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=eca932fb4be50aea9e141e20e7b97914182a169bda5322240bdc09e22a66f1ca
+checksum=7481e0f4a11c151c698baf5fbd5e474236aa408ff7f9b503e13feb091fbc38e7
 
 do_install() {
 	vbin ubridge

From 205819ec5fcdbbf97e6021f3fe322886680ddcf7 Mon Sep 17 00:00:00 2001
From: John Sullivan <jsullivan@csumb.edu>
Date: Fri, 5 Feb 2021 00:08:22 -0800
Subject: [PATCH 1147/3482] pinephone-uboot: update crust to 0.3.

This commit also drops smaeul's patches to armtf, which were dropped by
postmarketos as well

https://gitlab.com/postmarketOS/pmaports/-/tree/master/temp/arm-trusted-firmware
---
 ...winner-axp-Do-not-force-DRIVEVBUS-on.patch |  41 -
 ...-WFI-during-system-state-transitions.patch |  75 --
 ...emove-legacy-native-power-management.patch | 902 ------------------
 ...RGE-allwinner-Enable-UART-at-runtime.patch |  29 -
 ...GE-allwinner-Increase-msgbox-timeout.patch |  27 -
 .../0006-ATF-set-fno-stack-protector.patch    |  10 -
 srcpkgs/pinephone-uboot/template              |  41 +-
 7 files changed, 14 insertions(+), 1111 deletions(-)
 delete mode 100644 srcpkgs/pinephone-uboot/patches/armtf/0001-drivers-allwinner-axp-Do-not-force-DRIVEVBUS-on.patch
 delete mode 100644 srcpkgs/pinephone-uboot/patches/armtf/0002-allwinner-WFI-during-system-state-transitions.patch
 delete mode 100644 srcpkgs/pinephone-uboot/patches/armtf/0003-allwinner-Remove-legacy-native-power-management.patch
 delete mode 100644 srcpkgs/pinephone-uboot/patches/armtf/0004-DO-NOT-MERGE-allwinner-Enable-UART-at-runtime.patch
 delete mode 100644 srcpkgs/pinephone-uboot/patches/armtf/0005-DO-NOT-MERGE-allwinner-Increase-msgbox-timeout.patch
 delete mode 100644 srcpkgs/pinephone-uboot/patches/armtf/0006-ATF-set-fno-stack-protector.patch

diff --git a/srcpkgs/pinephone-uboot/patches/armtf/0001-drivers-allwinner-axp-Do-not-force-DRIVEVBUS-on.patch b/srcpkgs/pinephone-uboot/patches/armtf/0001-drivers-allwinner-axp-Do-not-force-DRIVEVBUS-on.patch
deleted file mode 100644
index f421e593baf3..000000000000
--- a/srcpkgs/pinephone-uboot/patches/armtf/0001-drivers-allwinner-axp-Do-not-force-DRIVEVBUS-on.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d0f999c94e936f05a761bfe219830d0e8c331de8 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Thu, 18 Jun 2020 18:24:32 -0500
-Subject: [PATCH 1/5] drivers: allwinner: axp: Do not force DRIVEVBUS on
-
-It is not necessarily safe to enable DRIVEVBUS at boot. For example,
-in a battery-powered device where VBUS is used for charging, enabling
-DRIVEVBUS at boot causes a loop and prevents charging from a
-dead-battery condition.
-
-Furthermore, since bit 4 of register 0x8f is cleared by default and is
-persisted across reboots, it is never useful to explicitly clear it.
-For this reason, remove the whole code block.
-
-Signed-off-by: Samuel Holland <samuel@sholland.org>
-Change-Id: I26d75b229f235e8c5630e75aadcfc02dc9ca24b2
----
- drivers/allwinner/axp/common.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/drivers/allwinner/axp/common.c b/drivers/allwinner/axp/common.c
-index 13437fec8..cbd2e8818 100644
---- a/drivers/allwinner/axp/common.c
-+++ b/drivers/allwinner/axp/common.c
-@@ -120,13 +120,6 @@ void axp_setup_regulators(const void *fdt)
- 		return;
- 	}
- 
--	/* This applies to AXP803 only. */
--	if (fdt_getprop(fdt, node, "x-powers,drive-vbus-en", NULL)) {
--		axp_clrbits(0x8f, BIT(4));
--		axp_setbits(0x30, BIT(2));
--		INFO("PMIC: Enabling DRIVEVBUS\n");
--	}
--
- 	/* descend into the "regulators" subnode */
- 	node = fdt_subnode_offset(fdt, node, "regulators");
- 	if (node < 0) {
--- 
-2.28.0
-
diff --git a/srcpkgs/pinephone-uboot/patches/armtf/0002-allwinner-WFI-during-system-state-transitions.patch b/srcpkgs/pinephone-uboot/patches/armtf/0002-allwinner-WFI-during-system-state-transitions.patch
deleted file mode 100644
index 72138688c1d6..000000000000
--- a/srcpkgs/pinephone-uboot/patches/armtf/0002-allwinner-WFI-during-system-state-transitions.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From c744b1b64008f4c8cd6292df058cbbbc6baf780f Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Thu, 7 May 2020 19:05:57 -0500
-Subject: [PATCH 2/5] allwinner: WFI during system state transitions
-
-Signed-off-by: Samuel Holland <samuel@sholland.org>
-Change-Id: I19fea4db03a3200014da9d41ecfdc7e54893aca2
----
- plat/allwinner/common/sunxi_pm.c | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/plat/allwinner/common/sunxi_pm.c b/plat/allwinner/common/sunxi_pm.c
-index e0fa5b3ec..17ef7bfda 100644
---- a/plat/allwinner/common/sunxi_pm.c
-+++ b/plat/allwinner/common/sunxi_pm.c
-@@ -12,7 +12,6 @@
- #include <common/debug.h>
- #include <drivers/arm/css/css_scpi.h>
- #include <drivers/arm/gicv2.h>
--#include <drivers/delay_timer.h>
- #include <lib/mmio.h>
- #include <lib/psci/psci.h>
- #include <plat/common/platform.h>
-@@ -136,8 +135,10 @@ static void __dead2 sunxi_system_off(void)
- 		/* Send the power down request to the SCP */
- 		uint32_t ret = scpi_sys_power_state(scpi_system_shutdown);
- 
--		if (ret != SCP_OK)
--			ERROR("PSCI: SCPI %s failed: %d\n", "shutdown", ret);
-+		if (ret == SCP_OK)
-+			wfi();
-+
-+		ERROR("PSCI: SCPI %s failed: %d\n", "shutdown", ret);
- 	}
- 
- 	/* Turn off all secondary CPUs */
-@@ -145,9 +146,8 @@ static void __dead2 sunxi_system_off(void)
- 
- 	sunxi_power_down();
- 
--	udelay(1000);
--	ERROR("PSCI: Cannot turn off system, halting\n");
- 	wfi();
-+	ERROR("PSCI: Cannot turn off system, halting\n");
- 	panic();
- }
- 
-@@ -159,19 +159,19 @@ static void __dead2 sunxi_system_reset(void)
- 		/* Send the system reset request to the SCP */
- 		uint32_t ret = scpi_sys_power_state(scpi_system_reboot);
- 
--		if (ret != SCP_OK)
--			ERROR("PSCI: SCPI %s failed: %d\n", "reboot", ret);
-+		if (ret == SCP_OK)
-+			wfi();
-+
-+		ERROR("PSCI: SCPI %s failed: %d\n", "reboot", ret);
- 	}
- 
- 	/* Reset the whole system when the watchdog times out */
- 	mmio_write_32(SUNXI_WDOG0_CFG_REG, 1);
- 	/* Enable the watchdog with the shortest timeout (0.5 seconds) */
- 	mmio_write_32(SUNXI_WDOG0_MODE_REG, (0 << 4) | 1);
--	/* Wait for twice the watchdog timeout before panicking */
--	mdelay(1000);
- 
--	ERROR("PSCI: System reset failed\n");
- 	wfi();
-+	ERROR("PSCI: System reset failed\n");
- 	panic();
- }
- 
--- 
-2.28.0
-
diff --git a/srcpkgs/pinephone-uboot/patches/armtf/0003-allwinner-Remove-legacy-native-power-management.patch b/srcpkgs/pinephone-uboot/patches/armtf/0003-allwinner-Remove-legacy-native-power-management.patch
deleted file mode 100644
index 012378ec539f..000000000000
--- a/srcpkgs/pinephone-uboot/patches/armtf/0003-allwinner-Remove-legacy-native-power-management.patch
+++ /dev/null
@@ -1,902 +0,0 @@
-From 67767123b31cfbb206e3eb2b7ca845794e025ffc Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sun, 17 May 2020 19:12:27 -0500
-Subject: [PATCH 3/5] allwinner: Remove legacy native power management
-
-Signed-off-by: Samuel Holland <samuel@sholland.org>
-Change-Id: Id85732db352f811dd6d5e6064624bb4752bda0f3
----
- plat/allwinner/common/allwinner-common.mk     |   1 -
- plat/allwinner/common/arisc_off.S             | 115 -------------
- plat/allwinner/common/include/sunxi_private.h |   7 -
- plat/allwinner/common/sunxi_bl31_setup.c      |   3 -
- plat/allwinner/common/sunxi_common.c          |  76 ---------
- plat/allwinner/common/sunxi_cpu_ops.c         | 123 --------------
- plat/allwinner/common/sunxi_pm.c              |  80 +++------
- .../sun50i_a64/include/core_off_arisc.h       |  39 -----
- plat/allwinner/sun50i_a64/sunxi_power.c       | 156 ++----------------
- .../sun50i_h6/include/core_off_arisc.h        |  39 -----
- plat/allwinner/sun50i_h6/sunxi_power.c        |  25 ---
- 11 files changed, 40 insertions(+), 624 deletions(-)
- delete mode 100644 plat/allwinner/common/arisc_off.S
- delete mode 100644 plat/allwinner/common/sunxi_cpu_ops.c
- delete mode 100644 plat/allwinner/sun50i_a64/include/core_off_arisc.h
- delete mode 100644 plat/allwinner/sun50i_h6/include/core_off_arisc.h
-
-diff --git a/plat/allwinner/common/allwinner-common.mk b/plat/allwinner/common/allwinner-common.mk
-index e60ebc6f2..617eb6de2 100644
---- a/plat/allwinner/common/allwinner-common.mk
-+++ b/plat/allwinner/common/allwinner-common.mk
-@@ -31,7 +31,6 @@ BL31_SOURCES		+=	drivers/allwinner/axp/common.c		\
- 				plat/common/plat_gicv2.c		\
- 				plat/common/plat_psci_common.c		\
- 				${AW_PLAT}/common/sunxi_bl31_setup.c	\
--				${AW_PLAT}/common/sunxi_cpu_ops.c	\
- 				${AW_PLAT}/common/sunxi_pm.c		\
- 				${AW_PLAT}/${PLAT}/sunxi_power.c	\
- 				${AW_PLAT}/common/sunxi_security.c	\
-diff --git a/plat/allwinner/common/arisc_off.S b/plat/allwinner/common/arisc_off.S
-deleted file mode 100644
-index ed10832c9..000000000
---- a/plat/allwinner/common/arisc_off.S
-+++ /dev/null
-@@ -1,115 +0,0 @@
--# turn_off_core.S
--#
--# Copyright (c) 2018, Andre Przywara <osp@andrep.de>
--# SPDX-License-Identifier: BSD-3-Clause
--#
--# OpenRISC assembly to turn off an ARM core on an Allwinner SoC from
--# the arisc management controller.
--# Generate a binary representation with:
--# $ or1k-elf-as -c -o turn_off_core.o turn_off_core.S
--# $ or1k-elf-objcopy -O binary --reverse-bytes=4 turn_off_core.o \
--#   turn_off_core.bin
--# The encoded instructions go into an array defined in
--# plat/allwinner/sun50i_*/include/core_off_arisc.h, to be handed off to
--# the arisc processor.
--#
--# This routine is meant to be called directly from arisc reset (put the
--# start address in the reset vector), to be actually triggered by that
--# very ARM core to be turned off.
--# It expects the core number presented as a mask in the upper half of
--# r3, so to be patched in the lower 16 bits of the first instruction,
--# overwriting the 0 in this code here.
--# The code will do the following:
--# - Read the C_CPU_STATUS register, which contains the status of the WFI
--#   lines of each of the four A53 cores.
--# - Loop until the core in question reaches WFI.
--# - Using that mask, activate the core output clamps by setting the
--#   respective core bit in CPUX_PWROFF_GATING_REG (0x1f01500).
--#   Note that the clamp for core 0 covers more than just the core, activating
--#   it hangs the whole system. So we skip this step for core 0.
--# - Using the negated mask, assert the core's reset line by clearing the
--#   respective bit in C_RST_CTRL (0x1f01c30).
--# - Finally turn off the core's power switch by writing 0xff to the
--#   respective CPUx_PWR_SWITCH_REG (0x1f01540 ff.)
--# - Assert the arisc's own reset to end execution.
--#   This also signals other arisc users that the chip is free again.
--# So in C this would look like:
--#	while (!(readl(0x1700030) & (1U << core_nr)))
--#		;
--#	if (core_nr != 0)
--#		writel(readl(0x1f01500) | (1U << core_nr), 0x1f01500);
--#	writel(readl(0x1f01c30) & ~(1U << core_nr), 0x1f01c30);
--#	writel(0xff, 0x1f01540 + (core_nr * 4));
--# (using A64/H5 addresses)
--
--.text
--_start:
--	l.movhi	r3, 0				# FIXUP! with core mask
--	l.movhi r0, 0				# clear r0
--	l.movhi	r13, 0x170			# r13: CPU_CFG_BASE=0x01700000
--wait_wfi:
--	l.lwz	r5, 0x30(r13)			# load C_CPU_STATUS
--	l.and	r5, r5, r3			# mask requested core
--	l.sfeq	r5, r0				# is it not yet in WFI?
--	l.bf	wait_wfi			# try again
--
--	l.srli	r6, r3, 16			# move mask to lower 16 bits
--	l.sfeqi	r6, 1				# core 0 is special
--	l.bf	1f				# don't touch the bit for core 0
--	l.movhi	r13, 0x1f0			# address of R_CPUCFG (delay)
--	l.lwz	r5, 0x1500(r13)			# core output clamps
--	l.or	r5, r5, r6			# set bit to ...
--	l.sw	0x1500(r13), r5			# ... activate for our core
--
--1:	l.lwz	r5, 0x1c30(r13)			# CPU power-on reset
--	l.xori	r6, r6, -1			# negate core mask
--	l.and	r5, r5, r6			# clear bit to ...
--	l.sw	0x1c30(r13), r5			# ... assert for our core
--
--	l.ff1	r6, r3				# get core number from high mask
--	l.addi	r6, r6, -17			# convert to 0-3
--	l.slli	r6, r6, 2			# r5: core number*4 (0-12)
--	l.add	r6, r6, r13			# add to base address
--	l.ori	r5, r0, 0xff			# 0xff means all switches off
--	l.sw	0x1540(r6), r5			# core power switch registers
--
--reset:	l.sw	0x1c00(r13),r0			# pull down our own reset line
--
--	l.j	reset				# just in case ....
--	l.nop	0x0				# (delay slot)
--
--# same as above, but with the MMIO addresses matching the H6 SoC
--_start_h6:
--	l.movhi	r3, 0				# FIXUP! with core mask
--	l.movhi r0, 0				# clear r0
--	l.movhi	r13, 0x901			# r13: CPU_CFG_BASE=0x09010000
--1:
--	l.lwz	r5, 0x80(r13)			# load C_CPU_STATUS
--	l.and	r5, r5, r3			# mask requested core
--	l.sfeq	r5, r0				# is it not yet in WFI?
--	l.bf	1b				# try again
--
--	l.srli	r6, r3, 16			# move mask to lower 16 bits(ds)
--	l.sfeqi	r6, 1				# core 0 is special
--	l.bf	1f				# don't touch the bit for core 0
--	l.movhi	r13, 0x700			# address of R_CPUCFG (ds)
--	l.lwz	r5, 0x0444(r13)			# core output clamps
--	l.or	r5, r5, r6			# set bit to ...
--	l.sw	0x0444(r13), r5			# ... activate for our core
--
--1:	l.lwz	r5, 0x0440(r13)			# CPU power-on reset
--	l.xori	r6, r6, -1			# negate core mask
--	l.and	r5, r5, r6			# clear bit to ...
--	l.sw	0x0440(r13), r5			# ... assert for our core
--
--	l.ff1	r6, r3				# get core number from high mask
--	l.addi	r6, r6, -17			# convert to 0-3
--	l.slli	r6, r6, 2			# r5: core number*4 (0-12)
--	l.add	r6, r6, r13			# add to base address
--	l.ori	r5, r0, 0xff			# 0xff means all switches off
--	l.sw	0x0450(r6), r5			# core power switch registers
--
--1:	l.sw	0x0400(r13),r0			# pull down our own reset line
--
--	l.j	1b				# just in case ...
--	l.nop	0x0				# (delay slot)
-diff --git a/plat/allwinner/common/include/sunxi_private.h b/plat/allwinner/common/include/sunxi_private.h
-index dcf3dc965..7b6cff07c 100644
---- a/plat/allwinner/common/include/sunxi_private.h
-+++ b/plat/allwinner/common/include/sunxi_private.h
-@@ -9,17 +9,10 @@
- 
- void sunxi_configure_mmu_el3(int flags);
- 
--void sunxi_cpu_on(u_register_t mpidr);
--void sunxi_cpu_off(u_register_t mpidr);
--void sunxi_disable_secondary_cpus(u_register_t primary_mpidr);
--void sunxi_power_down(void);
--
- int sunxi_pmic_setup(uint16_t socid, const void *fdt);
- void sunxi_security_setup(void);
- 
- uint16_t sunxi_read_soc_id(void);
--void sunxi_set_gpio_out(char port, int pin, bool level_high);
- int sunxi_init_platform_r_twi(uint16_t socid, bool use_rsb);
--void sunxi_execute_arisc_code(uint32_t *code, size_t size, uint16_t param);
- 
- #endif /* SUNXI_PRIVATE_H */
-diff --git a/plat/allwinner/common/sunxi_bl31_setup.c b/plat/allwinner/common/sunxi_bl31_setup.c
-index e836a345b..fe511d02c 100644
---- a/plat/allwinner/common/sunxi_bl31_setup.c
-+++ b/plat/allwinner/common/sunxi_bl31_setup.c
-@@ -100,9 +100,6 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
- 	bl33_image_ep_info.spsr = SPSR_64(MODE_EL2, MODE_SP_ELX,
- 					  DISABLE_ALL_EXCEPTIONS);
- 	SET_SECURITY_STATE(bl33_image_ep_info.h.attr, NON_SECURE);
--
--	/* Turn off all secondary CPUs */
--	sunxi_disable_secondary_cpus(read_mpidr());
- }
- 
- void bl31_plat_arch_setup(void)
-diff --git a/plat/allwinner/common/sunxi_common.c b/plat/allwinner/common/sunxi_common.c
-index 0ca18adc3..61826c6af 100644
---- a/plat/allwinner/common/sunxi_common.c
-+++ b/plat/allwinner/common/sunxi_common.c
-@@ -82,35 +82,6 @@ uint16_t sunxi_read_soc_id(void)
- 	return reg >> 16;
- }
- 
--/*
-- * Configure a given pin to the GPIO-OUT function and sets its level.
-- * The port is given as a capital letter, the pin is the number within
-- * this port group.
-- * So to set pin PC7 to high, use: sunxi_set_gpio_out('C', 7, true);
-- */
--void sunxi_set_gpio_out(char port, int pin, bool level_high)
--{
--	uintptr_t port_base;
--
--	if (port < 'A' || port > 'L')
--		return;
--	if (port == 'L')
--		port_base = SUNXI_R_PIO_BASE;
--	else
--		port_base = SUNXI_PIO_BASE + (port - 'A') * 0x24;
--
--	/* Set the new level first before configuring the pin. */
--	if (level_high)
--		mmio_setbits_32(port_base + 0x10, BIT(pin));
--	else
--		mmio_clrbits_32(port_base + 0x10, BIT(pin));
--
--	/* configure pin as GPIO out (4(3) bits per pin, 1: GPIO out */
--	mmio_clrsetbits_32(port_base + (pin / 8) * 4,
--			   0x7 << ((pin % 8) * 4),
--			   0x1 << ((pin % 8) * 4));
--}
--
- int sunxi_init_platform_r_twi(uint16_t socid, bool use_rsb)
- {
- 	uint32_t pin_func = 0x77;
-@@ -165,50 +136,3 @@ int sunxi_init_platform_r_twi(uint16_t socid, bool use_rsb)
- 
- 	return 0;
- }
--
--/* This lock synchronises access to the arisc management processor. */
--DEFINE_BAKERY_LOCK(arisc_lock);
--
--/*
-- * Tell the "arisc" SCP core (an OpenRISC core) to execute some code.
-- * We don't have any service running there, so we place some OpenRISC code
-- * in SRAM, put the address of that into the reset vector and release the
-- * arisc reset line. The SCP will execute that code and pull the line up again.
-- */
--void sunxi_execute_arisc_code(uint32_t *code, size_t size, uint16_t param)
--{
--	uintptr_t arisc_reset_vec = SUNXI_SRAM_A2_BASE + 0x100;
--
--	do {
--		bakery_lock_get(&arisc_lock);
--		/* Wait until the arisc is in reset state. */
--		if (!(mmio_read_32(SUNXI_R_CPUCFG_BASE) & BIT(0)))
--			break;
--
--		bakery_lock_release(&arisc_lock);
--	} while (1);
--
--	/* Patch up the code to feed in an input parameter. */
--	code[0] = (code[0] & ~0xffff) | param;
--	clean_dcache_range((uintptr_t)code, size);
--
--	/*
--	 * The OpenRISC unconditional branch has opcode 0, the branch offset
--	 * is in the lower 26 bits, containing the distance to the target,
--	 * in instruction granularity (32 bits).
--	 */
--	mmio_write_32(arisc_reset_vec, ((uintptr_t)code - arisc_reset_vec) / 4);
--	clean_dcache_range(arisc_reset_vec, 4);
--
--	/* De-assert the arisc reset line to let it run. */
--	mmio_setbits_32(SUNXI_R_CPUCFG_BASE, BIT(0));
--
--	/*
--	 * We release the lock here, although the arisc is still busy.
--	 * But as long as it runs, the reset line is high, so other users
--	 * won't leave the loop above.
--	 * Once it has finished, the code is supposed to clear the reset line,
--	 * to signal this to other users.
--	 */
--	bakery_lock_release(&arisc_lock);
--}
-diff --git a/plat/allwinner/common/sunxi_cpu_ops.c b/plat/allwinner/common/sunxi_cpu_ops.c
-deleted file mode 100644
-index 6e29b69bf..000000000
---- a/plat/allwinner/common/sunxi_cpu_ops.c
-+++ /dev/null
-@@ -1,123 +0,0 @@
--/*
-- * Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
-- *
-- * SPDX-License-Identifier: BSD-3-Clause
-- */
--
--#include <assert.h>
--
--#include <platform_def.h>
--
--#include <arch_helpers.h>
--#include <common/debug.h>
--#include <drivers/delay_timer.h>
--#include <lib/mmio.h>
--#include <lib/utils_def.h>
--#include <plat/common/platform.h>
--
--#include <core_off_arisc.h>
--#include <sunxi_cpucfg.h>
--#include <sunxi_mmap.h>
--#include <sunxi_private.h>
--
--static void sunxi_cpu_disable_power(unsigned int cluster, unsigned int core)
--{
--	if (mmio_read_32(SUNXI_CPU_POWER_CLAMP_REG(cluster, core)) == 0xff)
--		return;
--
--	VERBOSE("PSCI: Disabling power to cluster %d core %d\n", cluster, core);
--
--	mmio_write_32(SUNXI_CPU_POWER_CLAMP_REG(cluster, core), 0xff);
--}
--
--static void sunxi_cpu_enable_power(unsigned int cluster, unsigned int core)
--{
--	if (mmio_read_32(SUNXI_CPU_POWER_CLAMP_REG(cluster, core)) == 0)
--		return;
--
--	VERBOSE("PSCI: Enabling power to cluster %d core %d\n", cluster, core);
--
--	/* Power enable sequence from original Allwinner sources */
--	mmio_write_32(SUNXI_CPU_POWER_CLAMP_REG(cluster, core), 0xfe);
--	mmio_write_32(SUNXI_CPU_POWER_CLAMP_REG(cluster, core), 0xf8);
--	mmio_write_32(SUNXI_CPU_POWER_CLAMP_REG(cluster, core), 0xe0);
--	mmio_write_32(SUNXI_CPU_POWER_CLAMP_REG(cluster, core), 0x80);
--	mmio_write_32(SUNXI_CPU_POWER_CLAMP_REG(cluster, core), 0x00);
--}
--
--void sunxi_cpu_off(u_register_t mpidr)
--{
--	unsigned int cluster = MPIDR_AFFLVL1_VAL(mpidr);
--	unsigned int core    = MPIDR_AFFLVL0_VAL(mpidr);
--
--	VERBOSE("PSCI: Powering off cluster %d core %d\n", cluster, core);
--
--	/* Deassert DBGPWRDUP */
--	mmio_clrbits_32(SUNXI_CPUCFG_DBG_REG0, BIT(core));
--
--	/* We can't turn ourself off like this, but it works for other cores. */
--	if (read_mpidr() != mpidr) {
--		/* Activate the core output clamps, but not for core 0. */
--		if (core != 0)
--			mmio_setbits_32(SUNXI_POWEROFF_GATING_REG(cluster),
--					BIT(core));
--		/* Assert CPU power-on reset */
--		mmio_clrbits_32(SUNXI_POWERON_RST_REG(cluster), BIT(core));
--		/* Remove power from the CPU */
--		sunxi_cpu_disable_power(cluster, core);
--
--		return;
--	}
--
--	/* Simplifies assembly, all SoCs so far are single cluster anyway. */
--	assert(cluster == 0);
--
--	/*
--	 * If we are supposed to turn ourself off, tell the arisc SCP
--	 * to do that work for us. The code expects the core mask to be
--	 * patched into the first instruction.
--	 */
--	sunxi_execute_arisc_code(arisc_core_off, sizeof(arisc_core_off),
--				 BIT_32(core));
--}
--
--void sunxi_cpu_on(u_register_t mpidr)
--{
--	unsigned int cluster = MPIDR_AFFLVL1_VAL(mpidr);
--	unsigned int core    = MPIDR_AFFLVL0_VAL(mpidr);
--
--	VERBOSE("PSCI: Powering on cluster %d core %d\n", cluster, core);
--
--	/* Assert CPU core reset */
--	mmio_clrbits_32(SUNXI_CPUCFG_RST_CTRL_REG(cluster), BIT(core));
--	/* Assert CPU power-on reset */
--	mmio_clrbits_32(SUNXI_POWERON_RST_REG(cluster), BIT(core));
--	/* Set CPU to start in AArch64 mode */
--	mmio_setbits_32(SUNXI_CPUCFG_CLS_CTRL_REG0(cluster), BIT(24 + core));
--	/* Apply power to the CPU */
--	sunxi_cpu_enable_power(cluster, core);
--	/* Release the core output clamps */
--	mmio_clrbits_32(SUNXI_POWEROFF_GATING_REG(cluster), BIT(core));
--	/* Deassert CPU power-on reset */
--	mmio_setbits_32(SUNXI_POWERON_RST_REG(cluster), BIT(core));
--	/* Deassert CPU core reset */
--	mmio_setbits_32(SUNXI_CPUCFG_RST_CTRL_REG(cluster), BIT(core));
--	/* Assert DBGPWRDUP */
--	mmio_setbits_32(SUNXI_CPUCFG_DBG_REG0, BIT(core));
--}
--
--void sunxi_disable_secondary_cpus(u_register_t primary_mpidr)
--{
--	unsigned int cluster;
--	unsigned int core;
--
--	for (cluster = 0; cluster < PLATFORM_CLUSTER_COUNT; ++cluster) {
--		for (core = 0; core < PLATFORM_MAX_CPUS_PER_CLUSTER; ++core) {
--			u_register_t mpidr = (cluster << MPIDR_AFF1_SHIFT) |
--					     (core    << MPIDR_AFF0_SHIFT) |
--					     BIT(31);
--			if (mpidr != primary_mpidr)
--				sunxi_cpu_off(mpidr);
--		}
--	}
--}
-diff --git a/plat/allwinner/common/sunxi_pm.c b/plat/allwinner/common/sunxi_pm.c
-index 17ef7bfda..9cb31bf15 100644
---- a/plat/allwinner/common/sunxi_pm.c
-+++ b/plat/allwinner/common/sunxi_pm.c
-@@ -53,8 +53,6 @@
-  */
- #define SCP_FIRMWARE_MAGIC		0xb4400012
- 
--static bool scpi_available;
--
- static inline scpi_power_state_t scpi_map_state(plat_local_state_t psci_state)
- {
- 	if (is_local_state_run(psci_state))
-@@ -80,14 +78,10 @@ static int sunxi_pwr_domain_on(u_register_t mpidr)
- 	if (mpidr_is_valid(mpidr) == 0)
- 		return PSCI_E_INTERN_FAIL;
- 
--	if (scpi_available) {
--		scpi_set_css_power_state(mpidr,
--					 scpi_power_on,
--					 scpi_power_on,
--					 scpi_power_on);
--	} else {
--		sunxi_cpu_on(mpidr);
--	}
-+	scpi_set_css_power_state(mpidr,
-+				 scpi_power_on,
-+				 scpi_power_on,
-+				 scpi_power_on);
- 
- 	return PSCI_E_SUCCESS;
- }
-@@ -101,20 +95,10 @@ static void sunxi_pwr_domain_off(const psci_power_state_t *target_state)
- 	if (is_local_state_off(cpu_pwr_state))
- 		gicv2_cpuif_disable();
- 
--	if (scpi_available) {
--		scpi_set_css_power_state(read_mpidr(),
--					 scpi_map_state(cpu_pwr_state),
--					 scpi_map_state(cluster_pwr_state),
--					 scpi_map_state(system_pwr_state));
--	}
--}
--
--static void __dead2 sunxi_pwr_down_wfi(const psci_power_state_t *target_state)
--{
--	sunxi_cpu_off(read_mpidr());
--
--	while (1)
--		wfi();
-+	scpi_set_css_power_state(read_mpidr(),
-+				 scpi_map_state(cpu_pwr_state),
-+				 scpi_map_state(cluster_pwr_state),
-+				 scpi_map_state(system_pwr_state));
- }
- 
- static void sunxi_pwr_domain_on_finish(const psci_power_state_t *target_state)
-@@ -131,22 +115,12 @@ static void __dead2 sunxi_system_off(void)
- {
- 	gicv2_cpuif_disable();
- 
--	if (scpi_available) {
--		/* Send the power down request to the SCP */
--		uint32_t ret = scpi_sys_power_state(scpi_system_shutdown);
-+	/* Send the power down request to the SCP */
-+	uint32_t ret = scpi_sys_power_state(scpi_system_shutdown);
- 
--		if (ret == SCP_OK)
--			wfi();
--
--		ERROR("PSCI: SCPI %s failed: %d\n", "shutdown", ret);
--	}
--
--	/* Turn off all secondary CPUs */
--	sunxi_disable_secondary_cpus(read_mpidr());
--
--	sunxi_power_down();
-+	if (ret == SCP_OK)
-+		wfi();
- 
--	wfi();
- 	ERROR("PSCI: Cannot turn off system, halting\n");
- 	panic();
- }
-@@ -155,15 +129,11 @@ static void __dead2 sunxi_system_reset(void)
- {
- 	gicv2_cpuif_disable();
- 
--	if (scpi_available) {
--		/* Send the system reset request to the SCP */
--		uint32_t ret = scpi_sys_power_state(scpi_system_reboot);
--
--		if (ret == SCP_OK)
--			wfi();
-+	/* Send the system reset request to the SCP */
-+	uint32_t ret = scpi_sys_power_state(scpi_system_reboot);
- 
--		ERROR("PSCI: SCPI %s failed: %d\n", "reboot", ret);
--	}
-+	if (ret == SCP_OK)
-+		wfi();
- 
- 	/* Reset the whole system when the watchdog times out */
- 	mmio_write_32(SUNXI_WDOG0_CFG_REG, 1);
-@@ -249,20 +219,26 @@ static int sunxi_get_node_hw_state(u_register_t mpidr,
- 	return ((cpu_state & BIT(cpu)) != 0) ? HW_ON : HW_OFF;
- }
- 
--static plat_psci_ops_t sunxi_psci_ops = {
-+static const plat_psci_ops_t sunxi_psci_ops = {
- 	.cpu_standby			= sunxi_cpu_standby,
- 	.pwr_domain_on			= sunxi_pwr_domain_on,
- 	.pwr_domain_off			= sunxi_pwr_domain_off,
-+	.pwr_domain_suspend		= sunxi_pwr_domain_off,
- 	.pwr_domain_on_finish		= sunxi_pwr_domain_on_finish,
-+	.pwr_domain_suspend_finish	= sunxi_pwr_domain_on_finish,
- 	.system_off			= sunxi_system_off,
- 	.system_reset			= sunxi_system_reset,
- 	.validate_power_state		= sunxi_validate_power_state,
- 	.validate_ns_entrypoint		= sunxi_validate_ns_entrypoint,
-+	.get_sys_suspend_power_state	= sunxi_get_sys_suspend_power_state,
-+	.get_node_hw_state		= sunxi_get_node_hw_state,
- };
- 
- int plat_setup_psci_ops(uintptr_t sec_entrypoint,
- 			const plat_psci_ops_t **psci_ops)
- {
-+	bool scpi_available = false;
-+
- 	assert(psci_ops);
- 
- 	/* Program all CPU entry points. */
-@@ -292,16 +268,6 @@ int plat_setup_psci_ops(uintptr_t sec_entrypoint,
- 
- 	NOTICE("PSCI: System suspend is %s\n",
- 	       scpi_available ? "available via SCPI" : "unavailable");
--	if (scpi_available) {
--		/* Suspend is only available via SCPI. */
--		sunxi_psci_ops.pwr_domain_suspend = sunxi_pwr_domain_off;
--		sunxi_psci_ops.pwr_domain_suspend_finish = sunxi_pwr_domain_on_finish;
--		sunxi_psci_ops.get_sys_suspend_power_state = sunxi_get_sys_suspend_power_state;
--		sunxi_psci_ops.get_node_hw_state = sunxi_get_node_hw_state;
--	} else {
--		/* This is only needed when SCPI is unavailable. */
--		sunxi_psci_ops.pwr_domain_pwr_down_wfi = sunxi_pwr_down_wfi;
--	}
- 
- 	*psci_ops = &sunxi_psci_ops;
- 
-diff --git a/plat/allwinner/sun50i_a64/include/core_off_arisc.h b/plat/allwinner/sun50i_a64/include/core_off_arisc.h
-deleted file mode 100644
-index ae436ca1b..000000000
---- a/plat/allwinner/sun50i_a64/include/core_off_arisc.h
-+++ /dev/null
-@@ -1,39 +0,0 @@
--/*
-- * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
-- *
-- * SPDX-License-Identifier: BSD-3-Clause
-- */
--
--static uint32_t arisc_core_off[] = {
--	0x18600000, /* l.movhi	r3, <corenr>	*/
--	0x18000000, /* l.movhi	r0, 0x0		*/
--	0x19a00170, /* l.movhi	r13, 0x170	*/
--	0x84ad0030, /* l.lwz	r5, 0x30(r13)	*/
--	0xe0a51803, /* l.and	r5, r5, r3	*/
--	0xe4050000, /* l.sfeq	r5, r0		*/
--	0x13fffffd, /* l.bf	-12		*/
--
--	0xb8c30050, /* l.srli	r6, r3, 16	*/
--	0xbc060001, /* l.sfeqi	r6, 1		*/
--	0x10000005, /* l.bf	+20		*/
--	0x19a001f0, /* l.movhi	r13, 0x1f0	*/
--	0x84ad1500, /* l.lwz	r5, 0x1500(r13)	*/
--	0xe0a53004, /* l.or	r5, r5, r6	*/
--	0xd44d2d00, /* l.sw	0x1500(r13), r5	*/
--
--	0x84ad1c30, /* l.lwz	r5, 0x1c30(r13)	*/
--	0xacc6ffff, /* l.xori	r6, r6, -1	*/
--	0xe0a53003, /* l.and	r5, r5, r6	*/
--	0xd46d2c30, /* l.sw	0x1c30(r13), r5	*/
--
--	0xe0c3000f, /* l.ff1	r6, r3		*/
--	0x9cc6ffef, /* l.addi	r6, r6, -17	*/
--	0xb8c60002, /* l.slli	r6, r6, 2	*/
--	0xe0c66800, /* l.add	r6, r6, r13	*/
--	0xa8a000ff, /* l.ori	r5, r0, 0xff	*/
--	0xd4462d40, /* l.sw	0x1540(r6), r5	*/
--
--	0xd46d0400, /* l.sw	0x1c00(r13), r0	*/
--	0x03ffffff, /* l.j	-1		*/
--	0x15000000, /* l.nop			*/
--};
-diff --git a/plat/allwinner/sun50i_a64/sunxi_power.c b/plat/allwinner/sun50i_a64/sunxi_power.c
-index 5b7d76ae9..d0b53d4e4 100644
---- a/plat/allwinner/sun50i_a64/sunxi_power.c
-+++ b/plat/allwinner/sun50i_a64/sunxi_power.c
-@@ -12,76 +12,22 @@
- #include <common/debug.h>
- #include <drivers/allwinner/axp.h>
- #include <drivers/allwinner/sunxi_rsb.h>
--#include <lib/mmio.h>
- 
- #include <sunxi_def.h>
- #include <sunxi_mmap.h>
- #include <sunxi_private.h>
- 
--static enum pmic_type {
--	UNKNOWN,
--	GENERIC_H5,
--	GENERIC_A64,
--	REF_DESIGN_H5,	/* regulators controlled by GPIO pins on port L */
--	AXP803_RSB,	/* PMIC connected via RSB on most A64 boards */
--} pmic;
--
- #define AXP803_HW_ADDR	0x3a3
- #define AXP803_RT_ADDR	0x2d
- 
--/*
-- * On boards without a proper PMIC we struggle to turn off the system properly.
-- * Try to turn off as much off the system as we can, to reduce power
-- * consumption. This should be entered with only one core running and SMP
-- * disabled.
-- * This function only cares about peripherals.
-- */
--static void sunxi_turn_off_soc(uint16_t socid)
-+int axp_read(uint8_t reg)
- {
--	int i;
--
--	/** Turn off most peripherals, most importantly DRAM users. **/
--	/* Keep DRAM controller running for now. */
--	mmio_clrbits_32(SUNXI_CCU_BASE + 0x2c0, ~BIT_32(14));
--	mmio_clrbits_32(SUNXI_CCU_BASE + 0x60, ~BIT_32(14));
--	/* Contains msgbox (bit 21) and spinlock (bit 22) */
--	mmio_write_32(SUNXI_CCU_BASE + 0x2c4, 0);
--	mmio_write_32(SUNXI_CCU_BASE + 0x64, 0);
--	mmio_write_32(SUNXI_CCU_BASE + 0x2c8, 0);
--	/* Keep PIO controller running for now. */
--	mmio_clrbits_32(SUNXI_CCU_BASE + 0x68, ~(BIT_32(5)));
--	mmio_write_32(SUNXI_CCU_BASE + 0x2d0, 0);
--	/* Contains UART0 (bit 16) */
--	mmio_write_32(SUNXI_CCU_BASE + 0x2d8, 0);
--	mmio_write_32(SUNXI_CCU_BASE + 0x6c, 0);
--	mmio_write_32(SUNXI_CCU_BASE + 0x70, 0);
--
--	/** Turn off DRAM controller. **/
--	mmio_clrbits_32(SUNXI_CCU_BASE + 0x2c0, BIT_32(14));
--	mmio_clrbits_32(SUNXI_CCU_BASE + 0x60, BIT_32(14));
--
--	/** Migrate CPU and bus clocks away from the PLLs. **/
--	/* AHB1: use OSC24M/1, APB1 = AHB1 / 2 */
--	mmio_write_32(SUNXI_CCU_BASE + 0x54, 0x1000);
--	/* APB2: use OSC24M */
--	mmio_write_32(SUNXI_CCU_BASE + 0x58, 0x1000000);
--	/* AHB2: use AHB1 clock */
--	mmio_write_32(SUNXI_CCU_BASE + 0x5c, 0);
--	/* CPU: use OSC24M */
--	mmio_write_32(SUNXI_CCU_BASE + 0x50, 0x10000);
--
--	/** Turn off PLLs. **/
--	for (i = 0; i < 6; i++)
--		mmio_clrbits_32(SUNXI_CCU_BASE + i * 8, BIT(31));
--	switch (socid) {
--	case SUNXI_SOC_H5:
--		mmio_clrbits_32(SUNXI_CCU_BASE + 0x44, BIT(31));
--		break;
--	case SUNXI_SOC_A64:
--		mmio_clrbits_32(SUNXI_CCU_BASE + 0x2c, BIT(31));
--		mmio_clrbits_32(SUNXI_CCU_BASE + 0x4c, BIT(31));
--		break;
--	}
-+	return rsb_read(AXP803_RT_ADDR, reg);
-+}
-+
-+int axp_write(uint8_t reg, uint8_t val)
-+{
-+	return rsb_write(AXP803_RT_ADDR, reg, val);
- }
- 
- static int rsb_init(void)
-@@ -119,92 +65,24 @@ static int rsb_init(void)
- 	return axp_check_id();
- }
- 
--int axp_read(uint8_t reg)
--{
--	return rsb_read(AXP803_RT_ADDR, reg);
--}
--
--int axp_write(uint8_t reg, uint8_t val)
--{
--	return rsb_write(AXP803_RT_ADDR, reg, val);
--}
--
- int sunxi_pmic_setup(uint16_t socid, const void *fdt)
- {
- 	int ret;
- 
--	switch (socid) {
--	case SUNXI_SOC_H5:
--		NOTICE("PMIC: Assuming H5 reference regulator design\n");
--
--		pmic = REF_DESIGN_H5;
-+	if (socid != SUNXI_SOC_A64)
-+		return 0;
- 
--		break;
--	case SUNXI_SOC_A64:
--		pmic = GENERIC_A64;
-+	INFO("PMIC: Probing AXP803 on RSB\n");
- 
--		INFO("PMIC: Probing AXP803 on RSB\n");
--
--		ret = sunxi_init_platform_r_twi(socid, true);
--		if (ret)
--			return ret;
-+	ret = sunxi_init_platform_r_twi(socid, true);
-+	if (ret)
-+		return ret;
- 
--		ret = rsb_init();
--		if (ret)
--			return ret;
-+	ret = rsb_init();
-+	if (ret)
-+		return ret;
- 
--		pmic = AXP803_RSB;
--		axp_setup_regulators(fdt);
-+	axp_setup_regulators(fdt);
- 
--		break;
--	default:
--		return -ENODEV;
--	}
- 	return 0;
- }
--
--void sunxi_power_down(void)
--{
--	switch (pmic) {
--	case GENERIC_H5:
--		/* Turn off as many peripherals and clocks as we can. */
--		sunxi_turn_off_soc(SUNXI_SOC_H5);
--		/* Turn off the pin controller now. */
--		mmio_write_32(SUNXI_CCU_BASE + 0x68, 0);
--		break;
--	case GENERIC_A64:
--		/* Turn off as many peripherals and clocks as we can. */
--		sunxi_turn_off_soc(SUNXI_SOC_A64);
--		/* Turn off the pin controller now. */
--		mmio_write_32(SUNXI_CCU_BASE + 0x68, 0);
--		break;
--	case REF_DESIGN_H5:
--		sunxi_turn_off_soc(SUNXI_SOC_H5);
--
--		/*
--		 * Switch PL pins to power off the board:
--		 * - PL5 (VCC_IO) -> high
--		 * - PL8 (PWR-STB = CPU power supply) -> low
--		 * - PL9 (PWR-DRAM) ->low
--		 * - PL10 (power LED) -> low
--		 * Note: Clearing PL8 will reset the board, so keep it up.
--		 */
--		sunxi_set_gpio_out('L', 5, 1);
--		sunxi_set_gpio_out('L', 9, 0);
--		sunxi_set_gpio_out('L', 10, 0);
--
--		/* Turn off pin controller now. */
--		mmio_write_32(SUNXI_CCU_BASE + 0x68, 0);
--
--		break;
--	case AXP803_RSB:
--		/* (Re-)init RSB in case the rich OS has disabled it. */
--		sunxi_init_platform_r_twi(SUNXI_SOC_A64, true);
--		rsb_init();
--		axp_power_off();
--		break;
--	default:
--		break;
--	}
--
--}
-diff --git a/plat/allwinner/sun50i_h6/include/core_off_arisc.h b/plat/allwinner/sun50i_h6/include/core_off_arisc.h
-deleted file mode 100644
-index 63a5d8d96..000000000
---- a/plat/allwinner/sun50i_h6/include/core_off_arisc.h
-+++ /dev/null
-@@ -1,39 +0,0 @@
--/*
-- * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
-- *
-- * SPDX-License-Identifier: BSD-3-Clause
-- */
--
--static uint32_t arisc_core_off[] = {
--	0x18600000, /* l.movhi	r3, <corenr>	*/
--	0x18000000, /* l.movhi	r0, 0x0		*/
--	0x19a00901, /* l.movhi	r13, 0x901	*/
--	0x84ad0080, /* l.lwz	r5, 0x80(r13)	*/
--	0xe0a51803, /* l.and	r5, r5, r3	*/
--	0xe4050000, /* l.sfeq	r5, r0		*/
--	0x13fffffd, /* l.bf	-12		*/
--	0xb8c30050, /* l.srli	r6, r3, 16	*/
--
--	0xbc060001, /* l.sfeqi	r6, 1		*/
--	0x10000005, /* l.bf	+20		*/
--	0x19a00700, /* l.movhi	r13, 0x700	*/
--	0x84ad0444, /* l.lwz	r5, 0x0444(r13)	*/
--	0xe0a53004, /* l.or	r5, r5, r6	*/
--	0xd40d2c44, /* l.sw	0x0444(r13), r5	*/
--
--	0x84ad0440, /* l.lwz	r5, 0x0440(r13)	*/
--	0xacc6ffff, /* l.xori	r6, r6, -1	*/
--	0xe0a53003, /* l.and	r5, r5, r6	*/
--	0xd40d2c40, /* l.sw	0x0440(r13), r5	*/
--
--	0xe0c3000f, /* l.ff1	r6, r3		*/
--	0x9cc6ffef, /* l.addi	r6, r6, -17	*/
--	0xb8c60002, /* l.slli	r6, r6, 2	*/
--	0xe0c66800, /* l.add	r6, r6, r13	*/
--	0xa8a000ff, /* l.ori	r5, r0, 0xff	*/
--	0xd4062c50, /* l.sw	0x0450(r6), r5	*/
--
--	0xd40d0400, /* l.sw	0x0400(r13), r0	*/
--	0x03ffffff, /* l.j	-1		*/
--	0x15000000, /* l.nop			*/
--};
-diff --git a/plat/allwinner/sun50i_h6/sunxi_power.c b/plat/allwinner/sun50i_h6/sunxi_power.c
-index 443015bac..f1ab84fc4 100644
---- a/plat/allwinner/sun50i_h6/sunxi_power.c
-+++ b/plat/allwinner/sun50i_h6/sunxi_power.c
-@@ -6,14 +6,10 @@
-  */
- 
- #include <errno.h>
--#include <string.h>
- 
--#include <arch_helpers.h>
- #include <common/debug.h>
- #include <drivers/allwinner/axp.h>
--#include <drivers/delay_timer.h>
- #include <drivers/mentor/mi2cv.h>
--#include <lib/mmio.h>
- 
- #include <sunxi_def.h>
- #include <sunxi_mmap.h>
-@@ -21,11 +17,6 @@
- 
- #define AXP805_ADDR	0x36
- 
--static enum pmic_type {
--	UNKNOWN,
--	AXP805,
--} pmic;
--
- int axp_read(uint8_t reg)
- {
- 	uint8_t val;
-@@ -86,23 +77,7 @@ int sunxi_pmic_setup(uint16_t socid, const void *fdt)
- 	if (ret)
- 		return ret;
- 
--	pmic = AXP805;
- 	axp_setup_regulators(fdt);
- 
- 	return 0;
- }
--
--void sunxi_power_down(void)
--{
--	switch (pmic) {
--	case AXP805:
--		/* Re-initialise after rich OS might have used it. */
--		sunxi_init_platform_r_twi(SUNXI_SOC_H6, false);
--		/* initialise mi2cv driver */
--		i2c_init((void *)SUNXI_R_I2C_BASE);
--		axp_power_off();
--		break;
--	default:
--		break;
--	}
--}
--- 
-2.28.0
-
diff --git a/srcpkgs/pinephone-uboot/patches/armtf/0004-DO-NOT-MERGE-allwinner-Enable-UART-at-runtime.patch b/srcpkgs/pinephone-uboot/patches/armtf/0004-DO-NOT-MERGE-allwinner-Enable-UART-at-runtime.patch
deleted file mode 100644
index ad65b52201f3..000000000000
--- a/srcpkgs/pinephone-uboot/patches/armtf/0004-DO-NOT-MERGE-allwinner-Enable-UART-at-runtime.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c9336b68556d0af79bbceeaf19abb21ec417a0a9 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sun, 21 Oct 2018 12:43:58 -0500
-Subject: [PATCH 4/5] [DO NOT MERGE] allwinner: Enable UART at runtime
-
-Signed-off-by: Samuel Holland <samuel@sholland.org>
-Change-Id: Id186d6001fa6c188589bd9e9582c549000c1a423
----
- plat/allwinner/common/sunxi_bl31_setup.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/plat/allwinner/common/sunxi_bl31_setup.c b/plat/allwinner/common/sunxi_bl31_setup.c
-index fe511d02c..45023ad81 100644
---- a/plat/allwinner/common/sunxi_bl31_setup.c
-+++ b/plat/allwinner/common/sunxi_bl31_setup.c
-@@ -82,6 +82,10 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
- 	/* Initialize the debug console as soon as possible */
- 	console_16550_register(SUNXI_UART0_BASE, SUNXI_UART0_CLK_IN_HZ,
- 			       SUNXI_UART0_BAUDRATE, &console);
-+	console_set_scope(&console,
-+			  CONSOLE_FLAG_BOOT |
-+			  CONSOLE_FLAG_RUNTIME |
-+			  CONSOLE_FLAG_CRASH);
- 
- #ifdef BL32_BASE
- 	/* Populate entry point information for BL32 */
--- 
-2.28.0
-
diff --git a/srcpkgs/pinephone-uboot/patches/armtf/0005-DO-NOT-MERGE-allwinner-Increase-msgbox-timeout.patch b/srcpkgs/pinephone-uboot/patches/armtf/0005-DO-NOT-MERGE-allwinner-Increase-msgbox-timeout.patch
deleted file mode 100644
index 011918c59083..000000000000
--- a/srcpkgs/pinephone-uboot/patches/armtf/0005-DO-NOT-MERGE-allwinner-Increase-msgbox-timeout.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From fc9958d8e661ebb5842e68f238eaefb0fb0040c9 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Thu, 7 May 2020 18:55:06 -0500
-Subject: [PATCH 5/5] [DO NOT MERGE] allwinner: Increase msgbox timeout
-
-Signed-off-by: Samuel Holland <samuel@sholland.org>
-Change-Id: Ibf5157e23bfa91323c39387b643b93861451d29b
----
- drivers/allwinner/sunxi_msgbox.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/allwinner/sunxi_msgbox.c b/drivers/allwinner/sunxi_msgbox.c
-index cc4a6ffcb..3bd909300 100644
---- a/drivers/allwinner/sunxi_msgbox.c
-+++ b/drivers/allwinner/sunxi_msgbox.c
-@@ -36,7 +36,7 @@
- #define MHU_MAX_SLOT_ID		31
- 
- #define MHU_TIMEOUT_DELAY	10
--#define MHU_TIMEOUT_ITERS	10000
-+#define MHU_TIMEOUT_ITERS	100000
- 
- static DEFINE_BAKERY_LOCK(mhu_secure_message_lock);
- 
--- 
-2.28.0
-
diff --git a/srcpkgs/pinephone-uboot/patches/armtf/0006-ATF-set-fno-stack-protector.patch b/srcpkgs/pinephone-uboot/patches/armtf/0006-ATF-set-fno-stack-protector.patch
deleted file mode 100644
index df3bb891630d..000000000000
--- a/srcpkgs/pinephone-uboot/patches/armtf/0006-ATF-set-fno-stack-protector.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile	2020-06-16 16:55:36.000000000 +0700
-+++ b/Makefile	2020-06-17 12:18:28.612524000 +0700
-@@ -353,6 +353,7 @@
- 				-ffreestanding -Wa,--fatal-warnings
- TF_CFLAGS		+=	$(CPPFLAGS) $(TF_CFLAGS_$(ARCH))		\
- 				-ffunction-sections -fdata-sections		\
-+				-fno-stack-protector				\
- 				-ffreestanding -fno-builtin -fno-common		\
- 				-Os -std=gnu99
- 
diff --git a/srcpkgs/pinephone-uboot/template b/srcpkgs/pinephone-uboot/template
index 2073c910cb5c..aaee84f998b7 100644
--- a/srcpkgs/pinephone-uboot/template
+++ b/srcpkgs/pinephone-uboot/template
@@ -1,7 +1,7 @@
 # Template file for 'pinephone-uboot'
 pkgname=pinephone-uboot
 version=0.0.20200917
-revision=1
+revision=2
 archs="aarch64*"
 create_wrksrc=yes
 hostmakedepends="flex cross-or1k-none-elf-gcc dtc python3 python3-devel bc swig"
@@ -13,26 +13,20 @@ license="GPL-2.0-only, BSD-3-Clause"
 homepage="http://www.denx.de/wiki/U-Boot/WebHome"
 
 _tag_uboot=crust-2020-09-17
-_commit_armtf=2bdb4611ad6efdb3da2ff0d2de7fee4c43e95aeb
-_commit_crust=e63106c70bc4ddfa3575e4f1f3667de0795252a8
+_ver_armtf=2.4
+_ver_crust=0.3
 
 _uboot=u-boot-$_tag_uboot
-_armtf=arm-trusted-firmware-$_commit_armtf
-_crust=crust-$_commit_crust
+_armtf=arm-trusted-firmware-$_ver_armtf
+_crust=crust-$_ver_crust
 
 distfiles="https://gitlab.com/pine64-org/u-boot/-/archive/${_tag_uboot}/${_uboot}.tar.gz
- https://github.com/ARM-software/arm-trusted-firmware/archive/${_commit_armtf}.tar.gz
- https://github.com/crust-firmware/crust/archive/${_commit_crust}.tar.gz"
+ https://github.com/ARM-software/arm-trusted-firmware/archive/v${_ver_armtf}.tar.gz
+ https://github.com/crust-firmware/crust/archive/v${_ver_crust}.tar.gz"
 
 checksum="395e61790d4877e11c470445dfee834a017a4b5df5f7ee34ebcaa125713150dc
- 48291b621a4bc38c7956964407130edd2d02d8b3789fce4193ac1b747a5b37db
- 6fc2d68725a78b1ca6e7c6602286fc2aa2ddcdea28e83a85f6b988fcc5a513b8"
-
-do_patch() {
-	for _patch in $PATCHESDIR/armtf/*.patch; do
-		patch -d $_armtf -slNp1 -i $_patch
-	done
-}
+ 4bfda9fdbe5022f2e88ad3344165f7d38a8ae4a0e2d91d44d9a1603425cc642d
+ cf02f227b909f40bcfc33a94088fce12356dab41bc7459c22b7b333b305d4c72"
 
 # Note about _cross/_hostcc
 #
@@ -45,14 +39,13 @@ do_patch() {
 
 _or1k="CROSS_COMPILE=or1k-none-elf-"
 
+if [ "$CROSS_BUILD" ]; then
+	_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	_hostcc="HOST_COMPILE=${XBPS_CROSS_TRIPLET}-"
+fi
+
 do_configure() {
 	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-	local _cross _hostcc
-
-	if [ "$CROSS_BUILD" ]; then
-		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-		_hostcc="HOST_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
 
 	make -C $_crust $_hostcc $_or1k pinephone_defconfig
 	make -C $_uboot $_cross pinephone_defconfig
@@ -61,12 +54,6 @@ do_configure() {
 
 do_build() {
 	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-	local _cross _hostcc
-
-	if [ "$CROSS_BUILD" ]; then
-		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-		_hostcc="HOST_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
 
 	make -C $_armtf $_cross PLAT=sun50i_a64 DEBUG=1 $makejobs bl31
 	make -C $_crust $_hostcc $_or1k $makejobs scp

From 5420db88d8d800f01058ea7143f1b4563d66381a Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 5 Feb 2021 13:54:55 +0100
Subject: [PATCH 1148/3482] moserial: update to 3.0.15.

---
 srcpkgs/moserial/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/moserial/template b/srcpkgs/moserial/template
index c82955bcd707..aaf829fafdd8 100644
--- a/srcpkgs/moserial/template
+++ b/srcpkgs/moserial/template
@@ -1,6 +1,6 @@
 # Template file for 'moserial'
 pkgname=moserial
-version=3.0.12
+version=3.0.15
 revision=1
 _majver=3.0
 build_style=gnu-configure
@@ -11,4 +11,4 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/Moserial"
 distfiles="${GNOME_SITE}/moserial/${_majver}/moserial-${version}.tar.xz"
-checksum=de2448cd37bb64c43f5533913739cbfc2fe3261f6c6a5ea289f9c200f1e7fcc9
+checksum=cf1342eb4192178c90a42a63e9f9cc580394238ee790192273173f981bb7e8d5

From 8967edea4cfef9127f899c74a062201801c70f87 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Thu, 4 Feb 2021 18:33:54 +0100
Subject: [PATCH 1149/3482] bcache-tools: update to 1.1.

---
 srcpkgs/bcache-tools/patches/crc64.patch | 11 -----------
 srcpkgs/bcache-tools/template            | 13 +++++++------
 srcpkgs/bcache-tools/update              |  1 +
 3 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/bcache-tools/patches/crc64.patch
 create mode 100644 srcpkgs/bcache-tools/update

diff --git a/srcpkgs/bcache-tools/patches/crc64.patch b/srcpkgs/bcache-tools/patches/crc64.patch
deleted file mode 100644
index 604d2a27c836..000000000000
--- a/srcpkgs/bcache-tools/patches/crc64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bcache.c
-+++ bcache.c
-@@ -115,7 +115,7 @@ static const uint64_t crc_table[256] = {
-    0x9AFCE626CE85B507ULL
- };
- 
--inline uint64_t crc64(const void *_data, size_t len)
-+uint64_t crc64(const void *_data, size_t len)
- {
-    uint64_t crc = 0xFFFFFFFFFFFFFFFFULL;
-    const unsigned char *data = _data;
diff --git a/srcpkgs/bcache-tools/template b/srcpkgs/bcache-tools/template
index a3619e5bf22a..d6aba8b2a4b6 100644
--- a/srcpkgs/bcache-tools/template
+++ b/srcpkgs/bcache-tools/template
@@ -1,17 +1,18 @@
 # Template file for 'bcache-tools'
 pkgname=bcache-tools
-version=1.0.8
+version=1.1
 revision=1
 build_style=gnu-makefile
+make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libblkid-devel"
+makedepends="libuuid-devel libblkid-devel libsmartcols-devel"
 short_desc="User space tools for the bcache hybrid storage system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="GPL-2.0-only"
 homepage="https://bcache.evilpiepirate.org/"
-distfiles="https://github.com/g2p/${pkgname}/archive/v${version}.tar.gz"
-checksum=d56923936f37287efc57a46315679102ef2c86cd0be5874590320acd48c1201c
-CFLAGS="-I$XBPS_CROSS_BASE/usr/include/blkid"
+distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/snapshot/bcache-tools-${version}.tar.gz"
+checksum=d1c92274ae03b414dd1a05277bf89dd2a8395496c692e3b143d9e6112d3421f8
+python_version=3
 
 pre_install() {
 	vmkdir usr/bin
diff --git a/srcpkgs/bcache-tools/update b/srcpkgs/bcache-tools/update
new file mode 100644
index 000000000000..70ace81aa251
--- /dev/null
+++ b/srcpkgs/bcache-tools/update
@@ -0,0 +1 @@
+site="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/"

From 0842bc01a604b11d309b8bba7a43203b6909a48f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Feb 2021 16:47:01 -0300
Subject: [PATCH 1150/3482] libblockdev: update to 2.25.

Also add makedepends to devel package, because it may use the headers of
some of them (like device-mapper-devel).
---
 srcpkgs/libblockdev/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libblockdev/template b/srcpkgs/libblockdev/template
index 93fea3bec4a3..761668125905 100644
--- a/srcpkgs/libblockdev/template
+++ b/srcpkgs/libblockdev/template
@@ -1,7 +1,7 @@
 # Template file for 'libblockdev'
 pkgname=libblockdev
-version=2.24
-revision=2
+version=2.25
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="cryptsetup-devel device-mapper-devel dmraid-devel libbytesize-devel
@@ -13,7 +13,7 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/storaged-project/libblockdev"
 changelog="https://raw.githubusercontent.com/storaged-project/libblockdev/master/NEWS.rst"
 distfiles="https://github.com/storaged-project/libblockdev/releases/download/${version}-1/libblockdev-${version}.tar.gz"
-checksum=dc207c70dbef52c818a8abbcb6b8e298a6b63c0b78a5e1f2773b5f7b89300773
+checksum=555aa42a2db39649ad83253bdc902ab5bd63d39c123e0c8055c4de7fe7571668
 conf_files="/etc/libblockdev/conf.d/10-lvm-dbus.cfg
  /etc/libblockdev/conf.d/00-default.cfg"
 
@@ -28,7 +28,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 libblockdev-devel_package() {
-	depends="libblockdev-${version}_${revision} glib-devel"
+	depends="libblockdev>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 6a0203361f881bc0ebb8540694fe316a485b3986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Feb 2021 16:48:03 -0300
Subject: [PATCH 1151/3482] udisks2: update to 2.9.2.

---
 srcpkgs/udisks2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/udisks2/template b/srcpkgs/udisks2/template
index 3fd8e2282bf2..e03c48c54967 100644
--- a/srcpkgs/udisks2/template
+++ b/srcpkgs/udisks2/template
@@ -1,6 +1,6 @@
 # Template file for 'udisks2'
 pkgname=udisks2
-version=2.9.1
+version=2.9.2
 revision=1
 wrksrc="udisks-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/udisks"
 changelog="https://raw.githubusercontent.com/storaged-project/udisks/master/NEWS"
 distfiles="https://github.com/storaged-project/udisks/releases/download/udisks-${version}/udisks-${version}.tar.bz2"
-checksum=da25c348edebefd5614c727fd6a7c286ba114479aa3279dcd5df274da6f28646
+checksum=bda6f9d7edc632c57e55862731a8ffeff2413fa4346708a22bf31ed72b0fe058
 make_dirs="/var/lib/udisks2 0750 root root"
 conf_files="/etc/udisks2/udisks2.conf"
 

From 66ce48b33dc4f204cfc41c89a37cc7d4060a586d Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 12:26:38 +0000
Subject: [PATCH 1152/3482] gnome-passbook: update to 0.8.

---
 srcpkgs/gnome-passbook/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gnome-passbook/template b/srcpkgs/gnome-passbook/template
index 4d3869cdd4e0..c0adaedb4d99 100644
--- a/srcpkgs/gnome-passbook/template
+++ b/srcpkgs/gnome-passbook/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-passbook'
 pkgname=gnome-passbook
-version=0.1
-revision=3
-_release_hash=0a227cfdf706f4bfcc0b782026f1aeb2
+version=0.8
+revision=1
+_release_hash=5fea4e4fc19f1732d3a5270bc43eb8e9
 wrksrc="passbook-${version}"
 build_style=meson
 hostmakedepends="glib-devel pkg-config"
 makedepends="gobject-introspection gtk+3-devel libglib-devel"
-short_desc="A password manager for GNOME"
+short_desc="Password manager for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Passbook"
 distfiles="https://gitlab.gnome.org/gnumdk/passbook/uploads/${_release_hash}/passbook-${version}.tar.xz"
-checksum=45821f50bcee5d94e3a24e2f892c1bdc645f4a8a795055f2624e59ccc92211d5
+checksum=55b5aaa5a61aa3b026de0491e1ac33ca6094208f88031f547f869578b5ff8ad9

From 3e847ba21ead1c2f009286bc1db9540fb524033b Mon Sep 17 00:00:00 2001
From: Ulf <ulf@voidlinux.home>
Date: Sun, 31 Jan 2021 13:34:53 +0000
Subject: [PATCH 1153/3482] python3-chromecast: update to 8.0.0.

---
 srcpkgs/python3-chromecast/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-chromecast/template b/srcpkgs/python3-chromecast/template
index c018f118050e..8e274036181b 100644
--- a/srcpkgs/python3-chromecast/template
+++ b/srcpkgs/python3-chromecast/template
@@ -1,17 +1,18 @@
 # Template file for 'python3-chromecast'
 pkgname=python3-chromecast
-version=7.7.2
+version=8.0.0
 revision=1
 wrksrc="pychromecast-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-protobuf python3-zeroconf python3-casttube"
 depends="python3-protobuf python3-zeroconf python3-casttube"
+checkdepends="python3-flake8 python3-pylint black"
 short_desc="Python3 library to communicate with Google Chromecast"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="MIT"
 homepage="https://github.com/home-assistant-libs/pychromecast"
 distfiles="https://github.com/home-assistant-libs/pychromecast/archive/${version}.tar.gz"
-checksum=98aef480168163c26405c16e69458829d7ec62ac9129c0d9c8f2e86a3f83a10e
+checksum=b3bbb0e96ece7dbdb301434865c33360c38ccd013c32e5c2fa629e471e6891c5
 
 post_install() {
 	vlicense LICENSE

From 0603d066c45e63d3dbb369f98feef3e96b8129aa Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 11:45:00 +0000
Subject: [PATCH 1154/3482] gnome-getting-started-docs: update to 3.38.0.

---
 srcpkgs/gnome-getting-started-docs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template
index 18f55aa79095..515c8f38ba84 100644
--- a/srcpkgs/gnome-getting-started-docs/template
+++ b/srcpkgs/gnome-getting-started-docs/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-getting-started-docs'
 pkgname=gnome-getting-started-docs
-version=3.36.2
-revision=2
+version=3.38.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
 short_desc="Getting Started documentation for GNOME"
@@ -10,4 +10,4 @@ license="CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs"
 #changelog="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0494b8913a946b6450536e120c154abd29238ebba2f52734592b1f645e521dc6
+checksum=7ce3cf6f97c4243c5d756f7ea2aae3b568cff6ddb3e562dbe8194b4b22712c3a

From efcadccf674515e99daf6221798189b5d3e6c53a Mon Sep 17 00:00:00 2001
From: KeepBotting <branon.mcclellan@gmail.com>
Date: Mon, 1 Feb 2021 07:59:51 -0500
Subject: [PATCH 1155/3482] mymcplus: update to 3.0.4

Fix tests.

Closes: #28382 [via git-merge-pr]
---
 srcpkgs/mymcplus/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mymcplus/template b/srcpkgs/mymcplus/template
index 84b9f256abde..ebcb44ffc8f2 100644
--- a/srcpkgs/mymcplus/template
+++ b/srcpkgs/mymcplus/template
@@ -1,13 +1,15 @@
 # Template file for 'mymcplus'
 pkgname=mymcplus
-version=3.0.3
-revision=2
+version=3.0.4
+revision=1
+wrksrc=${pkgname}-v${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="wxPython4 python3-PyOpenGL"
+checkdepends="$depends python3-pytest"
 short_desc="PlayStation 2 memory card manager"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/thestr4ng3r/mymcplus"
+homepage="https://git.sr.ht/~thestr4ng3r/mymcplus"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=9cbbe0162c19b386524f17db7613968cedea58d75fe3f6b307789d4953f6c71f
+checksum=f94b485f83590b59b87fa5fbe8311d1eb0f03490edb60fd64aadbdbea0588472

From 4ad45b9cb30762e703757db13e21d7c68c16903f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 5 Feb 2021 16:44:07 +0700
Subject: [PATCH 1156/3482] build-style/perl-module: put . into @INC

Fixing those build failure:

- perl-Crypt-DH
- perl-Curses-UI
- perl-Data-MessagePack
- perl-Encode-HanExtra
- perl-Gtk2-Notify
- perl-Plack-Middleware-Deflater
- perl-Text-Markdown
- perl-WWW-Curl
---
 common/build-style/perl-module.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/build-style/perl-module.sh b/common/build-style/perl-module.sh
index c2d5b8ddecae..5b0f0ccde825 100644
--- a/common/build-style/perl-module.sh
+++ b/common/build-style/perl-module.sh
@@ -45,7 +45,7 @@ do_configure() {
 			CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include" \
 			LDFLAGS="$LDFLAGS -L${XBPS_CROSS_BASE}/usr/lib -lperl" \
 			LDDLFLAGS="-shared $CFLAGS -L${XBPS_CROSS_BASE}/usr/lib" \
-			perl Makefile.PL ${configure_args} INSTALLDIRS=vendor
+			perl -I. Makefile.PL ${configure_args} INSTALLDIRS=vendor
 	fi
 
 	for i in ${perl_configure_dirs}; do
@@ -57,7 +57,7 @@ do_configure() {
 				CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include" \
 				LDFLAGS="$LDFLAGS -L${XBPS_CROSS_BASE}/usr/lib -lperl" \
 				LDDLFLAGS="-shared $CFLAGS -L${XBPS_CROSS_BASE}/usr/lib -lperl" \
-				perl Makefile.PL ${make_build_args} INSTALLDIRS=vendor
+				perl -I. Makefile.PL ${make_build_args} INSTALLDIRS=vendor
 		else
 			msg_error "*** ERROR: couldn't find $perlmkf, aborting **\n"
 		fi

From ce6e004edf1ad012a3f7562d839525a50eedd5e8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 6 Feb 2021 07:00:17 +0100
Subject: [PATCH 1157/3482] libkdcraw5: update to 20.12.2.

---
 srcpkgs/libkdcraw5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 78022b189d57..aac92b85ab60 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=20.12.1
+version=20.12.2
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=031640f7abf80b306cbe697a7abbea4b69abeeb5aee12d8712c274e519f372ee
+checksum=d561f6e6aab78768c210d5473f05daa43df1711f745671f9ff3ee1ec0e02fcc1
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 2c85fd1f3b1b25a5cead1ef30f9899448c714b1f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 6 Feb 2021 07:29:24 +0100
Subject: [PATCH 1158/3482] gwenview: update to 20.12.2.

---
 srcpkgs/gwenview/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index ce10e92a6698..8233dedac130 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=61696a9e1eb3c128724cec07dafb70cf609482984c95d3741724a31543be5176
+checksum=b6eca42c1c627fda083a8db32cbf785e1778e937af4b65a1d912d9b8ad942633
 patch_args="-Np1"
 
 pre_configure() {

From 5cbd3a7d767af69b17595b3c32f1cff0ede87673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 6 Feb 2021 13:59:54 +0700
Subject: [PATCH 1159/3482] flashrom: fix build for make 4.3, gcc 10

---
 srcpkgs/flashrom/template | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/flashrom/template b/srcpkgs/flashrom/template
index 2128b8e99b00..7c1d30c99a03 100644
--- a/srcpkgs/flashrom/template
+++ b/srcpkgs/flashrom/template
@@ -12,7 +12,23 @@ homepage="https://www.flashrom.org"
 distfiles=https://github.com/flashrom/flashrom/archive/v$version.tar.gz
 checksum=a5bac412cefb87bb426912fed46ccc38799d088a9b92dbe7bac38c5df016d9b2
 
-pre_build() {
-	vsed -i "s:sbin:bin:g" Makefile
-	vsed -i 's/u_int\([0-9]*\)_t/uint\1_t/' $(find -name '*.[ch]')
+post_patch() {
+	# The Makefile detection is fragile!!!
+	# It doesn't defend against __attribute__("something")
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64* | i686*) _arch=x86 ;;
+		aarch64* | arm*) _arch=arm ;;
+		ppc*)            _arch=ppc ;;
+		mips*)           _arch=mips ;;
+		*) msg_error "Unknown arch\n" ;;
+	esac
+	case "$XBPS_TARGET_ENDIAN" in
+		be) _endian=big ;;
+		le) _endian=little ;;
+	esac
+	vsed -i -e 's/^override TARGET_OS :=.*/TARGET_OS := Linux/' \
+		-e "s/^override ARCH :=.*/ARCH := $_arch/" \
+		-e "s/^override ENDIAN :=.*/ENDIAN := $_endian/" \
+		-e 's/sbin/bin/' \
+		Makefile
 }

From c7884679688904e3bb45d66d6c6c1f7e417665f2 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Fri, 5 Feb 2021 00:56:53 -0800
Subject: [PATCH 1160/3482] vboot-utils: Add update check

---
 srcpkgs/vboot-utils/template | 2 +-
 srcpkgs/vboot-utils/update   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/vboot-utils/update

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 46871f18f257..610689759642 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config git"
 makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git"
 CFLAGS='-D_GNU_SOURCE -Wno-error -fcommon'
 
diff --git a/srcpkgs/vboot-utils/update b/srcpkgs/vboot-utils/update
new file mode 100644
index 000000000000..e360ec80b5c0
--- /dev/null
+++ b/srcpkgs/vboot-utils/update
@@ -0,0 +1,3 @@
+site="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git/+refs?format=TEXT"
+pattern='refs/heads/release-R\K[\d]+-[\d]+'
+version=${version//./-}

From b50bc759d9f8a8287586c7e38e1db406e0557c48 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 6 Feb 2021 14:15:20 +0100
Subject: [PATCH 1161/3482] libgcrypt: disable ppc crypto on ppcle as it fails
 to build

---
 srcpkgs/libgcrypt/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index de41e5db73d7..9426d1e9825c 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -16,6 +16,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" ac_cv_sys_symbol_underscore=no"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	ppcle*) configure_args+=" --disable-ppc-crypto-support";;
+esac
+
 post_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 	armv[5-6]*)

From 9c49d0bd35619535cf1505aa9d05e4a563b4404b Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 6 Feb 2021 14:15:37 +0100
Subject: [PATCH 1162/3482] jo: update to 1.4.

---
 srcpkgs/jo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/jo/template b/srcpkgs/jo/template
index 112044e2b3e7..8f59903e03f2 100644
--- a/srcpkgs/jo/template
+++ b/srcpkgs/jo/template
@@ -1,7 +1,7 @@
 # Template file for 'jo'
 pkgname=jo
-version=1.3
-revision=2
+version=1.4
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 short_desc="Small utility to create JSON objects"
@@ -9,7 +9,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/jpmens/jo"
 distfiles="https://github.com/jpmens/jo/releases/download/${version}/jo-${version}.tar.gz"
-checksum=de25c95671a3b392c6bcaba0b15d48eb8e2435508008c29477982d2d2f5ade64
+checksum=24c64d2eb863900947f58f32b502c95fec8f086105fd31151b91f54b7b5256a2
 
 pre_configure() {
 	autoreconf -fi

From 3045f934d43201a7d25fc3ed5b5b755e6340aa54 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 31 Jan 2021 22:09:31 +0100
Subject: [PATCH 1163/3482] zulucrypt: update to 6.0.0.

---
 .../patches/30-missing-PATH_MAX.patch         | 23 -------------------
 srcpkgs/zulucrypt/template                    |  6 ++---
 2 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 srcpkgs/zulucrypt/patches/30-missing-PATH_MAX.patch

diff --git a/srcpkgs/zulucrypt/patches/30-missing-PATH_MAX.patch b/srcpkgs/zulucrypt/patches/30-missing-PATH_MAX.patch
deleted file mode 100644
index 395ebb7d9624..000000000000
--- a/srcpkgs/zulucrypt/patches/30-missing-PATH_MAX.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# patch missing PATH_MAX constant for musl-builds
-# source: https://stackoverflow.com/questions/9449241/where-is-path-max-defined-in-linux
---- zuluCrypt-cli/bin/volumes.c
-+++ zuluCrypt-cli/bin/volumes.c
-@@ -33,6 +33,7 @@
- #include <blkid/blkid.h>
- 
- #include "udev_support.h"
-+#include <linux/limits.h>
- 
- /*
-  * NOTE: This source file was previously named "partition.c"
-
---- zuluSafe/zuluSafe.c
-+++ zuluSafe/zuluSafe.c
-@@ -34,6 +34,7 @@
- 
- #include "lxqtwallet.h"
- #include "version.h"
-+#include <linux/limits.h>
- 
- #define PASSWORD_SIZE         512
- #define WALLET_NAME_SIZE      512
diff --git a/srcpkgs/zulucrypt/template b/srcpkgs/zulucrypt/template
index 0819105e5bad..c1f09fb9fc1d 100644
--- a/srcpkgs/zulucrypt/template
+++ b/srcpkgs/zulucrypt/template
@@ -1,10 +1,10 @@
 # Template file for 'zulucrypt'
 pkgname=zulucrypt
-version=5.7.1
+version=6.0.0
 revision=1
 wrksrc="zuluCrypt-${version}"
 build_style=cmake
-configure_args="-DINTERNAL_ZULUPLAY=false -DQT5=true
+configure_args="-DINTERNAL_ZULUPLAY=true -DQT5=true
  -DUDEVSUPPORT=$(vopt_if udev true false)
  -DUSE_POLKIT=$(vopt_if polkit true false)
  -DHOMEMOUNTPREFIX=$(vopt_if homemount true false)"
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://mhogomchungu.github.io/zuluCrypt"
 changelog="https://raw.githubusercontent.com/mhogomchungu/zuluCrypt/master/changelog"
 distfiles="https://github.com/mhogomchungu/zuluCrypt/archive/${version}.tar.gz"
-checksum=39bd7f5bd31514636f617f670e451e3313be1ba1094f7f55532a086b6aaf0096
+checksum=f1bc599446e6dc82c6af16672fcbd4a88679d3b3dba2cfa3921ac514cb211add
 
 #https://github.com/mhogomchungu/zuluCrypt/blob/e138cc4459545b2e0f729814791a045c31b63014/BUILD_INSTRUCTIONS
 build_options="udev kde gnome pwquality polkit homemount"

From 46ab8b16d1b22e88fa0586bd8744318df7d0caa4 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 31 Jan 2021 22:10:42 +0100
Subject: [PATCH 1164/3482] zuluplay: remove package

zuluplay seems maintained in zulucrypt sources, as zulucrypt cmake
complains about outdated zuluplay while the actual repo has no tag.
The only consumer is zulucrypt, which now uses the bundled zuluplay now.
---
 common/shlibs                     |  1 -
 srcpkgs/removed-packages/template |  4 +++-
 srcpkgs/zuluplay-devel            |  1 -
 srcpkgs/zuluplay/template         | 23 -----------------------
 4 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 120000 srcpkgs/zuluplay-devel
 delete mode 100644 srcpkgs/zuluplay/template

diff --git a/common/shlibs b/common/shlibs
index 9c7ca7b2c51c..d3909e6babf6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3191,7 +3191,6 @@ libKF5IdentityManagement.so.5 kidentitymanagement-17.12.0_1
 libKChart.so.2 kdiagram-2.6.0_1
 libKGantt.so.2 kdiagram-2.6.0_1
 libscrypt.so.0 libscrypt-1.21_1
-libzuluplay.so.1.1 zuluplay-1.1_1
 libzuluCryptPluginManager.so.1.0.0 zulucrypt-5.2.0_1
 libzuluCrypt-exe.so.1.2.0 zulucrypt-5.2.0_1
 libzuluCrypt.so.1.2.0 zulucrypt-5.2.0_1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7862526a37d4..013ec3f3dcac 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=22
+revision=23
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -230,6 +230,8 @@ replaces="
  nvidia340-dkms<=340.108_4
  nvidia340-opencl<=340.108_4
  nvidia340-libs<=340.108_4
+ zuluplay<=1.1_1
+ zuluplay-devel<=1.1_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/zuluplay-devel b/srcpkgs/zuluplay-devel
deleted file mode 120000
index b059d793ee59..000000000000
--- a/srcpkgs/zuluplay-devel
+++ /dev/null
@@ -1 +0,0 @@
-zuluplay
\ No newline at end of file
diff --git a/srcpkgs/zuluplay/template b/srcpkgs/zuluplay/template
deleted file mode 100644
index dc84ce98578f..000000000000
--- a/srcpkgs/zuluplay/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'zuluplay'
-pkgname=zuluplay
-version=1.1
-revision=1
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="device-mapper-devel libgcrypt-devel"
-short_desc="Zulucrypt's fork of tcplay"
-maintainer="Piraty <piraty1@inbox.ru>"
-license="GPL-3"
-homepage="https://github.com/mhogomchungu/zuluplay"
-distfiles="https://github.com/mhogomchungu/${pkgname}/archive/${version}.tar.gz"
-checksum=4223fea60bd470b122dac7722d726785219c0e0a886f492ab4c0699c14ffd70d
-
-zuluplay-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
-	}
-}

From 473e122ca49f4d1a8a2a37eac3269bb4aaec3c0b Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Sat, 6 Feb 2021 12:25:39 +0700
Subject: [PATCH 1165/3482] vivaldi: update to 3.6.2165.36

---
 srcpkgs/vivaldi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 4380b1de8bf0..3a1d3388837b 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=3.5.2115.87
+version=3.6.2165.36
 revision=1
 _release=1
 archs="i686 x86_64"
@@ -18,10 +18,10 @@ nostrip=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_debarch=amd64
-	checksum=c02ea30b222a695b2fae5c7e2c62b51876ef3171cccde18e59a2b569a4161c54
+	checksum=0840172d85bcb0218f3e3f90d548604f0aee219964b44fc944e9e9e2dffbfdf1
 else
 	_debarch=i386
-	checksum=9c8ac7bd04efbef76b27f82fc6c754a1743ac5b5ba012810e77e2d16ff1a463a
+	checksum=3b8f03111c2ed6b596cd00171684ec3c7803cc6783dc1673ebe36e81909aeff2
 fi
 
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb"

From d1dd84c43cf2f330fda7607d9d9af7186105f6a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:31:24 +0100
Subject: [PATCH 1166/3482] zulucrypt: remove zuluplay-devel makedepend

---
 srcpkgs/zulucrypt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zulucrypt/template b/srcpkgs/zulucrypt/template
index c1f09fb9fc1d..cc596dc63dc2 100644
--- a/srcpkgs/zulucrypt/template
+++ b/srcpkgs/zulucrypt/template
@@ -11,7 +11,7 @@ configure_args="-DINTERNAL_ZULUPLAY=true -DQT5=true
 #set this to "false" once lxqt_wallet is available in void-packages
 configure_args+=" -DINTERNAL_LXQT_WALLET=true"
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="zuluplay-devel libblkid-devel cryptsetup-devel libgcrypt-devel
+makedepends="libblkid-devel cryptsetup-devel libgcrypt-devel
  device-mapper-devel libuuid-devel qt5-devel $(vopt_if kde kwallet-devel)
  $(vopt_if pwquality libpwquality-devel) $(vopt_if gnome libsecret-devel)"
 short_desc="Frontend to cryptsetup and Veracrypt for harddrive and file encryption"

From c2dfc5d3ce17c05bf6f6fe4635d8bc34fa507b1a Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sat, 6 Feb 2021 17:20:40 +0100
Subject: [PATCH 1167/3482] darktable: update to 3.4.1.

closes #27402
---
 srcpkgs/darktable/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 20734edd8fc0..24f17d36dda8 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
 # Template file for 'darktable'
 pkgname=darktable
-version=3.2.1
+version=3.4.1
 revision=1
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
@@ -22,7 +22,7 @@ license="GPL-3.0-or-later"
 homepage="http://www.darktable.org/"
 changelog="https://github.com/darktable-org/darktable/releases"
 distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"
-checksum=6e3683ea88dc0a0271be7eca4fd594b9e46b1b7194847825a8d0a0c12bdeb90c
+checksum=7fc3f851da9bcd7c5053ecd09f21aa3eb6103be98a6c58f52010b6f22174941e
 
 build_options="gmic"
 

From cac58bf0c7fd8ffaa00365490bc4af2c14bd45cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 16:04:52 +0100
Subject: [PATCH 1168/3482] kdeconnect: update to 20.12.2.

---
 common/shlibs               | 6 +++---
 srcpkgs/kdeconnect/template | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d3909e6babf6..e304b012d9ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3137,9 +3137,9 @@ librpmio.so.9 librpmio-4.15.0_1
 libsquirrel.so.0 squirrel-libs-3.1_1
 libsqstdlib.so.0 squirrel-libs-3.1_1
 libexecinfo.so.1 libexecinfo-1.1_1
-libkdeconnectpluginkcm.so.1 kdeconnect-1.2_1
-libkdeconnectinterfaces.so.1 kdeconnect-1.2_1
-libkdeconnectcore.so.1 kdeconnect-1.2_1
+libkdeconnectpluginkcm.so.2 kdeconnect-20.12.2_1
+libkdeconnectinterfaces.so.20 kdeconnect-20.12.2_1
+libkdeconnectcore.so.20 kdeconnect-20.12.2_1
 libkpmcore.so.10 kpmcore-4.2.0_1
 libpkcs11-helper.so.1 pkcs11-helper-1.22_1
 libr_core.so.5.0.0 radare2-5.0.0_1
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 98026cd5e276..de8e0133c044 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=20.08.3
+version=20.12.2
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
@@ -11,9 +11,9 @@ makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2"
 short_desc="Multi-platform app that allows your devices to communicate"
-maintainer="Yuxuan Shui <yshuiv7@gmail.com>"
+maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=3300d9abdb7d62cf7046636cb2840f4437dfe5efa68c5db7824a531c907a2074
+checksum=21ca118b9ca7c6107c2cbedc95778f6f0ea03411f3b8d9f815660511ec0a9d71
 python_version=3

From f8dedd9740f31d707f658f3d16838d952658fc27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:53:50 +0100
Subject: [PATCH 1169/3482] kpeoplevcard: move extra-cmake-modules to
 hostmakepepends

---
 srcpkgs/kpeoplevcard/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kpeoplevcard/template b/srcpkgs/kpeoplevcard/template
index 9c139871215e..57bed52dc619 100644
--- a/srcpkgs/kpeoplevcard/template
+++ b/srcpkgs/kpeoplevcard/template
@@ -3,9 +3,8 @@ pkgname=kpeoplevcard
 version=0.1
 revision=1
 build_style=cmake
-hostmakedepends="gettext AppStream"
-makedepends="qt5-devel extra-cmake-modules
- ki18n-devel kpeople-devel kcontacts-devel"
+hostmakedepends="gettext AppStream extra-cmake-modules"
+makedepends="qt5-devel ki18n-devel kpeople-devel kcontacts-devel"
 short_desc="Expose vcards to KPeople"
 maintainer="teldra <teldra@rotce.de>"
 license="LGPL-2.1-or-later"

From 8c969198d7715b11ee44708c0aba077a46aff914 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Sat, 6 Feb 2021 13:40:15 -0800
Subject: [PATCH 1170/3482] CLion: update to 2020.3.2.

---
 srcpkgs/CLion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 936a2da365a3..cbefd0873f29 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2020.3.1
+version=2020.3.2
 revision=1
 archs="i686 x86_64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=9a5f61360ed1fea699c3b692800e7df42e41589d6b994e2b6613e87472e4dbc9
+checksum=5d49bd88b6457271464687453ff65880a4a38974575bb76f969036c692072280
 repository=nonfree
 restricted=yes
 nopie=yes

From e9886d613c73777af6e0883b905f99a60d3a498a Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 6 Feb 2021 17:25:35 +0100
Subject: [PATCH 1171/3482] libhandy1: various improvements

* enable tests
* install demo to libhandy1-demo
* fix license
* remove conflict of libhandy1-devel with libhandy-devel
---
 srcpkgs/libhandy1-demo     |  1 +
 srcpkgs/libhandy1/template | 25 ++++++++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/libhandy1-demo

diff --git a/srcpkgs/libhandy1-demo b/srcpkgs/libhandy1-demo
new file mode 120000
index 000000000000..133e5d4d748a
--- /dev/null
+++ b/srcpkgs/libhandy1-demo
@@ -0,0 +1 @@
+libhandy1
\ No newline at end of file
diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index b1b7f1f9c32e..fa41b59229bc 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,19 +1,19 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
 version=1.0.3
-revision=1
+revision=2
 wrksrc="libhandy-${version}"
 build_style=meson
 build_helper="gir"
-# tests need X anyway, so no need to build them
-configure_args="-Dexamples=false -Dtests=false $(vopt_bool gir vapi)
- -Dglade_catalog=$(vopt_if glade enabled disabled)
+configure_args="-Dexamples=true -Dtests=true
+ $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
-short_desc="GTK+3 Building blocks for modern adaptive applications"
+checkdepends="xvfb-run"
+short_desc="GTK+3 building blocks for modern adaptive applications"
 maintainer="Paper <paper@tilde.institute>"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy/"
 distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
 checksum=559bb3acc2c362488917eb72ed25bdc181f4ae26ac94d177634cc5d34c867f7a
@@ -22,9 +22,12 @@ build_options="gir glade"
 desc_option_glade="Generate glade modules and catalog files"
 build_options_default="gir glade"
 
+do_check() {
+	xvfb-run ninja -C build test
+}
+
 libhandy1-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} gtk+3-devel"
-	conflicts="libhandy-devel>=0"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove "usr/lib/*.so"
@@ -40,3 +43,11 @@ libhandy1-devel_package() {
 		fi
 	}
 }
+
+libhandy1-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/handy-1-demo
+	}
+}

From 459c461d120a36efab338bde74fa649190768dac Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Sat, 6 Feb 2021 20:03:01 +0100
Subject: [PATCH 1172/3482] gnucash: update to 4.4

Fix use-after-free in test_xaccTransEqual
Disable two tests which require having the fr_FR and de_DE locales installed.
Add tzdata as dependency
Make_check_target=check
---
 srcpkgs/gnucash/patches/disabletests.patch | 14 ++++++++++++++
 srcpkgs/gnucash/patches/fixtest.patch      | 17 +++++++++++++++++
 srcpkgs/gnucash/template                   | 13 +++++++------
 3 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/gnucash/patches/disabletests.patch
 create mode 100644 srcpkgs/gnucash/patches/fixtest.patch

diff --git a/srcpkgs/gnucash/patches/disabletests.patch b/srcpkgs/gnucash/patches/disabletests.patch
new file mode 100644
index 000000000000..fe18e21f1f1a
--- /dev/null
+++ b/srcpkgs/gnucash/patches/disabletests.patch
@@ -0,0 +1,14 @@
+--- libgnucash/engine/test/CMakeLists.txt	2020-07-11 01:39:03.000000000 +0200
++++ libgnucash/engine/test/CMakeLists.txt	2021-01-31 22:22:19.782029671 +0100
+@@ -49,3 +49,3 @@ if (NOT WIN32)
+-  set(SOURCES ${test_qof_SOURCES} ${CMAKE_SOURCE_DIR}/common/test-core/unittest-support.c)
+-  add_engine_test(test-qof "${SOURCES}")
+-  target_compile_definitions(test-qof PRIVATE TESTPROG=test_qof)
++  # set(SOURCES ${test_qof_SOURCES} ${CMAKE_SOURCE_DIR}/common/test-core/unittest-support.c)
++  # add_engine_test(test-qof "${SOURCES}")
++  # target_compile_definitions(test-qof PRIVATE TESTPROG=test_qof)
+@@ -167,2 +167,2 @@ set(test_gnc_numeric_SOURCES
+-gnc_add_test(test-gnc-numeric "${test_gnc_numeric_SOURCES}"
+-  gtest_engine_INCLUDES gtest_qof_LIBS)
++# gnc_add_test(test-gnc-numeric "${test_gnc_numeric_SOURCES}"
++#   gtest_engine_INCLUDES gtest_qof_LIBS)
diff --git a/srcpkgs/gnucash/patches/fixtest.patch b/srcpkgs/gnucash/patches/fixtest.patch
new file mode 100644
index 000000000000..4404d99a534b
--- /dev/null
+++ b/srcpkgs/gnucash/patches/fixtest.patch
@@ -0,0 +1,17 @@
+--- libgnucash/engine/test/utest-Transaction.cpp
++++ libgnucash/engine/test/utest-Transaction.cpp
+@@ -901,7 +901,6 @@ test_xaccTransEqual (Fixture *fixture, gconstpointer pData)
+    g_assert_cmpint (check->hits, ==, 10);
+    g_assert_cmpint (check2->hits, ==, 1);
+
+-   g_free (check->msg);
+    g_free (check2->msg);
+    check2->msg = g_strdup_printf (
+                     "[xaccTransEqual] splits %s and %s differ", split_guid0, split_guid0);
+@@ -924,6 +923,7 @@ test_xaccTransEqual (Fixture *fixture, gconstpointer pData)
+        auto bal01 = gnc_numeric_to_string (split01->balance);
+        auto bal10 = gnc_numeric_to_string (split10->balance);
+        auto bal11 = gnc_numeric_to_string (split11->balance);
++       g_free (check->msg);
+        check->msg = g_strdup_printf("[xaccSplitEqualCheckBal] balances differ: %s vs %s", bal10, bal00);
+        check3->msg = g_strdup_printf("[xaccSplitEqualCheckBal] balances differ: %s vs %s", bal11, bal01);
\ No newline at end of file
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 622b0ee6e3e6..ed1143d4817b 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,22 +1,23 @@
 # Template file for 'gnucash'
 pkgname=gnucash
-version=4.2
-revision=3
+version=4.4
+revision=1
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
+make_check_target=check
 configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"
 hostmakedepends="pkg-config guile python3 libxslt perl gettext swig"
 makedepends="aqbanking-devel boost-devel gc-devel glib-devel gtest-devel guile-devel
  gwenhywfar-devel ktoblzcheck-devel libofx-devel libsecret-devel
- libxslt-devel webkit2gtk-devel python3-devel gwenhywfar-gtk3"
+ libxslt-devel webkit2gtk-devel python3-devel gwenhywfar-gtk3 tzdata"
 depends="dconf guile perl"
 short_desc="Financial-accounting software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnucash.org"
-#distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-distfiles="https://sources.voidlinux.org/gnucash-${version}/gnucash-${version}.tar.bz2"
-checksum=56d8ab039ef7784303ca9eab14bfc20f593f7a3f9b682a8a7eac25906a0d1308
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+#distfiles="https://sources.voidlinux.org/gnucash-${version}/gnucash-${version}.tar.bz2"
+checksum=d91e0d126b461d71de1bc1b20d9cf142704353dec07d3e6599d138422759e67a
 
 pycompile_dirs="usr/share/gnucash/python"
 conf_files="/etc/gnucash/environment"

From 85817b39ec7b794c9fc31921f74e1b009681c816 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Feb 2021 14:11:15 +0100
Subject: [PATCH 1173/3482] python3-boto3: update to 1.17.3.

---
 srcpkgs/python3-boto3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 38121e097cd2..dc6de94ac281 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.16.62
+version=1.17.3
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6dcdf024d8b45b865a4895605c4ef8855bbd2bcfcfd3792050a79abe1c633237
+checksum=31b4ecb153257e4f13229254a0b2a4d7d435ed51762ebd0410423817bbf4301c
 
 post_install() {
 	vlicense LICENSE

From 41d324f986d72105f6ee0488f54346adfcce4463 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Feb 2021 14:13:20 +0100
Subject: [PATCH 1174/3482] crawl: update to 0.26.1.

---
 srcpkgs/crawl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index e54831d1d859..b83def6d5f92 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.26.0
+version=0.26.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -10,8 +10,8 @@ short_desc="Dungeon Crawl Stone Soup roguelike adventure"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=6306c835246057bf91b6690fde14c2c3433ebe1d526876f96c46fab6dc109d45
+distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {

From f78c5a960fbf13cd4fc9106e0e39bcf99415e19f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Feb 2021 14:27:21 +0100
Subject: [PATCH 1175/3482] crawl-tiles: update to 0.26.1.

---
 srcpkgs/crawl-tiles/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index af4ec047e107..04da01f33962 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.26.0
+version=0.26.1
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=6306c835246057bf91b6690fde14c2c3433ebe1d526876f96c46fab6dc109d45
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {

From d5576b84ee46a5339b201e5636a29d8d022144c6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Feb 2021 14:27:29 +0100
Subject: [PATCH 1176/3482] ugrep: disable AVX again, is not autodetected
 properly.

---
 srcpkgs/ugrep/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 31f08f28e942..03366a1b73f3 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,8 +1,9 @@
 # Template file for 'ugrep'
 pkgname=ugrep
 version=3.1.7
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--disable-avx"
 makedepends="bzip2-devel liblz4-devel liblzma-devel pcre2-devel zlib-devel"
 short_desc="Ultra fast grep with interactive query UI"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 9bdb1fdec010bedba53eeb9c6939a8ae152e9e41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:55:10 +0100
Subject: [PATCH 1177/3482] rhash: change build_style to configure

The configure script is just a random shell script
---
 srcpkgs/rhash/patches/configure.patch | 17 -----------------
 srcpkgs/rhash/template                |  5 +++--
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/rhash/patches/configure.patch

diff --git a/srcpkgs/rhash/patches/configure.patch b/srcpkgs/rhash/patches/configure.patch
deleted file mode 100644
index afd1aebd6fa9..000000000000
--- a/srcpkgs/rhash/patches/configure.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.orig
-+++ configure
-@@ -194,7 +194,6 @@
-     ;;
-   *)
-       echo "unknown option $OPT"
--      exit 1
-       ;;
-   esac
-   shift
-@@ -897,4 +896,4 @@
- Libs.private: ${OPENSSL_LDFLAGS}
- 
- EOF
--fi
-\ No newline at end of file
-+fi
diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 820963e9edef..749f97551069 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -3,8 +3,9 @@ pkgname=rhash
 version=1.4.1
 revision=1
 wrksrc="RHash-${version}"
-build_style=gnu-configure
-configure_args="--enable-openssl --disable-openssl-runtime"
+build_style=configure
+configure_args="--enable-openssl --disable-openssl-runtime
+ --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
 makedepends="libressl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"

From 857b8c87d7c21ff1ffc38a4462954c1195d76165 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Feb 2021 16:23:51 +0100
Subject: [PATCH 1178/3482] linux5.10: update to 5.10.14.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index cfc4ec0bde61..d0998f35eb69 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.13
+version=5.10.14
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=06698c0ce35ceefa9b79ceb108ec7fb86de05f51fe615f3ae5cc82e293dfe1f2
+checksum=fa27b79f198b5be969e497ed5461860df48e0591c85e60699fc8be26837a1d2a
 python_version=3
 patch_args="-Np1"
 

From b4029118e5c87a5324a3bcea8c5665da558ff60d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 7 Feb 2021 23:09:04 +0700
Subject: [PATCH 1179/3482] i3: build as released version

Close #28545
---
 srcpkgs/i3/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index c8751cbbe015..4e2b23f821cc 100644
--- a/srcpkgs/i3/template
+++ b/srcpkgs/i3/template
@@ -1,7 +1,7 @@
 # Template file for 'i3'
 pkgname=i3
 version=4.19.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config perl"
 makedepends="pcre-devel yajl-devel libxcb-devel libev-devel
@@ -21,7 +21,8 @@ case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libglob-devel";;
 esac
 
-pre_build() {
+post_patch() {
+	vsed -i "s/-non-git/ ($(date --iso-8601))/" meson.build
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
 		vsed -i "/^common_deps/i glob_dep = cc.find_library('glob')" meson.build

From fd600c5db8da47c81447783ede8336443e136f2a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Feb 2021 18:54:11 +0100
Subject: [PATCH 1180/3482] linux5.4: update to 5.4.95.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index dc289a313bb3..94f18ddcc51a 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.94
+version=5.4.95
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=c23df57db7312e9afa5ce477046e227a3c2153efbe1f29045ad23c820aad2b39
+checksum=030ae544f346bfa2ce619dd9e17e93d10ec393632d3b6d6cf5d1fc84b914d449
 python_version=3
 patch_args="-Np1"
 

From 688b8da5f43fc7a06e41ef224c98c5d16e01c6c1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Feb 2021 18:56:27 +0100
Subject: [PATCH 1181/3482] linux4.19: update to 4.19.173.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 359cf7d7cc11..afb47ee2f59c 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.172
+version=4.19.173
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=4f34cceb0558640ce04fa1929b99110282ba285c1655fbd4b72f985cf83e1422
+checksum=d2fdd236e6f31aa8e939f4a686c95417d8571bde3d091fc6a2535937c144195f
 python_version=2 #unverified
 patch_args="-Np1"
 

From 022f75d23c527bdd199de50d615cfbe599498e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 7 Feb 2021 21:23:34 +0100
Subject: [PATCH 1182/3482] wineasio: fix ftbfs

---
 srcpkgs/wineasio/patches/wine-unicode_h.patch | 59 +++++++++++++++++++
 srcpkgs/wineasio/template                     |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/wineasio/patches/wine-unicode_h.patch

diff --git a/srcpkgs/wineasio/patches/wine-unicode_h.patch b/srcpkgs/wineasio/patches/wine-unicode_h.patch
new file mode 100644
index 000000000000..7b49df472722
--- /dev/null
+++ b/srcpkgs/wineasio/patches/wine-unicode_h.patch
@@ -0,0 +1,59 @@
+Source: @pullmoll
+Upstream: no
+Reason: wine/unicode.h does not exist anymore and also strrchrW()
+        is not available. Replace the code with a simple linear
+        scan over the application_path array to find the rightmost
+        backslash (\) and period (.) for creating the application_name.
+
+--- wineasio/asio.c	2013-10-28 15:22:00.000000000 +0100
++++ wineasio/asio.c	2021-02-07 21:18:46.741180398 +0100
+@@ -24,6 +24,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+ 
++#define _UNICODE
+ #include <stdio.h>
+ #include <errno.h>
+ #include <unistd.h>
+@@ -34,7 +35,6 @@
+ #include "objbase.h"
+ #include "mmsystem.h"
+ #include "winreg.h"
+-#include "wine/unicode.h"
+ 
+ #include <jack/jack.h>
+ #include <jack/thread.h>
+@@ -1449,7 +1449,7 @@
+ {
+     HKEY    hkey;
+     LONG    result, value;
+-    DWORD   type, size;
++    DWORD   type, size, pos, backslash, period;
+     WCHAR   application_path [MAX_PATH];
+     WCHAR   *application_name;
+     char    environment_variable[MAX_ENVIRONMENT_SIZE];
+@@ -1601,10 +1601,20 @@
+ 
+     /* get client name by stripping path and extension */
+     GetModuleFileNameW(0, application_path, MAX_PATH);
+-    application_name = strrchrW(application_path, L'.');
+-    *application_name = 0;
+-    application_name = strrchrW(application_path, L'\\');
+-    application_name++;
++    backslash = 0;
++    period = 0;
++    for (pos = 0; pos < MAX_PATH; pos++) {
++        if (L'\\' == application_path[pos])
++            backslash = pos;
++        if (L'.' == application_path[pos])
++            period = pos;
++        if (0 == application_path[pos])
++            break;
++    }
++    if (period > 0) {
++        application_path[period] = 0;
++    }
++    application_name = backslash ? &application_path[backslash + 1] : application_path;
+     WideCharToMultiByte(CP_ACP, WC_SEPCHARS, application_name, -1, This->jack_client_name, ASIO_MAX_NAME_LENGTH, NULL, NULL);
+ 
+     RegCloseKey(hkey);
diff --git a/srcpkgs/wineasio/template b/srcpkgs/wineasio/template
index 52b04d844233..bc529e72b3cc 100644
--- a/srcpkgs/wineasio/template
+++ b/srcpkgs/wineasio/template
@@ -1,14 +1,14 @@
 # Template file for 'wineasio'
 pkgname=wineasio
 version=0.9.2
-revision=6
+revision=7
 archs="i686"
 repository="nonfree"
 build_style=gnu-makefile
 create_wrksrc=yes
 build_wrksrc=${pkgname}
 homepage="https://sourceforge.net/projects/wineasio"
-hostmakedepends="unzip"
+hostmakedepends="unzip wine-tools"
 makedepends="wine wine-devel jack-devel"
 depends="jack"
 short_desc="JACK driver for WINE to provide Windows Apps with ASIO support"

From fcdaf2de74807f313a8436140d5ab98367086aa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 7 Feb 2021 22:30:35 +0100
Subject: [PATCH 1183/3482] openjdk8: fix cross build

The expression to strip "--with-libtool-sysroot=..." from configure_args
actually stripped all the configure_args defined in the template.
To avoid this unwanted side effect use --disable-option-checking.
---
 srcpkgs/openjdk8/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 30b7fdd31317..478986b3ca6b 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -30,7 +30,8 @@ configure_args="
  --with-vendor-name="Void"
  --with-vendor-url="https://voidlinux.org/"
  --with-vendor-bug-url="https://github.com/void-linux/void-packages/issues"
- --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues""
+ --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues"
+ --disable-option-checking"
 make_build_args="images $(vopt_if docs docs) COMPILER_WARNINGS_FATAL=false"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
  zlib-devel make-ca which"
@@ -199,8 +200,6 @@ do_configure() {
 			;;
 	esac
 
-	configure_args=${configure_args/--with-libtool-sysroot=\/usr\/[a-z0-9]*-linux-[a-z]*/}
-
 	./configure ${configure_args} --with-extra-cflags="$CFLAGS" \
 	 --with-extra-cxxflags="$CXXFLAGS" --with-extra-ldflags="$LDFLAGS"
 }

From e874ce4fe4ab2ad4733ddf181d12e319ce0600f9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 7 Feb 2021 23:16:00 +0200
Subject: [PATCH 1184/3482] mtpaint: update to 3.50.05.

---
 srcpkgs/mtpaint/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mtpaint/template b/srcpkgs/mtpaint/template
index 1d623607c11d..8f86180e6d8b 100644
--- a/srcpkgs/mtpaint/template
+++ b/srcpkgs/mtpaint/template
@@ -1,8 +1,8 @@
 # Template file for 'mtpaint'
 pkgname=mtpaint
-version=3.50.03
+version=3.50.05
 revision=1
-_commit=40bde4557c254188b2924c90f4a35eef784b0a12
+_commit=96cd3788c4f89973350981dbc71d449cabdac297
 wrksrc="mtPaint-${_commit}"
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="http://mtpaint.sourceforge.net/"
 changelog="https://raw.githubusercontent.com/wjaguar/mtPaint/master/NEWS"
 distfiles="https://github.com/wjaguar/mtPaint/archive/${_commit}.tar.gz"
-checksum=96622c392652478abb6cd29ffcc10885d8ed0007ec45bd8841f45f9dcff8bb31
+checksum=cd01f281414c30d47c99042c233836c93d596902ef473e9cbe90ae34f05b8575
 
 post_install() {
 	vdoc doc/vcode.t2t

From 1efd1b36710af3e785ac1ffe9075cc478f261417 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 23:09:43 +0100
Subject: [PATCH 1185/3482] libgda: change vsed call to not break OpenSSL

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index 1f774bc71ffa..f6af39ac9150 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -30,7 +30,7 @@ post_extract() {
 		recode ISO-8859-1..UTF-8 "${f}"
 	done
 	#Fix LibreSSL build error
-	vsed -e 's,defined(LIBRESSL,!defined(LIBRESSL,' -i providers/sqlcipher/sqlite3.c
+	vsed -e 's,defined(LIBRESSL,!defined(OPENSSL,' -i providers/sqlcipher/sqlite3.c
 }
 
 libgda-devel_package() {

From ef86367766bd3b7db332931c36309fdced9b8b16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 22:43:49 +0100
Subject: [PATCH 1186/3482] seexpr-krita: update to 4.0.1.0.

---
 common/shlibs                 |  4 ++--
 srcpkgs/seexpr-krita/template | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e304b012d9ab..a39ff167fa6b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3912,8 +3912,8 @@ libneatvnc.so.0 neatvnc-0.3.2_1
 libtdjson.so.1.7.0 libtd-1.7.0_1
 libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
-libSeExpr2Editor.so.3 seexpr-krita-3.4.4.0_1
-libSeExpr2.so.3 seexpr-krita-3.4.4.0_1
+libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1
+libKSeExpr.so.4.0.1.0 seexpr-krita-4.0.1.0_1
 liburing.so.1 liburing-0.7_1
 libbson-1.0.so.0 libbson-1.17.0_1
 libsonic.so.0 libsonic-0.2.0_1
diff --git a/srcpkgs/seexpr-krita/template b/srcpkgs/seexpr-krita/template
index 01490dd15a2e..1181f78167ba 100644
--- a/srcpkgs/seexpr-krita/template
+++ b/srcpkgs/seexpr-krita/template
@@ -1,19 +1,19 @@
 # Template file for 'seexpr-krita'
 pkgname=seexpr-krita
-version=3.4.4.0
+version=4.0.1.0
 revision=1
-wrksrc="seexpr-${version}"
+wrksrc="kseexpr-${version}"
 build_style=cmake
-configure_args="-DBUILD_DEMOS=OFF -DUSE_PYTHON=OFF"
-hostmakedepends="qt5-qmake qt5-host-tools"
+configure_args="-DBUILD_DEMOS=OFF"
+hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
 makedepends="qt5-tools-devel"
 checkdepends="gtest-devel"
 short_desc="Embeddable expression evaluation engine (Krita fork)"
 maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://krita.org"
-distfiles="${KDE_SITE}/seexpr/seexpr-${version}.tar.gz"
-checksum=3f5b5330667d398285c9f7086cc3fd7e1363f3fa75f79b39766c34fe2e233656
+distfiles="${KDE_SITE}/kseexpr/${version%.*}/kseexpr-${version}.tar.gz"
+checksum=13b8455883001668f5d79c5734821c1ad2a0fbc91d019af085bb7e31cf6ce926
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTS=ON"
@@ -32,7 +32,7 @@ pre_configure() {
 }
 
 post_install() {
-	[ -d "${DESTDIR}/usr/share/test/SeExpr2" ] && rm -r "${DESTDIR}/usr/share/test/SeExpr2" || true
+	[ -d "${DESTDIR}/usr/share/test/KSeExpr" ] && rm -r "${DESTDIR}/usr/share/test/KSeExpr" || true
 }
 
 seexpr-krita-devel_package() {

From 633bc47d0dbf4ab996885f5864c44aab6c980e15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 22:15:15 +0100
Subject: [PATCH 1187/3482] krita: update to 4.4.2.

---
 srcpkgs/krita/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 1898888603e2..a11f17a21b7a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.1
+version=4.4.2
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -13,13 +13,14 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
  boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel
  opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel
  poppler-qt5-devel giflib-devel python3-devel python3-sip-devel python3-PyQt5
- python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel"
+ python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel
+ libopenjpeg2-devel"
 short_desc="Painting and image editing program"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=6f2daf068e4e5cef8a738ab47da443dc82ad1463090a4a1544b35201272c3817
+checksum=9696aec56e759f3e1c22952ca17efdcac97003239f515f570ad9f07e36cb9792
 python_version=3
 replaces="calligra-krita>=0"
 

From e3cf5b9526313bbffe39a9338c36878e07e05bbf Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 5 Feb 2021 08:32:20 -0600
Subject: [PATCH 1188/3482] pahole: update to 1.20.

---
 srcpkgs/pahole/patches/fix_mallinfo.patch | 16 ----------------
 srcpkgs/pahole/template                   |  4 ++--
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/pahole/patches/fix_mallinfo.patch

diff --git a/srcpkgs/pahole/patches/fix_mallinfo.patch b/srcpkgs/pahole/patches/fix_mallinfo.patch
deleted file mode 100644
index 0c54d25a3f37..000000000000
--- a/srcpkgs/pahole/patches/fix_mallinfo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- dtagnames.c.orig
-+++ dtagnames.c
-@@ -16,9 +16,13 @@
- 
- static void print_malloc_stats(void)
- {
-+#ifdef __GLIBC__
- 	struct mallinfo m = mallinfo();
- 
- 	fprintf(stderr, "size: %u\n", m.uordblks);
-+#else
-+	fprintf(stderr, "malloc stats not available\n");
-+#endif
- }
- 
- static int class__tag_name(struct tag *tag, struct cu *cu __unused,
diff --git a/srcpkgs/pahole/template b/srcpkgs/pahole/template
index 55ab5b5a9608..a2fc8f2023e6 100644
--- a/srcpkgs/pahole/template
+++ b/srcpkgs/pahole/template
@@ -1,6 +1,6 @@
 # Template file for 'pahole'
 pkgname=pahole
-version=1.19
+version=1.20
 revision=1
 wrksrc="dwarves-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://git.kernel.org/?p=devel/pahole/pahole.git;a=summary"
 distfiles="https://fedorapeople.org/~acme/dwarves/dwarves-${version}.tar.xz"
-checksum=9af54663f2bab10d1ea85f97801c8fa045ff62e9b39d4ec6a8541354cb7b6ef3
+checksum=a0dbda45ce83c0bf21eba78c44b4fd72560a970285fbb3e4f88375015aab6f06
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) makedepends+=" musl-obstack-devel argp-standalone"

From 6001ba11f17fbe07d2fbe42394bd2d52fe59d562 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 23:30:16 +0100
Subject: [PATCH 1189/3482] kcov: update to 38.

---
 srcpkgs/kcov/patches/cmake.patch | 13 +++++++++++++
 srcpkgs/kcov/template            |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/kcov/patches/cmake.patch

diff --git a/srcpkgs/kcov/patches/cmake.patch b/srcpkgs/kcov/patches/cmake.patch
new file mode 100644
index 000000000000..341769c31a86
--- /dev/null
+++ b/srcpkgs/kcov/patches/cmake.patch
@@ -0,0 +1,13 @@
+--- src/CMakeLists.txt	2021-02-07 23:38:14.980629462 +0100
++++ -	2021-02-07 23:46:37.827992991 +0100
+@@ -412,9 +412,9 @@
+ 		stdc++
+ 		${CMAKE_THREAD_LIBS_INIT}
+ 		${CURL_LIBRARIES}
+-		"${DL_LIBRARY}"
+ 		"${INTL_LIBRARY}"
+ 		${DISASSEMBLER_LIBRARIES}
++		"${DL_LIBRARY}"
+ 		${LIBDW_LIBRARIES}
+ 		${LIBELF_LIBRARIES}
+ 		${LLDB_LIBRARY}
diff --git a/srcpkgs/kcov/template b/srcpkgs/kcov/template
index be2127bfa346..cb361bd65b1a 100644
--- a/srcpkgs/kcov/template
+++ b/srcpkgs/kcov/template
@@ -1,13 +1,13 @@
 # Template file for 'kcov'
 pkgname=kcov
-version=36
+version=38
 revision=1
 build_style=cmake
-hostmakedepends="python pkg-config"
+hostmakedepends="python3 pkg-config"
 makedepends="binutils-devel libcurl-devel elfutils-devel"
 short_desc="Code coverage tester for compiled programs, Python and shell"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://simonkagstrom.github.io/kcov/index.html"
 distfiles="https://github.com/SimonKagstrom/kcov/archive/v${version}.tar.gz"
-checksum=29ccdde3bd44f14e0d7c88d709e1e5ff9b448e735538ae45ee08b73c19a2ea0b
+checksum=b37af60d81a9b1e3b140f9473bdcb7975af12040feb24cc666f9bb2bb0be68b4

From 80a18c436a1e6faedb02cb64084d5caefe381877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 8 Feb 2021 00:02:05 +0100
Subject: [PATCH 1190/3482] XorCurses: remove (upstream is dead)

---
 srcpkgs/XorCurses/template | 38 --------------------------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 srcpkgs/XorCurses/template

diff --git a/srcpkgs/XorCurses/template b/srcpkgs/XorCurses/template
deleted file mode 100644
index c36d399e27e7..000000000000
--- a/srcpkgs/XorCurses/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'XorCurses'
-pkgname=XorCurses
-version=0.2.2
-revision=1
-makedepends="ncurses-devel"
-short_desc="Logic puzzle based on Xor by Astral Software"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-3"
-homepage="http://jwm-art.net/?p=XorCurses"
-distfiles="http://jwm-art.net/art/archive/${pkgname}-${version}.tar.bz2"
-checksum=52ce28c4eb4d10fd51668d08e17e9e2a54d520f1d864bb2b659dbcf8e0187969
-
-_cc() {
-	echo "$@"
-	$@
-}
-
-do_build() {
-	local f o objs
-	CFLAGS+=" -std=gnu99 -Wall -Wextra -fcommon"
-	CFLAGS+=" -DDATADIR=\"/usr/share/${pkgname}\""
-	CFLAGS+=" -DVERSION=\"${version}\""
-	for f in ./*.c; do
-		o=${f%.c}.o
-		objs+=" $o"
-		_cc $CC $CFLAGS -o $o -c $f
-	done
-	_cc $CC -o ${pkgname} ${objs} -lncurses
-}
-
-do_install() {
-	vbin ${pkgname}
-	vmkdir usr/share/${pkgname}/maps
-	vcopy maps/* usr/share/${pkgname}/maps
-	for f in ./help*.txt; do
-		vcopy $f usr/share/${pkgname}
-	done
-}

From 6729c340ac1a4086bddff7bb7b7e80b263145462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 8 Feb 2021 00:02:48 +0100
Subject: [PATCH 1191/3482] removed-packages: add XorCurses

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 013ec3f3dcac..106ec0d9e083 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=23
+revision=24
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -10,6 +10,7 @@ homepage="https://voidlinux.org"
 
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
+ XorCurses<=0.2.2_1
  albert<=0.16.1_4
  apg<=2.2.3_5
  arm-mem-git<=20131108_2

From e2675550bb1e130f84cecaef73103d7bfc3c730b Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 6 Feb 2021 16:19:19 +0100
Subject: [PATCH 1192/3482] duf: update to 0.6.0

---
 srcpkgs/duf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/duf/template b/srcpkgs/duf/template
index e701d53d84f7..87191e9e8fbc 100644
--- a/srcpkgs/duf/template
+++ b/srcpkgs/duf/template
@@ -1,6 +1,6 @@
 # Template file for 'duf'
 pkgname=duf
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=go
 go_import_path="github.com/muesli/duf"
@@ -8,8 +8,8 @@ short_desc="Disk Usage/Free Utility"
 maintainer="Paper <paper@tilde.institute>"
 license="MIT"
 homepage="https://github.com/muesli/duf/"
-distfiles="$homepage/archive/v$version.tar.gz"
-checksum=d8879fbf091cd6f6a3b95102fdeb7d21b7fc8200df1a9864b89d8e87057fc9c6
+distfiles="https://github.com/muesli/duf/archive/v$version.tar.gz"
+checksum=238ace11966ab3b1f99e5488a9f161ebc97aba7600a8f09884110d0572309491
 
 post_install() {
 	vlicense LICENSE

From 647a04067b65e54d35a954ae132e78a68544ea0b Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 6 Feb 2021 17:26:25 +0100
Subject: [PATCH 1193/3482] gitui: update to 0.11.0.

---
 srcpkgs/gitui/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index fff85c43aa88..e43f46d26688 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,16 +1,16 @@
 # Template file for 'gitui'
 pkgname=gitui
-version=0.10.1
+version=0.11.0
 revision=1
 build_style=cargo
-hostmakedepends="python3"
+hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"
 short_desc="Blazing fast terminal-ui for git"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/extrawurst/gitui"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=2d6fa87d88002716cf0fedef9d4332b7212ee05fbfa4b8c536ae4270bef99bce
+checksum=ba32583bb6afc3adac8fe78d8ce10fd127b2fe4f62bc24b301d1ffbfb838bf98
 
 post_install() {
 	vlicense LICENSE.md

From 319a87697b93377de1490a0d421dc68573629627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?=
 <louisdb@lespetitspedestres.org>
Date: Sun, 7 Feb 2021 11:09:28 +0200
Subject: [PATCH 1194/3482] kwallet-cli: update to 3.03.

---
 srcpkgs/kwallet-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet-cli/template b/srcpkgs/kwallet-cli/template
index 00f96d2a684f..4e27ae4f5913 100644
--- a/srcpkgs/kwallet-cli/template
+++ b/srcpkgs/kwallet-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-cli'
 pkgname=kwallet-cli
-version=3.02
+version=3.03
 revision=1
 wrksrc=kwalletcli
 build_style=gnu-makefile
@@ -13,7 +13,7 @@ maintainer="Louis Dupré Bertoni <contact@louis.xyz>"
 license="custom:MirOS, LGPL-3.0-or-later"
 homepage="https://www.mirbsd.org/kwalletcli.htm"
 distfiles="http://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/kwalletcli-${version}.tar.gz"
-checksum=f6bebf802d6d575b0871c01dc1cbcc0f182d26cdce28449da426a503a257d216
+checksum=f228e5b179f6eb92289b9635382e676990dd58cd193ce42b61d3150c8a06b12d
 
 post_patch() {
 	vsed -i GNUmakefile -e "s|-I/usr/include|-I${XBPS_CROSS_BASE}/usr/include|g"

From dc21dd6c3ccd009f3ae785783628932111c6c82d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 00:53:28 +0100
Subject: [PATCH 1195/3482] seexpr-krita: fix i686 build

---
 srcpkgs/seexpr-krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seexpr-krita/template b/srcpkgs/seexpr-krita/template
index 1181f78167ba..efb21e6f6508 100644
--- a/srcpkgs/seexpr-krita/template
+++ b/srcpkgs/seexpr-krita/template
@@ -28,7 +28,7 @@ do_check() {
 }
 
 pre_configure() {
-	sed -i 's#share/SeExpr2/utils#lib/SeExpr2/utils#' src/utils/CMakeLists.txt
+	vsed -e 's/float_t/float/g' -i src/KSeExprUI/Utils.cpp -i src/KSeExprUI/Utils.h
 }
 
 post_install() {

From 7a7f39d8be5e2ed984515c1626a663772e18e334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Feb 2021 06:54:58 +0700
Subject: [PATCH 1196/3482] i3: move post_patch to pre_configure

- We need the date wrapper for reproducibility.
---
 srcpkgs/i3/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index 4e2b23f821cc..51733b6ba53f 100644
--- a/srcpkgs/i3/template
+++ b/srcpkgs/i3/template
@@ -21,7 +21,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libglob-devel";;
 esac
 
-post_patch() {
+pre_configure() {
+	# This change must be in pre_configre because:
+	# - it needs to be done before configure
+	# - date wrapper is only available from pre-configure
 	vsed -i "s/-non-git/ ($(date --iso-8601))/" meson.build
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)

From 596a2da1883e3dd2fbfb56f9dfd46f1d45a902b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 7 Feb 2021 18:05:17 +0700
Subject: [PATCH 1197/3482] build-style/qmake: no rpath

See #27494
Close #28563
---
 common/build-style/qmake.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/build-style/qmake.sh b/common/build-style/qmake.sh
index fa54c005f36f..2795d77d3725 100644
--- a/common/build-style/qmake.sh
+++ b/common/build-style/qmake.sh
@@ -28,7 +28,7 @@ do_configure() {
 		mkdir -p "${wrksrc}/.target-spec/linux-g++"
 		cat > "${wrksrc}/.target-spec/linux-g++/qmake.conf" <<_EOF
 MAKEFILE_GENERATOR      = UNIX
-CONFIG                 += incremental
+CONFIG                 += incremental no_qt_rpath
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(/usr/lib/qt5/mkspecs/common/linux.conf)
@@ -58,7 +58,7 @@ _EOF
 		mkdir -p "${wrksrc}/.host-spec/linux-g++"
 		cat > "${wrksrc}/.host-spec/linux-g++/qmake.conf" <<_EOF
 MAKEFILE_GENERATOR      = UNIX
-CONFIG                 += incremental
+CONFIG                 += incremental no_qt_rpath
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(/usr/lib/qt5/mkspecs/common/linux.conf)

From 44a7f507e5917bd73c9fc54dff021d188c39712e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 7 Feb 2021 22:56:19 +0700
Subject: [PATCH 1198/3482] qt5: clean $wrksrc leak on cross

---
 srcpkgs/qt5/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 16cf68980753..ea494f4b129b 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=1
+revision=2
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -314,6 +314,7 @@ do_install() {
 		make -f Makefile.target ${makejobs}
 		ln -sf ../lib/qt5/bin/qmake ${PKGDESTDIR}/usr/bin/qmake-qt5
 		cp -ar ${wrksrc}/qtbase/mkspecs ${PKGDESTDIR}/usr/lib/qt5
+		_cleanup_wrksrc_leak
 
 		#
 		# Build qmldevtools for the target

From 5573481ab4918372e438b0ce5e55a4afc377eaa3 Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 7 Feb 2021 18:40:54 +0100
Subject: [PATCH 1199/3482] gdm: enable smooth transition with plymouth.

---
 srcpkgs/gdm/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 6ef190e057ca..e5b84645b4c9 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,19 +1,20 @@
 # Template file for 'gdm'
 pkgname=gdm
 version=3.38.2.1
-revision=2
+revision=3
 build_helper="gir"
 build_style=meson
 configure_args="
  -Ddefault-pam-config=arch -Dat-spi-registryd-dir=/usr/libexec
  -Dtcp-wrappers=false -Dscreenshot-dir=/var/lib/gdm/greeter
- -Dplymouth=disabled -Dxauth-dir=/run/gdm -Dpid-file=/run/gdm/gdm.pid
+ -Dplymouth=enabled -Dxauth-dir=/run/gdm -Dpid-file=/run/gdm/gdm.pid
  -Dsystemd-journal=false -Dinitial-vt=7 -Dwayland-support=true
  -Dselinux=disabled -Dlibaudit=disabled
  -Dsystemdsystemunitdir=/tmp -Dsystemduserunitdir=/tmp"
 hostmakedepends="dconf gettext itstool pkg-config"
 makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel
- iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel"
+ iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel
+ plymouth-devel"
 depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
  gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
 checkdepends="check-devel"

From ad10339118a28dc9bbdeef059eddd82f933d9c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 8 Feb 2021 10:45:12 +0100
Subject: [PATCH 1200/3482] Maelstrom: update to 3.0.7

---
 srcpkgs/Maelstrom/patches/gcc82.patch         | 94 -------------------
 .../Maelstrom/patches/include-time_h.patch    | 10 ++
 srcpkgs/Maelstrom/patches/install_dirs.patch  | 35 -------
 .../patches/struct-button-typedef.patch       | 29 ++++++
 srcpkgs/Maelstrom/template                    | 19 ++--
 5 files changed, 48 insertions(+), 139 deletions(-)
 delete mode 100644 srcpkgs/Maelstrom/patches/gcc82.patch
 create mode 100644 srcpkgs/Maelstrom/patches/include-time_h.patch
 delete mode 100644 srcpkgs/Maelstrom/patches/install_dirs.patch
 create mode 100644 srcpkgs/Maelstrom/patches/struct-button-typedef.patch

diff --git a/srcpkgs/Maelstrom/patches/gcc82.patch b/srcpkgs/Maelstrom/patches/gcc82.patch
deleted file mode 100644
index b111c1736b7e..000000000000
--- a/srcpkgs/Maelstrom/patches/gcc82.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- load.h	2016-10-08 10:10:38.000000000 +0200
-+++ load.h	2018-08-22 10:13:31.696766996 +0200
-@@ -108,9 +108,9 @@
- 			delete[] path;
- 		path = new char[strlen(directory)+1+strlen(filename)+1];
- 		if ( strcmp(directory, DIR_SEP) == 0 ) {
--			sprintf(path, DIR_SEP"%s", filename);
-+			sprintf(path, DIR_SEP "%s", filename);
- 		} else {
--			sprintf(path, "%s"DIR_SEP"%s", directory, filename);
-+			sprintf(path, "%s" DIR_SEP "%s", directory, filename);
- 		}
- 		return(path);
- 	}
---- load.cpp	2000-02-15 03:47:39.000000000 +0100
-+++ load.cpp	2018-08-22 10:23:36.123798178 +0200
-@@ -81,7 +81,7 @@
- 	SDL_Surface *bmp, *title;
- 	
- 	/* Open the title file -- we know its colormap is our global one */
--	sprintf(file, "Images"DIR_SEP"Maelstrom_Titles#%d.bmp", title_id);
-+	sprintf(file, "Images" DIR_SEP "Maelstrom_Titles#%d.bmp", title_id);
- 	bmp = SDL_LoadBMP(path.Path(file));
- 	if ( bmp == NULL ) {
- 		return(NULL);
-@@ -103,7 +103,7 @@
- 	Uint16 w, h;
- 	
- 	/* Open the cicn sprite file.. */
--	sprintf(file, "Images"DIR_SEP"Maelstrom_Icon#%hd.cicn", cicn_id);
-+	sprintf(file, "Images" DIR_SEP "Maelstrom_Icon#%hd.cicn", cicn_id);
- 	if ( (cicn_src=SDL_RWFromFile(path.Path(file), "r")) == NULL ) {
- 		error("GetCIcon(%hd): Can't open CICN %s: ",
- 					cicn_id, path.Path(file));
---- Maelstrom-netd.c	2000-02-12 10:58:59.000000000 +0100
-+++ Maelstrom-netd.c	2018-08-22 10:14:38.352770435 +0200
-@@ -2,6 +2,8 @@
- /* Here we go... */
- 
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <time.h>
- #include <string.h>
- #include <signal.h>
- #include <errno.h>
---- buttonlist.h	2000-01-25 17:41:32.000000000 +0100
-+++ buttonlist.h	2018-08-22 10:17:36.182779609 +0200
-@@ -16,7 +16,7 @@
- 
- 	void Add_Button(Uint16 x, Uint16 y, Uint16 width, Uint16 height, 
- 						void (*callback)(void)) {
--		struct button *belem;
-+		ButtonList::button *belem;
- 		
- 		for ( belem=&button_list; belem->next; belem=belem->next );
- 		belem->next = new button;
-@@ -30,7 +30,7 @@
- 	}
- 
- 	void Activate_Button(Uint16 x, Uint16 y) {
--		struct button *belem;
-+		ButtonList::button *belem;
- 
- 		for ( belem=button_list.next; belem; belem=belem->next ) {
- 			if ( (x >= belem->x1) && (x <= belem->x2) &&
-@@ -42,7 +42,7 @@
- 	}
- 
- 	void Delete_Buttons(void) {
--		struct button *belem, *btemp;
-+		ButtonList::button *belem, *btemp;
- 
- 		for ( belem=button_list.next; belem; ) {
- 			btemp = belem;
-@@ -58,7 +58,7 @@
- 		Uint16 x1, y1;
- 		Uint16 x2, y2;
- 		void (*callback)(void);
--		struct button *next;
-+		struct ButtonList::button *next;
- 	} button;
- 	button button_list;
- };
---- dialog.h	2001-07-20 17:08:10.000000000 +0200
-+++ dialog.h	2018-08-22 10:21:41.404792260 +0200
-@@ -402,7 +402,7 @@
- 			/* Loop to end of radio box list */;
- /* Which is ANSI C++? */
- #ifdef linux
--		radio->next = new struct Mac_RadioList::radio;
-+		radio->next = new Mac_RadioList::radio;
- #else
- 		radio->next = new struct radio;
- #endif
diff --git a/srcpkgs/Maelstrom/patches/include-time_h.patch b/srcpkgs/Maelstrom/patches/include-time_h.patch
new file mode 100644
index 000000000000..d66afafb586a
--- /dev/null
+++ b/srcpkgs/Maelstrom/patches/include-time_h.patch
@@ -0,0 +1,10 @@
+--- Maelstrom-netd.c	2021-02-01 16:46:31.000000000 +0100
++++ Maelstrom-netd.c	2021-02-08 10:34:17.661600013 +0100
+@@ -12,6 +12,7 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#include <time.h>
+ #include <unistd.h>
+ 
+ /* We wait in a loop for players to connect and tell us how many people
diff --git a/srcpkgs/Maelstrom/patches/install_dirs.patch b/srcpkgs/Maelstrom/patches/install_dirs.patch
deleted file mode 100644
index 7778b1cc0cc7..000000000000
--- a/srcpkgs/Maelstrom/patches/install_dirs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-
---- Makefile.in	2002-10-20 00:19:42.000000000 -0400
-+++ Makefile.in	2009-04-14 14:45:59.000000000 -0400
-@@ -431,7 +431,7 @@
- 
- # Special install rule for the game
- install:
--	make install_gamedata target=@GAME_INSTALLDIR@
-+	make install_gamedata target=$(DESTDIR)/@GAME_INSTALLDIR@
- 
- install_gamedata:
- 	sh mkinstalldirs $(target)/
-@@ -444,8 +444,8 @@
- 	chmod 666 $(target)/Maelstrom-Scores
- 
- install_gamedocs:
--	sh mkinstalldirs $(target)/
--	cp -rv README* COPYING* Docs*	$(target)/
-+	sh mkinstalldirs $(DESTDIR)/$(target)/
-+	cp -rv README* COPYING* Docs*	$(DESTDIR)/$(target)/
- 
- # Rule to build tar-gzipped distribution package
- $(PACKAGE)-$(VERSION).tar.gz: dist
-
---- configure	2002-10-19 23:43:07.000000000 -0400
-+++ configure	2009-04-14 14:47:33.000000000 -0400
-@@ -3232,7 +3232,7 @@
-         GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE"
-         ;;
-     *)
--        GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE"
-+        GAME_INSTALLDIR="\$(prefix)/share/$PACKAGE"
-         ;;
- esac
- 
diff --git a/srcpkgs/Maelstrom/patches/struct-button-typedef.patch b/srcpkgs/Maelstrom/patches/struct-button-typedef.patch
new file mode 100644
index 000000000000..b551a393d0c9
--- /dev/null
+++ b/srcpkgs/Maelstrom/patches/struct-button-typedef.patch
@@ -0,0 +1,29 @@
+--- buttonlist.h	2000-01-25 17:41:32.000000000 +0100
++++ buttonlist.h	2021-02-08 10:38:39.377296739 +0100
+@@ -16,7 +16,7 @@
+ 
+ 	void Add_Button(Uint16 x, Uint16 y, Uint16 width, Uint16 height, 
+ 						void (*callback)(void)) {
+-		struct button *belem;
++		ButtonList::button *belem;
+ 		
+ 		for ( belem=&button_list; belem->next; belem=belem->next );
+ 		belem->next = new button;
+@@ -30,7 +30,7 @@
+ 	}
+ 
+ 	void Activate_Button(Uint16 x, Uint16 y) {
+-		struct button *belem;
++		ButtonList::button *belem;
+ 
+ 		for ( belem=button_list.next; belem; belem=belem->next ) {
+ 			if ( (x >= belem->x1) && (x <= belem->x2) &&
+@@ -42,7 +42,7 @@
+ 	}
+ 
+ 	void Delete_Buttons(void) {
+-		struct button *belem, *btemp;
++		ButtonList::button *belem, *btemp;
+ 
+ 		for ( belem=button_list.next; belem; ) {
+ 			btemp = belem;
diff --git a/srcpkgs/Maelstrom/template b/srcpkgs/Maelstrom/template
index 7b857125bd95..4cb1f301b4ec 100644
--- a/srcpkgs/Maelstrom/template
+++ b/srcpkgs/Maelstrom/template
@@ -1,19 +1,19 @@
 # Template file for 'Maelstrom'
 pkgname=Maelstrom
-version=3.0.6a
-revision=2
+version=3.0.7
+revision=1
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
-hostmakedepends="automake libtool SDL_net-devel"
-makedepends="SDL_net-devel"
+hostmakedepends="automake libtool SDL2_net-devel"
+makedepends="SDL2_net-devel"
 short_desc="Guide your ship through the Maelstrom asteroid belt"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="https://www.libsdl.org/projects/${pkgname}/"
+license="GPL-2.0-or-later"
+homepage="https://www.libsdl.org/projects/Maelstrom/"
 distfiles="${homepage}/src/${pkgname}-${version}.tar.gz"
-checksum=342557bcc89eea57af4272778d3511be95fe46cf75e291298a15caa49a2f0e29
+checksum=93680322f4b04d4727ea8e0b461f259b604dc69e7465cb91d2b9aad378a9a036
 
-CXXFLAGS="-Wno-error -Wno-write-strings"
+CXXFLAGS="-Wno-error -Wno-write-strings -Wno-unused-result"
 
 pre_configure() {
 	mv configure.{in,ac}
@@ -22,8 +22,7 @@ pre_configure() {
 
 post_install() {
 	make target=${DESTDIR}/usr/share/doc/$pkgname install_gamedocs
-	# Remove useless file
-	rm -vf ${DESTDIR}/usr/share/doc/$pkgname/Docs/Makefile
+	vbin Maelstrom
 	vman ${FILESDIR}/Maelstrom.6
 	vmkdir usr/share/applications
 	vinstall ${FILESDIR}/Maelstrom.desktop 644 usr/share/applications

From 0d1116cf9399b54053f3c7e0bd1bf9a388f55326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 8 Feb 2021 11:16:40 +0100
Subject: [PATCH 1201/3482] clamav: update to 0.103.1

---
 srcpkgs/clamav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index 6368b760ea7c..ebb89548c285 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,6 +1,6 @@
 # Template file for 'clamav'
 pkgname=clamav
-version=0.103.0
+version=0.103.1
 revision=1
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
@@ -19,7 +19,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-only"
 homepage="http://www.clamav.net/"
 distfiles="http://www.clamav.net/downloads/production/${pkgname}-${version}.tar.gz"
-checksum=32a9745277bfdda80e77ac9ca2f5990897418e9416880f3c31553ca673e80546
+checksum=7308c47b89b268af3b9f36140528927a49ff3e633a9c9c0aac2712d81056e257
 _clamav_homedir="/var/lib/_${pkgname}"
 _clamav_descr="ClamAV user"
 system_accounts="_clamav"

From 178a863bb64f9d85eaf286d4cea30e42862c2982 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Feb 2021 10:52:10 +0100
Subject: [PATCH 1202/3482] apk-tools: update to 2.12.3.

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 0703d80b596b..633ac417326d 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.1
+version=2.12.3
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=c81f6d9efdf0b3b7830b30e9133911c2e7ed68c082260a26dc82dc4553524035
+checksum=da0b3a3df2c5973bede830e8be73442443221a23afdac62f45b1e74c3ee30f0e
 CFLAGS="-Wno-error"
 
 do_install() {

From 5ba08ed160c583b04878f5cf13cc7aeba0a7467a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Feb 2021 11:53:15 +0100
Subject: [PATCH 1203/3482] minify: update to 2.9.12.

---
 srcpkgs/minify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 8d12278dfb47..9cb3cd788bf5 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.11
+version=2.9.12
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/${pkgname}/archive/v${version}.tar.gz"
-checksum=3c1ec8df223b818ae0fa93b0daf3ca750f063238dc458ad373f92556ad324e6e
+checksum=961dc55415f7115ff2115f82ba3b1eb88f520f2be845c49da6614a1788db2019
 
 post_install() {
 	vlicense LICENSE

From 437f1e10d0a4ced46995b24d929cbf09c166e639 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Feb 2021 11:55:05 +0100
Subject: [PATCH 1204/3482] opam: update to 2.0.8.

---
 srcpkgs/opam/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 1c24acba342f..be9a59f309bf 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.0.7
-revision=2
+version=2.0.8
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=42f18f3287cd61fdc40dba952f362f2193bd1328de75f688461d5a581c626595
+checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
 nocross=yes
 disable_parallel_build=yes
 

From 750e2d255c305a6180d749f34bef5d1e0dfa63e2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Feb 2021 11:55:44 +0100
Subject: [PATCH 1205/3482] perl-Log-Log4perl: update to 1.54.

---
 srcpkgs/perl-Log-Log4perl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Log-Log4perl/template b/srcpkgs/perl-Log-Log4perl/template
index e03dd9e8bfcd..b0e7f2983c7e 100644
--- a/srcpkgs/perl-Log-Log4perl/template
+++ b/srcpkgs/perl-Log-Log4perl/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Log-Log4perl'
 pkgname=perl-Log-Log4perl
-version=1.53
-revision=2
+version=1.54
+revision=1
 wrksrc="Log-Log4perl-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Log-Log4perl"
 distfiles="${CPAN_SITE}/Log/Log-Log4perl-${version}.tar.gz"
-checksum=8fbfb48d016eec7344a539f3ad70870b4ac4638e49666bfa70d10f6ffd4ac38e
+checksum=bbabe42d3b4cdaa3a47666b957be81d55bbd1cbcffcdff2b119586d33602eabe

From 702de3d4ec85ced429bb104e2760571ddc20c4f3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Feb 2021 11:56:31 +0100
Subject: [PATCH 1206/3482] python3-pyinfra: update to 1.3.5.

---
 srcpkgs/python3-pyinfra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 953ef3823515..d70ca72f0ccd 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.3.4
+version=1.3.5
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=c33f1c4e716fc0aba7d49f36467c5983e37e9d02ad94c3036ba07d8c61fab5c3
+checksum=c9081d3c640994cc3efdc5a7ebcfcc9073801beb4e060971014d81c07b4dd04a
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From beb467c28e7bd364d4a94936910e432ca70916c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 8 Feb 2021 12:05:29 +0100
Subject: [PATCH 1207/3482] firefox-esr: update to 78.7.1

---
 srcpkgs/firefox-esr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 51ea21fb920b..e0b2eabade01 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.7.0
+version=78.7.1
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=1aa041db28cd742e93d663a9da8defd33040b38d8b9470350538473251621643
+checksum=5042783e2cf94d21dd990d2083800f05bc32f8ba65532a715c7be3cb7716b837
 lib32disabled=yes
 conflicts="firefox>=0"
 

From 7c2c1b223fb9576be063935860a734192fad9c43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 8 Feb 2021 12:05:53 +0100
Subject: [PATCH 1208/3482] firefox-esr-i18n: update to 78.7.1

---
 srcpkgs/firefox-esr-i18n/template | 188 +++++++++++++++---------------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index 3a5f568b6eb2..13f5cbdb804e 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.7.0
+version=78.7.1
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="e0680e2bf60e550998b86ecd04d34f8b4e76e3bb356d2061231af690c9a3c2e6
- 70dddb39c8cf269b1975e4828204275dcb0b8e8c579f3fe572cf912680b3be94
- d27d6525afc388fe2bb4a24ca635c6b361534c2d6510e40b01144c74025e5355
- c8f3dd4ce919435317dd506ad532d84c27f58e2208b443586ce9b7b97ad1c333
- 07f0a5bca9361af2cdbd6564ae3aabea1ffd7682dd4253b456294a7aaa2c4fd0
- be86979f9dc828b700ce05dd312bb02cab482ad389a0103d6aa4baa24b19bc14
- 9498b1fffa6bffd98ca29e2a7fbf71291a023746d35275596d3d0819c00c74ff
- 96be0d5fa322388a0b8d9e6b2633c03cc654cb18ae37f80fc675537d87b11c89
- af7042ae5777c5b634c8ca044d0b9d3188ae22f386b769e8c0e920290fd5704d
- be6380eccbe91b3aec03fcb5c46278ec87f61d8c7e9677f2ef47f983c44d0cfb
- bf840c2319ea9881148af9f20dd2ac83d57cd9e685d40b76dae3c239292f74b6
- ccec321436bd37f548807d5b454819a772bf53222c0318d0609572b2360202aa
- 2ab653f9a863ed9da46da4a4618681ed231ef58ca069f2e076786b95db3c6f14
- 2298d3af606f4a1a516e903d5cb3fdb47110e385d5bd2aed6faa85a89b60164d
- 1f3c877cb4e1d6685bd3602579287e2d93bfdc49c3d3dd56ab9c12c1892c1551
- 4f2fc2a2a4e0b2d1197119b8bac77d19fbb3ee745b114e8b62e0f6d325dff5f3
- cebcb5b8c6f8d5bdd5aabac064fff4f70cc8047662ee2ea6dc892c1a843165fb
- 799c7931302a33a2f61be7a43f2619729ad7702fc3530c293944637f18daa739
- 6137f868d7023af0166935591ff8c33f910f08be0b4c9bb631fc12ceb7965587
- 7525673f9cd4db238dbb3c478edde1089e4d45d1939a13b135a44679c2cdf2e8
- b804d47f398dee126352f81b83baa40d8936c062cc40705b70bdb16dbf646958
- b1bd30e53070b9ad7d3c4ce392da4f9fcc800069f6c064ab4e2b6eb70a081952
- 7248db932ca9beccc23c8c179e0adc0f4b2a280cb3a62d6b0bb91941772471fc
- 7816adfbdedc2a0ebb90ed54823dd3320ae4f4ee200c00105249b37bbf3b552e
- 9e0fe5d6790a3283642404f29bebb06e8f6368a1b4ec35a55c2baa585f4fafe3
- bfd19f18c78f91aaacd6a77b526845ae7e43c24c55149fce39c03ef8da63121d
- 0e10a7ea0f3ff9a2d83490b500c383b8c483d0a22885a5174e415f2e632ddb43
- 3ae8d77fa6baebc128b7eadc85e59a45a194cc782a03365af0054ef7b6c131ef
- b3a0335e35c60cd867948f1f25ceba5ede118966d585a8b272d6976ae018c96e
- 0fb538b79ac396be79b123aec8591e2604090f12e7ce7a1d2a439152be015fb7
- 3e4b4d7bf8227ff768063b3ec5622b6ab3d3a23249c4a03dfa096026a5cd5d10
- d251feda253e695c77b93860a2ab00f3e99fa90e0b05756ae771ca6156b344e8
- ce4d7e9c3ffab3122ec116b3e0ea18e0d5e8c23d2c121d1507180477e76bb80c
- 479d7bda7991b87a287a00e985c538d2055f2cf22e6cc7121aae1fd4cf1e9757
- 21e8ffe1a6919962bf286385b54e1859e23eb337c0cb4fbf310d722feca54e3f
- 548009e17942238de9a2f69bcb226d32dded300e901a19026602d1141126fb85
- 9af6ee2975ac7a1c2f4b3c1bd63a9f1fb4d6db04131aafbb9dca4f497df8677b
- 360e655189f1404655989623bef3fdb6da33846a779f2196b1cb80ce3799ff63
- 7bf793bdd0322c9a871a564d7a7e3eecb36401b4c98a2c417f7ba11f4d9d8ed1
- 26cce49dd6bdee1490a1cc62210c91e32c875494c473e937c96999b119614b89
- e2b20759682a9dabf22e8b7f52840dd603af7aef7dbe46d5c66c76c80d664958
- 7d2b6baa832d5f3ef03849ba5f5d79be513869cdb7a06a3052f30b9858d72fe4
- 6f2a3129858f2c439a4f19507215cc54406b65edad25a0f78bc3568583b2fcc8
- 929e84780fb4907525511547a40497413b0ea5ec591a013c4d675822580939b4
- 1b1eae14a4a5b9d88866a5a9c03d3ed4b87c6189c0f6fd33027fe94b1879f3e7
- 4b44b4cc69718604a866fd16295e814a38e49012a7da423b3e24308f49c99eee
- e050321ef8fe64ee6073c63461bccc95a3adb27533c9a70c84d290f9e67ce1c2
- f867d5579ff631ccb08d40dd0ebc94f202a205cfc77b381b88527fd113af851b
- 849fc82129c125b41aae2cebcb6dad070cf156eb491662f9fc3aae3a8450a4b5
- 6e4b51223d2c0ecdf792d5728ec893afa6e5588d6be024e49d18233202918f25
- e38865f03a27fa6754c1e16d7519f6378676f8da3ea6c96833820d74b2babb89
- 21d19019d90eec96728c50eebc0d1c3a8fa39481e999dc56bb01cee9d05816c1
- ab9e68d5497f7d1505a58842530f3e24e292247dfd01d694ddc6de22b5ed4e1f
- 149ad1fafc2e44f232521473df66198c0e70be03f5bfc6db2502174090ac986a
- cc7bee0d016416207e97e006d7f84e5e680e914cabaffa4f6d36ca68ca8e9168
- a22606075c78c814dcfcf5fa85514fcd026a9b71519138d74c9012a47a6c6e30
- bf99363e1849bf0ce4107639fee3b2b3eec4eccf21e24082c9c565f03d3899d3
- e4e003a2552434c5489865aa666e664c71342b7d842b33d8b650ed841bcd49c8
- 2f076598229ad82565ecae1458321c8497128aa8ac409c305f21281b90a3d46d
- d460168e536e0560fb8444b2e79cc2f30f80699942cc40c8e93f93c8c9e3607a
- b189e3d4d90e2d3a7d85a0a9381a3efe9fc7bdb3e8ca074ad1bd2d9b0c06220a
- 249f5ffa15a2373c034b6c2c38377d6ef61cf063c1b906a3becb38f38167ac8e
- 646c87f5918a6c261ec883aa589f42b00831d8d9b827e17b2a50fdf1237c0cec
- fa49ea2518c0d49ecac0881d480a6ec991bf4a5e74c7f049061d51b07ccfca34
- c824290dd4715abcae813491b974ce7a306eb2a07ba495a6925ec8b9a11953a8
- d3ccb2b9c1ec7ba46dbd2118bd6fcf442d6b28927a4821ed0b503b5ec7a0b024
- d280632c05436c3639b607cbaab0b268e7f03f7090ee86c5fb3fa72bb385db95
- 922a937523f222b87d8ee30b74b5dbaa7e895989e4c0ea4e293e64751178e564
- 90caad4cff7db7838673aa7ba6635de68937c5146cf955b6686be924115d2d5d
- 3613227480ae4ae19a00673d9cd50014b9c42ae0f24c241b111693d03e49e92e
- ff399f50ab7f52b9899c4e33da944ba8649fbff1b8a6e317a912a130bec7ce90
- c21864cf17d6d8b6d8ead7d221eb19ff1d51842ddaecc961116c1e4c69426301
- ef1e3a66f66cf5850f060dc02607de6d35ab27a7aa5512bf87a03a0492e8a0f1
- cd1a549f293eadf20460f71d31182081e37aa7971073c68b27615937d7dde78a
- 53751982192bff3bb6927f954f7307ae42ff0a592298f4c7d67a687372307d17
- 35e0409118384857a4f6e0576362e01046c7b871c40a71dde4ee47c41305fc7e
- f4c1dc455166d1eee3199215b4b521a5d33156ea6c5607eaf25a16cfbb2157b4
- 9299724da6721b598508e4b4b3e612155175bde60c276ec83b8765ea67d96132
- a61ccbb3eed3089a3ee5233333f2501d4fe226573828b6fb3fa314e1df0ba972
- 00357932c13c8004c9766ad5eba0044d99ea2127971800ebc0ebeabb389b0bad
- b1e699ccbb0b12d5bae96f1353c81635ce5bac471505a8407a2af1aa1e7313e7
- 20d9500429a5b9b2f6341b8d1af95bfba8ec9e16757bf4cbf75dc71a0571da79
- fb1293643e647f947a669a113d179cadbb8fdd3e563a08f569f8ed35ee3bd94b
- 1b810baec4acfa15bf8af63dded213d6ba5048eec11dd721e08b7e936616cb70
- bfa27acd239c7978e7fb8555e4ed6de6d65701ce4ca2abcfd7e4358ec3bba3ca
- e4a806b55579cd7f6a1de04c601644af122cad80a1777314d2d13305fd48b162
- 2c919b76de1ec61a36905d0c5ffebf21bfed8bea177f917a9412ff6e8ff99d72
- 0817006cf0288f31e1fd496f9a33f42dd63de368727a70a8a0e6d7ff7bdd48ac
- 6f54c41fe252a9ddbe245e525c96804636ab03598caf014b75f6d482a752210b
- ae0916d2154ee8231330f05fb848bf041190c9453be130e39164192a57ea0c69
- 8c0045761f74fff9b012785913d9b38f0b829f969d7770fbb04a6b01fec05d44
- 6e79fbbf5bf4d8444302c626b05b57b5b25726d1a890b3c5bf43d425a3ba51e2
- 61288b7808de9ce97a4750569362ff918d6c4476fcf620ec742b2270a9327d1a"
+checksum="4e256f4fe1f215e61e15d2293c0392cd609d838e4faa93d221fb2c8559f6c22b
+ b06029e41fb1f443e7ecaf746b14bfbcd496cba16b9e5958e402ab2b2ad0d81b
+ e4f2942935b10474428f47d7a4b667a826bc77d050c529518ad2980362a2c676
+ 5e7f49043481fb1c00fc1b81f83e72253d811ab7ac993c5c697c4e37092b87d1
+ b2c7af5046dc83797e337e69f17f1dc89130b54e3236b1f9ea18ea69afed755e
+ aa3610ec954b9319dfeea91f2d1c92129b28c1a12dcae77b4214707318fd5da6
+ debb15858da6c4f98466d4db3a419aac0eb21df49b7d2fe805a6d61dc21545a4
+ 5fc2da27aae891521847355148b047d0f683ea58d3d6b905239d0e5fe09afa4b
+ 78bdcdde0f035fe08c71d89b43ab556c636d310d0a9e353c127b1a11aba86498
+ 966c32aa7186a7cdf246dfee5accc21d1284470365fc71fb65c949cd708aed49
+ eced326911ba57411ce55ec985e709f03c66d27af7425a8ff76789e23be0debd
+ b290a49d74b18f6a5ac48fdd50a401c9fd71b3338e30729f050c92756af5bc6f
+ 752e1e9fa8197c908452e44d339864a0e841923a17da1f47b4352785439c5ff5
+ 8da55671ed31230a2ff291492f8d0d81870d2e552a7fdee13e7e66d4cf01c6d6
+ 897bc87f85319d11b407b8e45f697b17ab9874f527ae695b7d96542320f10846
+ bc9ae89206eb043df901f6c515e4ba5a3c504a06adf927037aa14398094e5756
+ c1501a3d15f31c00f3a961fde8c646212808f8b71e1ba8a0a488a4ca88404e05
+ bffab2d9fad7fe34c061e18947ac06a7cca03846d40a5358e6a2e1cffa2d4c97
+ 35a704ca8820e6404f914120a48b0b19bef172310d2fa32dc623400361772d21
+ 1b3ca385dd58763c2ad13ad4311214fb517f62bbd9c75e7c08c4913896c13cdf
+ 82a21979ddea99274a10bf7d13d9ab8dad1e2abb616b392c2c2377f3fb3060a1
+ 71b92fcc3f7e6c88b2c1b431b1a6a76470c8c675cef1544408b2f2e47037ebac
+ 2d07fa168110e5dc4c8503f2a69804ecd571ab7c9aeae4e151f870f2239dae37
+ 6feec550585eebe5817e325c8d95f05042fd6e2b2854b7dececc26526c379cf8
+ 05e351be35b0dff5ebaca4f7b41682f827cc59e256288c8c76a4fe30335e9847
+ f615cb924a04bb890be3752fa34280bdb373dc7d136838f8d841589b7f3e4635
+ 6eb14eb2664d4af6a33dd418523f79ed44099ea70536d55ad9ff4f23a8f6154d
+ 2900b1a7166f00db9d4773d914f7618e0775c39403d5f7920302b2448e12a592
+ b44f4e19d2614fe15907a6b04781a01717de380a9429ccf09aec9f7871dc3580
+ 78cea09fed9a4da03df254f8fb4bc80e1783155d1f571f669ee8df38a9375fe0
+ aa18387cdec96368af5ebd8be8a39f9a260eb7451835fd8e786045be7e846756
+ f041bb65f537b6591c0dd71855b7fae018b7c9947b7dfd4b003b1870442bdefd
+ de41f38f54932eb294358a50e4fd6907148cf4aa1e01c07281ef4f2a4461dc24
+ dfc55aeaa870f23a8bce2c464e0a59b52a3fab2b8d02067d2bee56edecd0aa95
+ 7a0806f9ac79555f25332145fa40ec236946755d726f5da03a6e7ce1f55dec77
+ e582d1a508713fbaaee55878b1017b43f0b8db299f9a28cddd1da3e4196a3589
+ a256585b4d7b7e8e1476ffbc3b22eb104d6a79237db443f6d3858159783dee72
+ 273f1f401bcff8e8a2dfec7abf629aad629b4c6004633ebb282bf29c90b9b9eb
+ 991022748c22e1091775c1c47c53ea9865bd36627f1c37b47b15799f27ed83fb
+ 5758ad602791f5dffc7331085ccd9e4a3aa8717a6f1105560a22998ae09d6b8b
+ 0432f7fcff52d5e43b158ea27f8f20dca9693b5ba2505e94e096dba92c950305
+ 0b73bf4682571bb0d99cf44dc6c73d4828d72bf45302d972405646195660b495
+ 55c7a55d5d9a94c029f77a9c98961a4ee4387c4cb49006a4f023792bcaeda0ab
+ a63dd3ce876fe16a5f10d56faffb40821a29b2f48f65e8d457c172d866cdaab4
+ 8eca8cfc8fae8ef694ad0a0f4c6c2a83fb772a5f0e8658c194699c7d21f07929
+ 482f91dfdd71bd8fbd30bf751b76dc59233dc449d3aa889a6357baf084c04116
+ 806080097531bc01738b1c032374cdda8812a95303ef7a85026100009c2316aa
+ 85ee396716437c000aea5460d0307da7c1d2a782fd546bc3d5d3f6f2c0285295
+ dfc0e789015fc9c1723937909764743ac7a6ea86a147e7adec17821143102319
+ 052e1016a547879a7fb285de067394f62653435badf24140ccf59bb658780afd
+ ae05b78d4dbbdadcb2847379c2bd4b1265b953eb69f5cc27f6a254862d1dffb0
+ 980d5e7a37d10365ba9291165a26e6f723309711ac223b2b9ff95319b3c4d762
+ 6a27e6ff4fb27e2f87676426143dc65a8f048f8840d9e34291c287d0fa2af238
+ 85ddb9b00e0e83d2f8d9df120bf3759e2db66bd9d0eeee0fd95d07d81cacd627
+ b3fb0547f310eb20c1841dff47d0bc724ba7e7585855d8d464f97fefffbfa237
+ d6b6a791154ba88cf26c430043eb908c59d87e770b9c616e764b3d065b8eae5a
+ e2beeff16bffe3f497dd4a8cf65b499d83a14f6e93ff7f4b456b9458ade9bc57
+ e37c674e16a9c2fbedd7b86401087f4016c1407f35a74d7a0481b1f937d5a902
+ a1575692da0a613a4e17f8a3769e48dec08620eeb90b7ddf421fd11d8d8421f0
+ 12464ad98f42aeabccc2a644a2cb9b59e278dcd79d5eb4752485cf91fefd1ff9
+ 1307b1ac5e73aa67a53681b25ac27e45ba2e52ddbd6a8db15d0be9aab609a46e
+ 84ad37b59e2b953aa0e71425100ecb5353890fec4b88d0923849de10aade3594
+ b6586134abeebad3af1096751fd01fc5f73b83f36623421d1046dc30187aef0d
+ c9398af0216e5cfe353915285cb14dbde1594e4167feba43fe798f60c6b35ce7
+ d815d8e9234083209e7ce813884378aaaa48952f285bea06a1f9ac5798748cd6
+ 9e025ebfb5d9c7b8e94dad81871625f3590fda5b77911ddcfda254046b1eded3
+ d0d8898d2c27126d8f1c4c85a35947cb3a61275edc2ce06cf2fc90be9b9dd2d5
+ 015959a9b31dc05e23e7907fbd7408e4a89272cab8d925f2dd9640191d9ac35b
+ 32e55abe10a31cb2739a6351cba5397921c872195fc0dc6c7dbac4f2bfbf45ee
+ 2836aaf24ab686d82ae8fe0e28b888594b64ae3662510057cb10a19928281822
+ 9a5a87d7a8e188496cd3022317485824c33ff9c4c051d65142d21440a00f62fc
+ 36ffa4bc0b734256445f05cabb9b94002030dc7df40e6173102a6b1903cfb065
+ e4c5d478499a9a45c1007be7964347b563125488b46d7fd5382c1d93c5a7e559
+ 1948e8516857babf66483509eb21f723a45ab91e9b2dd7f24557c85c6c3cd724
+ 437c5ba428b36304cc198351b70d8d89e1542d7224a32cb4ae51252e4754b42e
+ 03fe23b6830dd820f744dd10f160bcfe3ea8fd06d239cdb3e6a832452c61cffa
+ 7271d2c4355b0cefa9c980fe0b4a11269d99704192266f90523eb12e082e987f
+ aa7432ebf8e1fe8cab55ace1ecd626f531e9640922800e39e86e4eff453b3f7c
+ 21e2c979d656bff07c7344e5415218eca6f8199455a4cdade9d11ed4ce69680b
+ e0ad96b121d2c91a4e66681f7482491a02fd07fad2c4f1a1b47302e1c251910e
+ 3d54cc2bece8b3aac804af473609e57c530c9b963db1978717ee8398f0982187
+ 414b3625ce5e7e5715439499c38f3d9c21d43e1292ae30477869a31892c74901
+ 5aee7a247ac12f675bd2aeee2a06d11d14d2cba9be7e5ec8988b73a789a718ea
+ 162d10d749f87d618f95bc76cf4c5c5daf15f083a07a0c015b832d357f00f02d
+ 231b8e77b2aff3643c22debc31100a73f95e656808cae1a36308f679b629f783
+ 43e1662cf5d2c4136680929807c60e2dfe43bbad3c057a5ba1e90c923a3a2625
+ 1d167e982c9c384cf006ee50e442c4940f2150830139721897b62fe598cc51d8
+ 0d56608553393423574e96d8ce07cfa69c3fd193a987eeaa8b2a24d4bfb6ac83
+ db5adddcc90ab144c905a2e643a3b82aae7b3ed6d82efb9fcf7f203d62129401
+ 546b4708e4d8465219ea4da888928abd47033bc5be707abc3b890a10475b7361
+ fae69733559c2a64af1ccb47ab689e989b73474cbe8c5817fdf39068baf521ee
+ 6cd38d33bba918fb48ddb53196c69384400cf73806019451f043e7159fb2c949
+ 20eed727653516ec43fa3aa0d8c961722b4576cff7238138600d4f0ffaa79776"

From c48c846c9d0c155ab6a8107f492bcc73aa770eb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 8 Feb 2021 12:22:09 +0100
Subject: [PATCH 1209/3482] libmpeg2: fix build on ppc*

---
 srcpkgs/libmpeg2/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libmpeg2/template b/srcpkgs/libmpeg2/template
index 010c4e690c82..83abab0f9779 100644
--- a/srcpkgs/libmpeg2/template
+++ b/srcpkgs/libmpeg2/template
@@ -13,6 +13,11 @@ homepage="http://libmpeg2.sourceforge.net/"
 distfiles="http://libmpeg2.sourceforge.net/files/libmpeg2-${version}.tar.gz"
 checksum=dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*) CFLAGS="-mno-altivec" ;;
+esac
+
 libmpeg2-devel_package() {
 	depends="libmpeg2>=${version}_${revision}"
 	short_desc+=" - development files"

From c3b3ef96d9c1ed038ad542101da89827f208cdfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Feb 2021 18:19:29 +0700
Subject: [PATCH 1210/3482] build-style/qmake: remove RPATH for native build

Fix up for 596a2da188, (build-style/qmake: no rpath, 2021-02-07)
---
 common/build-style/qmake.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/build-style/qmake.sh b/common/build-style/qmake.sh
index 2795d77d3725..90f541b7bd1c 100644
--- a/common/build-style/qmake.sh
+++ b/common/build-style/qmake.sh
@@ -126,6 +126,7 @@ _EOF
 			QMAKE_CFLAGS="${CFLAGS}" \
 			QMAKE_CXXFLAGS="${CXXFLAGS}" \
 			QMAKE_LFLAGS="${LDFLAGS}" \
+			CONFIG+=no_qt_rpath \
 			${configure_args}
 	fi
 }

From 87b0be15e3ded804082ea344f245b9d7f2c406ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 8 Feb 2021 12:52:03 +0100
Subject: [PATCH 1211/3482] dssi-vst: needs wine-tools in hostmakedepends

---
 srcpkgs/dssi-vst/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dssi-vst/template b/srcpkgs/dssi-vst/template
index e8c2caed8b34..8b541cd5f220 100644
--- a/srcpkgs/dssi-vst/template
+++ b/srcpkgs/dssi-vst/template
@@ -5,7 +5,7 @@ revision=2
 _commit=b061c4360a89d3b69bfc44f63bc1bd33e2807f6c
 archs=i686
 wrksrc="dssi-vst-${_commit}"
-hostmakedepends="pkg-config git"
+hostmakedepends="pkg-config git wine-tools"
 makedepends="zlib-devel jack-devel alsa-lib-devel liblo-devel
  dssi-devel ladspa-sdk wine wine-devel"
 depends="dssi ladspa-sdk ladspa-sdk-progs wine"

From bb914f77d2c808e7190b82ffd8bf55d4a136ee34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 8 Feb 2021 12:56:34 +0100
Subject: [PATCH 1212/3482] goaccess: needs autopoint (gettext-devel in host)

---
 srcpkgs/goaccess/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goaccess/template b/srcpkgs/goaccess/template
index fc08a1f33cb0..6207104a4efe 100644
--- a/srcpkgs/goaccess/template
+++ b/srcpkgs/goaccess/template
@@ -4,7 +4,7 @@ version=1.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-utf8 --enable-geoip=legacy"
-hostmakedepends="automake gettext tar"
+hostmakedepends="automake gettext gettext-devel tar"
 makedepends="gettext-devel ncurses-devel geoip-devel"
 short_desc="Open source real-time web log analyzer and interactive viewer"
 maintainer="Bart Kerkvliet <bart@bannarte.nl>"

From 2b64e03a1141f52b55f713f9d18b3c5e94e2d6d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 8 Feb 2021 14:50:35 +0100
Subject: [PATCH 1213/3482] nodejs: add libatomic-devel to {host,}makedepends

Also architectures where XBPS_{TARGET_}NO_ATOMIC8 is false
, e.g. armv7l, are linked against libatomic, so just always
add that tiny dependency to {host,}makedepends.
---
 srcpkgs/nodejs/template | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 7f305afc2020..3d84f1c0de6c 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -4,11 +4,11 @@ version=14.15.4
 revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
-hostmakedepends="which pkg-config python3 zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
-makedepends="zlib-devel $(vopt_if icu icu-devel)
+makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
  $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
@@ -47,13 +47,6 @@ case "$XBPS_TARGET_MACHINE" in
 	ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
 esac
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-fi
-if [ "$XBPS_NO_ATOMIC8" ]; then
-	hostmakedepends+=" libatomic-devel"
-fi
-
 CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 

From c8fd7947feb4d246fd57d2b7d9cf5696d9ca6e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 8 Feb 2021 15:02:31 +0100
Subject: [PATCH 1214/3482] nodejs-lts: add libatomic-devel to
 {host,}makedepends

Also architectures where XBPS_{TARGET_}NO_ATOMIC8 is false,
e.g. armv7l-musl, are linked against libatomic, so just always
add that tiny dependency to {host,}makedepends.
---
 srcpkgs/nodejs-lts/template | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 7cf737209773..c19a4b0198eb 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -4,11 +4,11 @@ version=12.20.1
 revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
-hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+hostmakedepends="pkg-config python libatomic-devel zlib-devel which
+ $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
+makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
  $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
@@ -42,13 +42,6 @@ case "$XBPS_TARGET_MACHINE" in
 	ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
 esac
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-fi
-if [ "$XBPS_NO_ATOMIC8" ]; then
-	hostmakedepends+=" libatomic-devel"
-fi
-
 CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 

From 2e9eb22ac061b36ff8657bdd0e55b4ec22257da7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 8 Feb 2021 13:28:10 +0200
Subject: [PATCH 1215/3482] audacious: update to 4.1.

---
 srcpkgs/audacious/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/audacious/template b/srcpkgs/audacious/template
index ba0fbf3c35b7..df154bf52f2f 100644
--- a/srcpkgs/audacious/template
+++ b/srcpkgs/audacious/template
@@ -1,20 +1,20 @@
 # Template file for 'audacious'
 #Keep in sync with audacious-plugins!
 pkgname=audacious
-version=4.0.5
+version=4.1
 revision=1
 build_style=gnu-configure
-configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
+configure_args="$(vopt_enable gtk) $(vopt_enable qt) --enable-libarchive"
 hostmakedepends="pkg-config gettext glib-devel $(vopt_if qt qt5-host-tools)"
-makedepends="libSM-devel dbus-glib-devel libguess-devel $(vopt_if gtk gtk+-devel)
- $(vopt_if qt qt5-devel)"
+makedepends="libSM-devel dbus-glib-devel libguess-devel libarchive-devel
+ $(vopt_if gtk gtk+-devel) $(vopt_if qt qt5-devel)"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Lightweight, advanced audio player focused on audio quality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://audacious-media-player.org/"
 distfiles="https://distfiles.${pkgname}-media-player.org/${pkgname}-${version}.tar.bz2"
-checksum=51aea9e6a3b17f5209d49283a2dee8b9a7cd7ea96028316909da9f0bfe931f09
+checksum=1f58858f9789e867c513b5272987f13bdfb09332b03c2814ad4c6e29f525e35c
 
 build_options="gtk qt"
 build_options_default="qt"

From 42f25a53aa5c9ab38b5e7c5bbadc458570215017 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 8 Feb 2021 13:28:16 +0200
Subject: [PATCH 1216/3482] audacious-plugins: update to 4.1.

---
 srcpkgs/audacious-plugins/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index f9f969fc821e..ea24c316e3ad 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 #Keep in sync with audacious!
 pkgname=audacious-plugins
-version=4.0.5
+version=4.1
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
@@ -10,14 +10,14 @@ makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel
  lame-devel libvorbis-devel libflac-devel mpg123-devel faad2-devel ffmpeg-devel
  libmodplug-devel fluidsynth-devel libcdio-paranoia-devel wavpack-devel libnotify-devel
  libcurl-devel libmtp-devel neon-devel libmms-devel libxml2-devel
- libbs2b-devel libsoxr-devel libsidplayfp-devel libcue-devel
+ libbs2b-devel libsoxr-devel libsidplayfp-devel libcue-devel libopenmpt-devel
  $(vopt_if gtk gtk+-devel) $(vopt_if qt 'qt5-devel qt5-multimedia-devel')"
 short_desc="Plugins for the Audacious media player"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://audacious-media-player.org/"
 distfiles="https://distfiles.audacious-media-player.org/${pkgname}-${version}.tar.bz2"
-checksum=9f0251922886934f2aa32739b5a30eadfefa7c70dd7b3e78f94aa6fc54e0c55b
+checksum=dad6fc625055349d589e36e8e5c8ae7dfafcddfe96894806509696d82bb61d4c
 
 build_options="gtk qt"
 build_options_default="qt"

From de12c78e2160f3935b1dd35e45210ac3e21a1912 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 8 Feb 2021 13:18:30 +0200
Subject: [PATCH 1217/3482] New package: s6-networking-man-pages-2.4.0.0.1.

---
 ...8f959dd2f37a245de3f22babff34f445948ab.diff | 41 +++++++++++++++++++
 srcpkgs/s6-networking-man-pages/template      | 20 +++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 srcpkgs/s6-networking-man-pages/patches/b608f959dd2f37a245de3f22babff34f445948ab.diff
 create mode 100644 srcpkgs/s6-networking-man-pages/template

diff --git a/srcpkgs/s6-networking-man-pages/patches/b608f959dd2f37a245de3f22babff34f445948ab.diff b/srcpkgs/s6-networking-man-pages/patches/b608f959dd2f37a245de3f22babff34f445948ab.diff
new file mode 100644
index 000000000000..802a091c8ba4
--- /dev/null
+++ b/srcpkgs/s6-networking-man-pages/patches/b608f959dd2f37a245de3f22babff34f445948ab.diff
@@ -0,0 +1,41 @@
+diff --git a/Makefile b/Makefile
+index 065f1dd..15d5322 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,21 +13,21 @@ man1_targets = \
+ 	s6-taiclockd.1 \
+ 	s6-tcpclient.1 \
+ 	s6-tcpserver.1 \
+-	s6-tcpserver-access.1.in \
+-	s6-tcpserver4.1.in \
+-	s6-tcpserver4-socketbinder.1.in \
+-	s6-tcpserver4d.1.in \
+-	s6-tcpserver6.1.in \
+-	s6-tcpserver6-socketbinder.1.in \
+-	s6-tcpserver6d.1.in \
+-	s6-tlsc.1.in \
+-	s6-tlsc-io.1.in \
+-	s6-tlsclient.1.in \
+-	s6-tlsd.1.in \
+-	s6-tlsd-io.1.in \
+-	s6-tlsserver.1.in \
+-	s6-ucspitlsc.1.in \
+-	s6-ucspitlsd.1.in
++	s6-tcpserver-access.1 \
++	s6-tcpserver4.1 \
++	s6-tcpserver4-socketbinder.1 \
++	s6-tcpserver4d.1 \
++	s6-tcpserver6.1 \
++	s6-tcpserver6-socketbinder.1 \
++	s6-tcpserver6d.1 \
++	s6-tlsc.1 \
++	s6-tlsc-io.1 \
++	s6-tlsclient.1 \
++	s6-tlsd.1 \
++	s6-tlsd-io.1 \
++	s6-tlsserver.1 \
++	s6-ucspitlsc.1 \
++	s6-ucspitlsd.1
+ 
+ man7_targets = \
+ 	s6-tls.7
diff --git a/srcpkgs/s6-networking-man-pages/template b/srcpkgs/s6-networking-man-pages/template
new file mode 100644
index 000000000000..627b0db3891d
--- /dev/null
+++ b/srcpkgs/s6-networking-man-pages/template
@@ -0,0 +1,20 @@
+# Template file for 's6-networking-man-pages'
+pkgname=s6-networking-man-pages
+version=2.4.0.0.1
+revision=1
+build_style=gnu-makefile
+hostmakedepends="mdocml"
+short_desc="Mdoc versions of the documentation for the s6-networking suite"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="ISC"
+homepage="https://github.com/flexibeast/s6-networking-man-pages"
+distfiles="https://github.com/flexibeast/s6-networking-man-pages/archive/v${version}.tar.gz"
+checksum=d7de2f957873fae4fd14d3aac9d0621f70cf513fcee91d2c42e119eaee4a5f10
+patch_args=" -Np1"
+
+do_install() {
+	vmkdir usr/share/man/man1
+	vmkdir usr/share/man/man7
+	make MANPATH="${DESTDIR}/usr/share/man"  install-man
+	vlicense LICENSE
+}

From ee33337c9ec1bd82b6f94f7e0f89d44e8e3bd59a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 8 Feb 2021 13:19:20 +0200
Subject: [PATCH 1218/3482] s6-networking: add s6-networking-man-pages to -doc
 dependencies.

---
 srcpkgs/s6-networking/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 75ac1c3aa1f1..969f65823f15 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -1,7 +1,7 @@
 # Template file for 's6-networking'
 pkgname=s6-networking
 version=2.4.0.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
  $(vopt_if bearssl --enable-ssl=bearssl)
@@ -38,7 +38,7 @@ post_install() {
 
 s6-networking-doc_package() {
 	short_desc+=" - documentation"
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} s6-networking-man-pages"
 	pkg_install() {
 		vmove usr/share/doc
 	}

From fd832b026502439eb87849bd90fd2ec50d3e9fef Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 8 Feb 2021 13:10:39 +0100
Subject: [PATCH 1219/3482] rclone: update to 1.54.0

---
 srcpkgs/rclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 77b36459d307..93295ccbd5cc 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,6 +1,6 @@
 # Template file for 'rclone'
 pkgname=rclone
-version=1.53.4
+version=1.54.0
 revision=1
 wrksrc="rclone-v${version}"
 build_style=go
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://rclone.org/"
 changelog="https://raw.githubusercontent.com/rclone/rclone/master/docs/content/changelog.md"
 distfiles="https://github.com/rclone/rclone/releases/download/v${version}/rclone-v${version}.tar.gz"
-checksum=68b231a917872b36d73f48b19d2ba98fdaca467e9b433105fa7f4dc3b15f556b
+checksum=95f952dc059b842bd40338458b77657f7b5a1680c4ca837a3adcf83b63c8fda1
 
 pre_build() {
 	if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then

From fc9a558abc002ac3612a5e1ac37e024a4f5a5707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Mon, 8 Feb 2021 09:43:59 +0100
Subject: [PATCH 1220/3482] Clightd: Update to 5.1

---
 srcpkgs/Clightd/files/Clightd/run |  2 +-
 srcpkgs/Clightd/template          | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/Clightd/files/Clightd/run b/srcpkgs/Clightd/files/Clightd/run
index 979d7e955ccd..9170543376b5 100644
--- a/srcpkgs/Clightd/files/Clightd/run
+++ b/srcpkgs/Clightd/files/Clightd/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 sv check dbus >/dev/null || exit 1
-exec /usr/lib/clightd/clightd 2>&1
+exec /usr/libexec/clightd 2>&1
diff --git a/srcpkgs/Clightd/template b/srcpkgs/Clightd/template
index 79013c878291..f64c47da4914 100644
--- a/srcpkgs/Clightd/template
+++ b/srcpkgs/Clightd/template
@@ -1,19 +1,21 @@
 # Template file for 'Clightd'
 pkgname=Clightd
-version=4.2
+version=5.1
 revision=1
 build_style=cmake
 cmake_builddir=build
 configure_args="-DENABLE_DDC=1 -DENABLE_GAMMA=1 -DENABLE_DPMS=1 -DENABLE_SCREEN=1"
-hostmakedepends="pkg-config"
-makedepends="eudev-libudev-devel libmodule-devel polkit-devel elogind-devel libXrandr-devel libXext-devel libX11-devel ddcutil"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="eudev-libudev-devel libmodule-devel polkit-devel elogind-devel
+ libXrandr-devel libXext-devel libX11-devel ddcutil libjpeg-turbo-devel
+ wayland-devel libdrm-devel libusb-devel"
 depends="ddcutil"
 short_desc="API to read webcam brightness & alter screen brightness/temperature"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/FedeDP/Clightd"
 distfiles="https://github.com/FedeDP/Clightd/archive/${version}.tar.gz"
-checksum=39301b0cad2da9adb4b662b64563f35ad5b3724631d81c1db55c311bc10dec67
+checksum=ce5002ed7790fce64e323bd483d8e5dde70a7fa9bbebc8311f514e0d5a64ab10
 
 post_install() {
 	vinstall Scripts/i2c_clightd.conf 644 /usr/lib/modules-load.d/

From 1ee412551319389314fbedd76bf73049b8cf0fee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Mon, 8 Feb 2021 10:02:07 +0100
Subject: [PATCH 1221/3482] Clight: Update to 4.2

This update **requires** Clightd >= 5.0.

Removed patch has been merged upstream.
---
 srcpkgs/Clight/patches/bus.c.patch | 81 ------------------------------
 srcpkgs/Clight/template            | 13 +++--
 2 files changed, 10 insertions(+), 84 deletions(-)
 delete mode 100644 srcpkgs/Clight/patches/bus.c.patch

diff --git a/srcpkgs/Clight/patches/bus.c.patch b/srcpkgs/Clight/patches/bus.c.patch
deleted file mode 100644
index a0c4d3a1d6fc..000000000000
--- a/srcpkgs/Clight/patches/bus.c.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git src/modules/bus.c src/modules/bus.c
-index 00f49cf..7e65fef 100644
---- src/modules/bus.c
-+++ src/modules/bus.c
-@@ -2,7 +2,6 @@
- 
- #define GET_BUS(a)  sd_bus *tmp = a->bus; if (!tmp) { tmp = a->type == USER_BUS ? userbus : sysbus; } if (!tmp) { return -1; }
- 
--static int _call(const bus_args *a, const char *signature, va_list args_va, const void **args_ptr, bool expect_reply);
- static void free_bus_structs(sd_bus_error *err, sd_bus_message *m, sd_bus_message *reply);
- static int check_err(int *r, sd_bus_error *err, const char *caller);
- 
-@@ -66,7 +65,10 @@ static void receive(const msg_t *const msg, UNUSED const void* userdata) {
-     }
- }
- 
--static int _call(const bus_args *a, const char *signature, va_list args_va, const void **args_ptr, bool expect_reply) {
-+/*
-+ * Call a method on bus and store its result of type userptr_type in userptr.
-+ */
-+int call(const bus_args *a, const char *signature, ...) {
-     sd_bus_error error = SD_BUS_ERROR_NULL;
-     sd_bus_message *m = NULL, *reply = NULL;
-     GET_BUS(a);
-@@ -76,26 +78,20 @@ static int _call(const bus_args *a, const char *signature, va_list args_va, cons
-         goto finish;
-     }
-     
--    r = sd_bus_message_set_expect_reply(m, expect_reply);
-+    r = sd_bus_message_set_expect_reply(m, a->reply_cb != NULL);
-     if (check_err(&r, &error, a->caller)) {
-         goto finish;
-     }
-     
--    if (args_va) {
--        sd_bus_message_appendv(m, signature, args_va);
--    } else if (args_ptr) {
--        int len = strlen(signature);
--        if (len == 1) {
--            sd_bus_message_append_basic(m, signature[0], args_ptr);
--        } else {
--            for (int i = 0; i < len; i++) {
--                sd_bus_message_append_basic(m, signature[i], args_ptr[i]);
--            }
--        }
-+    if (signature && strlen(signature)) {
-+        va_list args;
-+        va_start(args, signature);
-+        sd_bus_message_appendv(m, signature, args);
-+        va_end(args);
-     }
-     
-     /* Check if we need to wait for a response message */
--    if (expect_reply) {
-+    if (a->reply_cb != NULL) {
-         r = sd_bus_call(tmp, m, 0, &error, &reply);
-         if (check_err(&r, &error, a->caller)) {
-             goto finish;
-@@ -111,22 +107,6 @@ finish:
-     return r;
- }
- 
--/*
-- * Call a method on bus and store its result of type userptr_type in userptr.
-- */
--int call(const bus_args *a, const char *signature, ...) {
--    int r = 0;
--    if (signature) {
--        va_list args;
--        va_start(args, signature);
--        r = _call(a, signature, args, NULL, a->reply_cb != NULL);
--        va_end(args);
--    } else {
--        r = _call(a, signature, NULL, NULL, a->reply_cb != NULL); 
--    }
--    return r;
--}
--
- /*
-  * Add a match on bus on certain signal for cb callback
-  */
diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template
index 348c6fdd46a9..5d9c87c2cd99 100644
--- a/srcpkgs/Clight/template
+++ b/srcpkgs/Clight/template
@@ -1,15 +1,22 @@
 # Template file for 'Clight'
 pkgname=Clight
-version=4.1
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="popt-devel gsl-devel libconfig-devel elogind-devel bash-completion
  dbus-devel libmodule-devel"
-depends="Clightd"
+depends="Clightd>=5.0"
 short_desc="Use your webcam as a light sensor to adjust screen backlight"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/FedeDP/Clight"
 distfiles="https://github.com/FedeDP/Clight/archive/${version}.tar.gz"
-checksum=84156f3dfd9ab863be25d3efc8b5d6d6043ba4a0b44259c2a1cee1367b3c97aa
+checksum=fc3c4952c755bad5f4274f69f5cc17142abb51d88d7c615873e3058edc1c1137
+
+post_install() {
+	vcompletion Extra/_clight zsh
+	vcompletion Extra/clight bash
+
+	vinstall Extra/desktop/clight.desktop 644 usr/share/applications
+}

From 8fdc2a4a36e00bbf3ffaf8eaeaeadbf2be5484e6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Feb 2021 08:55:37 -0500
Subject: [PATCH 1222/3482] python3-numpy: update to 1.20.1; claim
 maintainership

---
 srcpkgs/python3-numpy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 752fb593e483..6736ae3040d2 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.20.0
+version=1.20.1
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -9,11 +9,11 @@ makedepends="python3-devel
  $(vopt_if openblas 'openblas-devel' 'lapack-devel cblas-devel')"
 depends="python3-setuptools"
 short_desc="Fast and sophisticated array facility to Python3"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=f30566b4a0d168a6869bef55b5843a2c8ed743f136fc80b305d6b8604828aea0
+checksum=faadd54211fe33ec569795d29ce7662ec6b342b8778822a7658386de541101b4
 alternatives="numpy:f2py:/usr/bin/f2py3"
 
 build_options="openblas"

From a85268e44948ad00fe9b2fd0ba3654a253493fa6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Feb 2021 09:00:09 -0500
Subject: [PATCH 1223/3482] maturin: fix update check

---
 srcpkgs/maturin/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/maturin/update

diff --git a/srcpkgs/maturin/update b/srcpkgs/maturin/update
new file mode 100644
index 000000000000..845275249957
--- /dev/null
+++ b/srcpkgs/maturin/update
@@ -0,0 +1,2 @@
+site="${homepage}/tags"
+pattern="v\K[0-9.]+(?=.tar.gz)"

From c94f1b1e648075690b0e731477b1ebf851967028 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Feb 2021 09:10:27 -0500
Subject: [PATCH 1224/3482] python3-hypothesis: update to 6.1.1.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index f7304f48399a..7b0ce54a1554 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.0.3
+version=6.1.1
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=c5cdf04d720b4746f04a2a541c73d3e3584e98bd2024b37b17c06511b668336e
+checksum=37aa07c70037df7509bae54b19265c65129c2b61caf923a54d2155c7b12a086a
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 5d63e8f0b194a7a4866931f3359c8265d09afd46 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Feb 2021 09:33:26 -0500
Subject: [PATCH 1225/3482] python-iso8601: update to 0.1.14.

---
 srcpkgs/python-iso8601/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-iso8601/template b/srcpkgs/python-iso8601/template
index 0008dd90eb67..3c4f4a270af6 100644
--- a/srcpkgs/python-iso8601/template
+++ b/srcpkgs/python-iso8601/template
@@ -1,6 +1,6 @@
 # Template file for 'python-iso8601'
 pkgname=python-iso8601
-version=0.1.13
+version=0.1.14
 revision=1
 wrksrc="iso8601-${version}"
 build_style=python-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/micktwomey/pyiso8601"
 distfiles="${PYPI_SITE}/i/iso8601/iso8601-${version}.tar.gz"
-checksum=f7dec22af52025d4526be94cc1303c7d8f5379b746a3f54a8c8446384392eeb1
+checksum=8aafd56fa0290496c5edbb13c311f78fa3a241f0853540da09d9363eae3ebd79
 replaces="python-iso-8601>=0"
 
 do_check() {

From 29859723e09d02d372cd2a74d1962a206b71ec78 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Feb 2021 09:55:08 -0500
Subject: [PATCH 1226/3482] python-pytz: update to 2021.1; claim maintainership

---
 srcpkgs/python-pytz/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-pytz/template b/srcpkgs/python-pytz/template
index 7b248d9403b8..570d028d5696 100644
--- a/srcpkgs/python-pytz/template
+++ b/srcpkgs/python-pytz/template
@@ -1,6 +1,6 @@
 # Template file for 'python-pytz'
 pkgname=python-pytz
-version=2020.5
+version=2021.1
 revision=1
 wrksrc="pytz-${version}"
 build_style=python-module
@@ -8,11 +8,11 @@ hostmakedepends="python-setuptools python3-setuptools"
 depends="python tzdata"
 checkdepends="python-pytest python3-pytest tzdata"
 short_desc="Python2 timezone library"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://pythonhosted.org/pytz/"
 distfiles="${PYPI_SITE}/p/pytz/pytz-${version}.tar.gz"
-checksum=180befebb1927b16f6b57101720075a984c019ac16b1b7575673bea42c6c3da5
+checksum=83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da
 
 do_check() {
 	PYTHONPATH=build-2.7/lib python2 -m pytest

From 7fee0562d08297c395246d96d3ceaa7c75382dec Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Feb 2021 09:57:50 -0500
Subject: [PATCH 1227/3482] python3-more-itertools: update to 8.7.0.

---
 srcpkgs/python3-more-itertools/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-more-itertools/template b/srcpkgs/python3-more-itertools/template
index b460de2ea1f5..5b019166f5d3 100644
--- a/srcpkgs/python3-more-itertools/template
+++ b/srcpkgs/python3-more-itertools/template
@@ -1,21 +1,18 @@
 # Template file for 'python3-more-itertools'
 pkgname=python3-more-itertools
-version=8.6.0
+version=8.7.0
 revision=1
 wrksrc="more-itertools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="More Python3 routines for operating on itertables"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/erikrose/more-itertools"
 distfiles="${PYPI_SITE}/m/more-itertools/more-itertools-${version}.tar.gz"
-checksum=b3a9005928e5bed54076e6e549c792b306fddfe72b2d1d22dd63d42d5d3899cf
-
-do_check() {
-	python3 setup.py test
-}
+checksum=c5d6da9ca3ff65220c3bfd2a8db06d698f05d4d2b9be57e1deb2be5a45019713
 
 post_install() {
 	vlicense LICENSE

From 5a58660ecf271a1238f166743f8898fa76bcf783 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Feb 2021 09:59:21 -0500
Subject: [PATCH 1228/3482] python3-bokeh: move to $PYPI_SITE for distfiles,
 fix update check

---
 srcpkgs/python3-bokeh/template | 8 ++++++--
 srcpkgs/python3-bokeh/update   | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/python3-bokeh/update

diff --git a/srcpkgs/python3-bokeh/template b/srcpkgs/python3-bokeh/template
index c178672e4d63..01d495f3dc2c 100644
--- a/srcpkgs/python3-bokeh/template
+++ b/srcpkgs/python3-bokeh/template
@@ -14,8 +14,12 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://bokeh.org"
 changelog="https://raw.githubusercontent.com/bokeh/bokeh/main/CHANGELOG"
-distfiles="https://github.com/bokeh/bokeh/archive/${version}.tar.gz"
-checksum=05095741480ad23f0e6243be4dd5a1d377ff0123172a35242e6ee3a14ace89ba
+distfiles="${PYPI_SITE}/b/bokeh/bokeh-${version}.tar.gz"
+checksum=c4a3f97afe5f525019dd58ee8c4e3d43f53fe1b1ac264ccaae9b02c07b2abc17
+
+do_check() {
+	echo "Tests have unpackaged dependencies and require fetching data; skipping"
+}
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-bokeh/update b/srcpkgs/python3-bokeh/update
new file mode 100644
index 000000000000..890565bb7101
--- /dev/null
+++ b/srcpkgs/python3-bokeh/update
@@ -0,0 +1 @@
+pattern="bokeh-\K[0-9.]+(?=.tar.gz)"

From 6fbb5ddf372a1774b501d02d6ed83abd732b63f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Feb 2021 01:41:03 -0300
Subject: [PATCH 1229/3482] nvidia: make nvidia-opencl depend directly on
 ocl-icd.

This only works because ocl-icd is found in the repositories and
provides libOpenCL. If built without knowledge of the repositories, this
would fail.
---
 srcpkgs/nvidia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 8929bf8f60aa..db0ff9232660 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=460.39
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -286,7 +286,7 @@ nvidia-dkms_package() {
 
 nvidia-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
-	depends="libOpenCL"
+	depends="ocl-icd"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"

From ade6bfe76003095cbf31afe0e986598d150a3adf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Feb 2021 01:42:22 -0300
Subject: [PATCH 1230/3482] nvidia390: make nvidia390-opencl depend directly on
 ocl-icd.

See previous commit for explanation.
---
 srcpkgs/nvidia390/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index 40301343166a..34451d50c610 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
 version=390.141
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -239,7 +239,7 @@ nvidia390-dkms_package() {
 }
 nvidia390-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
-	depends="libOpenCL"
+	depends="ocl-icd"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"

From f21159fd2c8881549c8ad7061b625d7687719a10 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 8 Feb 2021 13:06:55 +0100
Subject: [PATCH 1231/3482] zoom: update to 5.5.7011.0206

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index e92785da2126..c648dd97ebfe 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.5.6981.0202
+version=5.5.7011.0206
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -12,7 +12,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"
-checksum=2419bdd7257137c35f639b681aaf70e42da95181dcb15cd4be6b07cb025a5415
+checksum=023083f12cd456b7356aef6f331b37fcf52b242ff575b6c7b1f64b3987a75001
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From b2dd7655fedf71bb84712bdc168531ded46c7b1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 8 Feb 2021 17:09:11 +0100
Subject: [PATCH 1232/3482] doomretro: update to 4.0.1.

---
 srcpkgs/doomretro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 2ec38c3449a6..7239d25ddfe5 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.0
+version=4.0.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b98871010b0c3287e9f4482931fe678a6d087b73afcdbdbd51c9653512ac1305
+checksum=89ea7b67c086512dcba561a02cc114708fe8a07df4aae53ab31333473ca458a0

From 4e39daebc915aebde63350ced2e3888ab02b0ea4 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 8 Feb 2021 11:24:34 -0600
Subject: [PATCH 1233/3482] Amass: update to 3.11.3.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index c34b79c131a5..d8ed19380c3f 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.11.2
+version=3.11.3
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/..."
@@ -9,4 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=e1db845ba25e8d0b15476794517536fdcbdc661cf05d718a11a7d09dbbd7347c
+checksum=42c43e3a621c94f9838acbc5779ade3ce312785f5b434614d219986451f57e29

From 0493b546582dcdfb2c92c800b827278911aefb3e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 8 Feb 2021 11:27:53 -0600
Subject: [PATCH 1234/3482] aide: update to 0.17.2.

---
 srcpkgs/aide/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aide/template b/srcpkgs/aide/template
index 53631c15530c..cb3115cb1387 100644
--- a/srcpkgs/aide/template
+++ b/srcpkgs/aide/template
@@ -1,6 +1,6 @@
 # Template file for 'aide'
 pkgname=aide
-version=0.17.1
+version=0.17.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-mhash --with-posix-acl --with-prelink --with-xattr
@@ -15,7 +15,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://aide.github.io/"
 distfiles="https://github.com/aide/aide/releases/download/v${version}/aide-${version}.tar.gz"
-checksum=a401c951938f1169ceaec868ce3594736e89c5c881578c263d8a824a06b0002d
+checksum=3cff624b1717dc19c106d4b898c37eee106bf2fae029880f005820294917bafa
 
 post_configure() {
 	vsed -i config.h -e 's/cross/ino_t/g'

From 2e3b68e84c76bf023029995253fa5649ba78ae75 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 8 Feb 2021 11:31:59 -0600
Subject: [PATCH 1235/3482] yara: update to 4.0.5.

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 5da018113562..72e285db6f82 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,6 +1,6 @@
 # Template file for 'yara'
 pkgname=yara
-version=4.0.4
+version=4.0.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://virustotal.github.io/yara/"
 distfiles="https://github.com/VirusTotal/yara/archive/v${version}.tar.gz"
-checksum=67fdc6f1050261914cf4a9e379b60961f62c2f76af676bafb2ceb47dd642d44f
+checksum=ea7ebefad05831faf6f780cab721611b0135803f03a84c27eeba7bfe0afc3aae
 
 pre_configure() {
 	autoreconf -fi

From b7adc7fedc0db1672f54eaa91fe027aadb9c4ac4 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 8 Feb 2021 11:39:43 -0600
Subject: [PATCH 1236/3482] delta: update to 0.6.0.

---
 srcpkgs/delta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index a454795a7fba..be4b95ac2aea 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.5.1
+version=0.6.0
 revision=1
 build_style=cargo
 short_desc="Syntax-highlighting pager for git"
@@ -8,7 +8,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dd59b747cd178184dff31c7e1707be41f8bc6b412c0c78e62b89aeca4c0f2e15
+checksum=27259c3d305edee5f49a3a992e7d739cab400f478a675b7388fef85a2724217c
 
 post_install() {
 	vlicense LICENSE

From 89b92c91c3211ef64711a23d6d59e7523fbd3695 Mon Sep 17 00:00:00 2001
From: martindamianfernandez <martin.damian.fernandez@gmail.com>
Date: Mon, 8 Feb 2021 12:16:11 -0300
Subject: [PATCH 1237/3482] privoxy: update to 3.0.31

---
 srcpkgs/privoxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/privoxy/template b/srcpkgs/privoxy/template
index 7422d4412509..4e78051c2e74 100644
--- a/srcpkgs/privoxy/template
+++ b/srcpkgs/privoxy/template
@@ -1,6 +1,6 @@
 # Template file for 'privoxy'
 pkgname=privoxy
-version=3.0.28
+version=3.0.31
 revision=1
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.privoxy.org/"
 distfiles="${SOURCEFORGE_SITE}/ijbswa/${pkgname}-${version}-stable-src.tar.gz"
-checksum=b5d78cc036aaadb3b7cf860e9d598d7332af468926a26e2d56167f1cb6f2824a
+checksum=077729a3aac79222a4e8d88a650d9028d16fd4b0d6038da8f5f5e47120d004eb
 system_accounts="privoxy"
 privoxy_homedir="/etc/privoxy"
 

From 09f94b10d2d6b973bba5316bfa772e7ac43f2694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 8 Feb 2021 16:52:59 +0100
Subject: [PATCH 1238/3482] homebank: update to 5.5.

---
 srcpkgs/homebank/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index dad202506269..34ca327ed00e 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.4.3
-revision=2
+version=5.5
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+checksum=dedaa6b02c505cd02c0ec2dd8b2ba4e0cc9d1f45a01eab0da60ab1bc2a7e6c75
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From 0baeefa96980fe758df42b480deed42781196ed2 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 8 Feb 2021 10:18:30 +0100
Subject: [PATCH 1239/3482] google-chrome: update to 88.0.4324.150

---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index e2cea8c2e7dc..d16b1b8d13ae 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=88.0.4324.146
+_chromeVersion=88.0.4324.150
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=2d9205f4f882c091ab9e5421e4d3f28d792479d073b1edce12632316b8f93c81
+checksum=404f13af1288a824898674e83c42bcdffba098178ff96d266525cd7e2fdcd077
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From bebf257aa231dbea6929ded2d26a9fa60d364a5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 8 Feb 2021 21:19:40 +0100
Subject: [PATCH 1240/3482] qmmp: update to 1.4.4; enable projectM

---
 srcpkgs/qmmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index bbf24e6186d0..eb55a8f7a7cb 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,6 +1,6 @@
 # Template file for 'qmmp'
 pkgname=qmmp
-version=1.4.3
+version=1.4.4
 revision=1
 build_style=cmake
 configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
@@ -10,7 +10,7 @@ makedepends="enca-devel faad2-devel ffmpeg-devel jack-devel libarchive-devel
  libbs2b-devel libcdio-paranoia-devel libcurl-devel libgme-devel libmad-devel
  libmms-devel libmodplug-devel libmpcdec-devel libsamplerate-devel libwildmidi-devel
  libshout-devel libsidplayfp-devel libsoxr-devel opusfile-devel pulseaudio-devel
- qt5-multimedia-devel qt5-tools-devel qt5-x11extras-devel qt5-plugin-mysql
+ projectM-devel qt5-multimedia-devel qt5-tools-devel qt5-x11extras-devel qt5-plugin-mysql
  qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds taglib-devel
  wavpack-devel"
 # At least one QSql plugin should be available
@@ -20,7 +20,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="http://qmmp.ylsoftware.com"
 distfiles="http://qmmp.ylsoftware.com/files/${pkgname}-${version}.tar.bz2"
-checksum=293dbe5e64bc7c1a6f40a7b34dadc84d4689cb1339a49aa79c3ebe1963318b48
+checksum=b1945956109fd9c7844ee5780142c0d24564b88327dc2f9a61d29386abcf9d54
 
 qmmp-devel_package() {
 	short_desc+=" - development files"

From 04715e12f617a6d88e03036fa088aa7be1c62a16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:24:17 +0100
Subject: [PATCH 1241/3482] build-style/cmake: use ninja as default generator

closes #28304
---
 common/build-style/cmake.sh             | 7 ++++---
 common/environment/build-style/cmake.sh | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 3135508b8b00..5e4f2dadc8c1 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -62,6 +62,7 @@ _EOF
 
 	cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin"
 
+	export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
 	# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
 	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
 		cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \
@@ -72,7 +73,7 @@ _EOF
 }
 
 do_build() {
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 
 	cd ${cmake_builddir:=build}
 	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
@@ -92,14 +93,14 @@ do_check() {
 		fi
 	fi
 
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 	: ${make_check_target:=test}
 
 	CTEST_OUTPUT_ON_FAILURE=TRUE ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 	: ${make_install_target:=install}
 
 	cd ${cmake_builddir:=build}
diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh
index 25bd8a388ec6..c9e4d8961598 100644
--- a/common/environment/build-style/cmake.sh
+++ b/common/environment/build-style/cmake.sh
@@ -1,5 +1,5 @@
 if [ "$CHROOT_READY" ]; then
 	if [[ "$hostmakedepends" != *"cmake-bootstrap"* ]]; then
-		hostmakedepends+=" cmake"
+		hostmakedepends+=" cmake ninja"
 	fi
 fi

From 38c09426366fc335f851d4e67dfb3f07e8dd41b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:30:11 +0100
Subject: [PATCH 1242/3482] ccache: force bootstrap build to use gnu-make

---
 srcpkgs/ccache/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 25e948cf79e9..c7b94db6d679 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -16,6 +16,8 @@ checksum=2f14b11888c39778c93814fc6843fc25ad60ff6ba4eeee3dff29a1bad67ba94f
 
 if [ -z "$CHROOT_READY" ]; then
 	hostmakedepends="cmake-bootstrap"
+	export CMAKE_GENERATOR="Unix Makefiles"
+	make_cmd="make"
 else
 	hostmakedepends="asciidoc perl"
 fi

From 446425847dec044ee88f5638f62afc7442ff318c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:47:02 +0100
Subject: [PATCH 1243/3482] build-style/cmake: replace sed monstrosity with
 ${wrksrc}/${build_wrksrc}

---
 common/build-style/cmake.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 5e4f2dadc8c1..26d55f527e33 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -65,8 +65,7 @@ _EOF
 	export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
 	# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
 	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-		cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \
-			-e 's|[^/]$|/|' -e 's|[^/]*||g' -e 's|/|../|g')
+		cmake ${cmake_args} ${configure_args} ${wrksrc}/${build_wrksrc}
 
 	# Replace -isystem with -I for Qt4 and Qt5 packages
 	find -name flags.make -exec sed -i "{}" -e"s;-isystem;-I;g" \;

From 1a7d3eb9591b33c3c49b7a9ade08fb7f88786b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 31 Jan 2021 09:19:11 +0700
Subject: [PATCH 1244/3482] cmake-bootstrap: update to 3.19.4.

---
 srcpkgs/cmake-bootstrap/template | 4 ++--
 srcpkgs/cmake-bootstrap/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index fca0464975cc..539033d6ffa5 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-bootstrap'
 pkgname=cmake-bootstrap
-version=3.19.2
+version=3.19.4
 revision=1
 wrksrc=cmake-$version
 bootstrap=yes
@@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later, BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0
+checksum=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
 conflicts="cmake>=0"
 
 CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
diff --git a/srcpkgs/cmake-bootstrap/update b/srcpkgs/cmake-bootstrap/update
index 4671bfbb1858..92f85b5350ba 100644
--- a/srcpkgs/cmake-bootstrap/update
+++ b/srcpkgs/cmake-bootstrap/update
@@ -1 +1,2 @@
 site='https://cmake.org/download/'
+pkgname=cmake

From f5993563d9f6bea26a090c9baf746e625828ae67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 31 Jan 2021 09:19:37 +0700
Subject: [PATCH 1245/3482] cmake: update to 3.19.4.

closes #28350
---
 .../cmake/patches/0001-Disable-try_run.patch  | 27 -------------------
 srcpkgs/cmake/template                        |  7 +++--
 2 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/cmake/patches/0001-Disable-try_run.patch

diff --git a/srcpkgs/cmake/patches/0001-Disable-try_run.patch b/srcpkgs/cmake/patches/0001-Disable-try_run.patch
deleted file mode 100644
index 3e05af1a581f..000000000000
--- a/srcpkgs/cmake/patches/0001-Disable-try_run.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 544abc16419065c009361b9627f69665471cfb6d Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens@artixlinux.org>
-Date: Fri, 20 Nov 2020 22:24:08 -0600
-Subject: [PATCH] Disable try_run
-
-If cross-building, try_run cannot run during
-cross-build so cause build to fail
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git CMakeLists.txt CMakeLists.txt
-index 2d860d4..c14a203 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -61,7 +61,7 @@ if("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
-     if(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)
-       message(FATAL_ERROR "TRY_RUN not allowed with CMAKE_TRY_COMPILE_OSX_ARCHITECTURES=[${CMAKE_TRY_COMPILE_OSX_ARCHITECTURES}]")
-     else()
--      _TRY_RUN(${ARGV})
-+			#  _TRY_RUN(${ARGV})
-     endif()
-   endmacro()
- endif()
--- 
-2.29.2
-
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index b5289095e4a8..e95cc40abc79 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,11 +1,12 @@
 # Template file for 'cmake'
 pkgname=cmake
-version=3.19.3
+version=3.19.4
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
  -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1"
 make_check_target=test
+make_cmd=make
 hostmakedepends="cmake-bootstrap gcc-fortran"
 makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel
  ncurses-devel rhash-devel jsoncpp-devel"
@@ -15,7 +16,9 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=3faca7c131494a1e34d66e9f8972ff5369e48d419ea8ceaa3dc15b4c11367732
+checksum=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
+
+export CMAKE_GENERATOR="Unix Makefiles"
 
 pre_check() {
 	# use ctest of this build instead of requirig cmake to test cmake...

From c8943cba4e3968cd5c612a49ba08f9336dcde59d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 31 Jan 2021 09:43:17 +0700
Subject: [PATCH 1246/3482] cmake-gui: update to 3.19.4.

---
 srcpkgs/cmake-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index cac045092bad..369450ed3cde 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.19.2
+version=3.19.4
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0
+checksum=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
 
 do_install() {
 	# We are only interested in cmake-gui.

From 83d72b0dd4e01fdc94f88f9c8995a9c26e1e2107 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 16:09:02 +0100
Subject: [PATCH 1247/3482] anope: use gnu-make

---
 srcpkgs/anope/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/anope/template b/srcpkgs/anope/template
index 42b056221618..56b3d16d3042 100644
--- a/srcpkgs/anope/template
+++ b/srcpkgs/anope/template
@@ -4,6 +4,7 @@ version=2.0.7
 revision=2
 wrksrc="${pkgname}-${version}-source"
 build_style=cmake
+make_cmd=make
 configure_args="-DINSTDIR=../install -DRUNGROUP=_anope -DDEFUMASK=077
  -DUSE_PCH=OFF"
 hostmakedepends="gettext"
@@ -25,6 +26,8 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	LDFLAGS="-lintl"
 fi
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 pre_configure() {
 	# prevent cmake from building include/version and running
 	# because it breaks cross compiling (cmake can't differentiate

From bf6573c6cbc7b3a6c810ed9c1fd31cb2f95b0465 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 16:33:25 +0100
Subject: [PATCH 1248/3482] enyo-doom: fix ninja build

---
 srcpkgs/enyo-doom/patches/cmake.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/enyo-doom/patches/cmake.patch

diff --git a/srcpkgs/enyo-doom/patches/cmake.patch b/srcpkgs/enyo-doom/patches/cmake.patch
new file mode 100644
index 000000000000..8c9d9f4c6640
--- /dev/null
+++ b/srcpkgs/enyo-doom/patches/cmake.patch
@@ -0,0 +1,13 @@
+--- CMakeLists.txt	2020-09-20 23:03:04.000000000 +0200
++++ -	2021-02-08 16:29:03.621982747 +0100
+@@ -22,8 +22,8 @@
+ include_directories ( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
+ find_package ( Qt5Core REQUIRED )
+ find_package (Qt5Widgets REQUIRED )
+-add_definitions ( $(Qt5Core_DEFINITIONS) )
+-add_definitions ( $(Qt5Widgets_DEFINITIONS) )
++add_definitions ( ${Qt5Core_DEFINITIONS} )
++add_definitions ( ${Qt5Widgets_DEFINITIONS} )
+ qt5_wrap_ui ( UI_HEADERS ${ENYO_DOOM_UIS} )
+ qt5_wrap_cpp ( MOC_SOURCES ${ENYO_DOOM_HDRS} )
+ qt5_add_resources ( RC_SOURCES ${ENYO_DOOM_RCS} )

From 731dc99e99b7f3f6f7d3b8677c5d2d4ee045b99c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 16:38:12 +0100
Subject: [PATCH 1249/3482] include-what-you-use: remove VERBOSE=1
 make_build_args

---
 srcpkgs/include-what-you-use/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template
index 4457485233c9..ef508ff0b97b 100644
--- a/srcpkgs/include-what-you-use/template
+++ b/srcpkgs/include-what-you-use/template
@@ -5,7 +5,6 @@ revision=1
 create_wrksrc="yes"
 build_style=cmake
 configure_args="-DIWYU_LLVM_ROOT_PATH=${XBPS_CROSS_BASE}/usr "
-make_build_args="VERBOSE=1"
 makedepends="clang clang-tools-extra llvm ncurses-devel zlib-devel"
 short_desc="Analyze #includes in C and C++ source files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 5d829a516819f8065f67119fba26afe7ac55e0d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 16:57:15 +0100
Subject: [PATCH 1250/3482] devilutionX: fix build with ninja

---
 ...6fe89ea1977aa296277694a6e94314aca0a8.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/devilutionX/patches/201c6fe89ea1977aa296277694a6e94314aca0a8.patch

diff --git a/srcpkgs/devilutionX/patches/201c6fe89ea1977aa296277694a6e94314aca0a8.patch b/srcpkgs/devilutionX/patches/201c6fe89ea1977aa296277694a6e94314aca0a8.patch
new file mode 100644
index 000000000000..9dfe2413e72c
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/201c6fe89ea1977aa296277694a6e94314aca0a8.patch
@@ -0,0 +1,30 @@
+From 201c6fe89ea1977aa296277694a6e94314aca0a8 Mon Sep 17 00:00:00 2001
+From: Alex Sweet <sweet.giorni@gmail.com>
+Date: Mon, 23 Mar 2020 01:59:33 -0700
+Subject: [PATCH] Fix ninja-build build error
+
+---
+ CMakeLists.txt | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a8f0c4492..89051b7bc 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -502,8 +502,14 @@ endif()
+ 
+ if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+   # Change __FILE__ to only show the path relative to the project folder
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-builtin-macro-redefined -D'__FILE__=\"$(subst $(realpath ${CMAKE_SOURCE_DIR})/,,$(abspath $<))\"'")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-builtin-macro-redefined -D'__FILE__=\"$(subst $(realpath ${CMAKE_SOURCE_DIR})/,,$(abspath $<))\"'")
++  get_target_property(devilution_SRCS devilution SOURCES)
++  foreach(SOURCE_FILE ${devilution_SRCS} ${devilutionx_SRCS})
++    set_source_files_properties(${SOURCE_FILE} PROPERTIES
++      COMPILE_DEFINITIONS __FILE__="${SOURCE_FILE}"
++    )
++  endforeach(SOURCE_FILE)
++  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-builtin-macro-redefined")
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-builtin-macro-redefined")
+ 
+   if(DEBUG)
+     # Note: For Valgrind suppor.

From a17d1fa5af151c6adfbae4a36b628b43a656c98b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 16:58:06 +0100
Subject: [PATCH 1251/3482] llvm-libunwind: remove VERBOSE=1 make_build_args

---
 srcpkgs/llvm-libunwind/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/llvm-libunwind/template b/srcpkgs/llvm-libunwind/template
index 62d88f61b4e9..b9ad1c97693a 100644
--- a/srcpkgs/llvm-libunwind/template
+++ b/srcpkgs/llvm-libunwind/template
@@ -6,7 +6,6 @@ build_style=cmake
 wrksrc="libunwind-${version}.src"
 hostmakedepends="llvm11"
 makedepends="llvm11"
-make_build_args="VERBOSE=1"
 short_desc="LLVM version of libunwind library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NCSA, MIT"

From e27ae1590ebaa94c09bc428b70974b2e6e56934b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:05:00 +0100
Subject: [PATCH 1252/3482] libogdf: remove noop make_build_args

---
 srcpkgs/libogdf/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libogdf/template b/srcpkgs/libogdf/template
index 4cb794f0ea77..d9bcdd886a0b 100644
--- a/srcpkgs/libogdf/template
+++ b/srcpkgs/libogdf/template
@@ -6,7 +6,6 @@ archs="i686* x86_64*"
 wrksrc=OGDF-snapshot
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DOGDF_EXTRA_CXX_FLAGS=-Wno-error"
-make_build_args="-Wno-error=class-memaccess"
 hostmakedepends="unzip python"
 makedepends="libClp-devel"
 short_desc="Open Graph Drawing Framework"

From f294d4f80d8a73ecac048b0f96d8f19322e43e89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:11:57 +0100
Subject: [PATCH 1253/3482] musikcube: use make explicitly

---
 srcpkgs/musikcube/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index a3da40c134b6..c5d5cb0b40ca 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -3,6 +3,7 @@ pkgname=musikcube
 version=0.93.1
 revision=2
 build_style=cmake
+make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
@@ -21,6 +22,8 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-latomic'"
 fi
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 #XXX: Otherwise xbps-install ffmpeg-devel will complain about unresolving shlibs
 # SDL2-2.0.10_3: broken, unresolvable shlib 'libGL.so.1'
 makedepends+=" libglvnd"

From 3024c79af66e4c488658ced7637b1fe43af8249a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:16:18 +0100
Subject: [PATCH 1254/3482] supercollider: use make explicitly

---
 srcpkgs/supercollider/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template
index b83b62db95db..bded2fc4908c 100644
--- a/srcpkgs/supercollider/template
+++ b/srcpkgs/supercollider/template
@@ -4,6 +4,7 @@ version=3.11.1
 revision=1
 wrksrc="SuperCollider-${version}-Source"
 build_style=cmake
+make_cmd=make
 configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON"
 hostmakedepends="emacs pkg-config"
 makedepends="avahi-libs-devel boost-devel fftw-devel jack-devel libatomic-devel
@@ -22,6 +23,8 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"
 fi
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 build_options="webengine"
 desc_option_webengine="Build Qt5 WebEngine support"
 

From d657032dbfcfd0b6ed1a79f9e14ad7215df2bc06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:18:38 +0100
Subject: [PATCH 1255/3482] sysdig: use make explicitly

---
 srcpkgs/sysdig/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 1a6e38a3d73c..fa7fafc80d25 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -7,6 +7,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
  -DLUA_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/luajit-2.1
  -DLUA_LIBRARY=libluajit-5.1.so -DCREATE_TEST_TARGETS=OFF"
+make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
  libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
@@ -27,6 +28,8 @@ case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" -DMUSL_OPTIMIZED_BUILD=On"
 esac
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 # Avoid excessive warnings spam to the log
 CXXFLAGS="-Wno-deprecated-declarations"
 

From 07f018c22c5577e5d8c88e1ffdc4650f3ba30e61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:19:41 +0100
Subject: [PATCH 1256/3482] opencolorio: use make explicitly

---
 srcpkgs/opencolorio/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index f83d3e25491b..179736598588 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -9,6 +9,7 @@ case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
+make_cmd=make
 hostmakedepends="pkg-config git"
 makedepends="tinyxml-devel lcms2-devel"
 short_desc="A complete color management solution"
@@ -19,6 +20,8 @@ changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/Chang
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
 checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 post_install() {
 	vlicense LICENSE
 }

From 759426a2d94966c2bd796a45a7697df51e88097d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:20:40 +0100
Subject: [PATCH 1257/3482] opentoonz: use make explicitly

---
 srcpkgs/opentoonz/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index cb6fed95dd7d..503ebf2d789a 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -4,6 +4,7 @@ version=1.4.0
 revision=1
 build_wrksrc="toonz/sources"
 build_style=cmake
+make_cmd=make
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config automake libtool"
 makedepends="qt5-devel qt5-svg-devel qt5-script-devel qt5-tools-devel qt5-multimedia-devel
  superlu-devel glew-devel libjpeg-turbo-devel liblzma-devel liblz4-devel lzo-devel
@@ -16,6 +17,8 @@ homepage="https://opentoonz.github.io/e/"
 distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz"
 checksum=176caca191bf2747964ecaf8cbb6be6a738fd04b464a2ba182b5aaf96ccaefa9
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 pre_configure() {
 	# Upstream uses their own modified version of tiff
 	if [ "$CROSS_BUILD" ]; then

From 6a72f287f559db2f9ddd771ecad61e1f601c4268 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:21:45 +0100
Subject: [PATCH 1258/3482] libclc: build with ninja

---
 srcpkgs/libclc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libclc/template b/srcpkgs/libclc/template
index 590a33736f1b..a1ff860eacd2 100644
--- a/srcpkgs/libclc/template
+++ b/srcpkgs/libclc/template
@@ -21,7 +21,7 @@ do_configure() {
 	unset CC CXX LD CFLAGS CXXFLAGS LDFLAGS
 	mkdir -p build
 	cd build
-	cmake ${configure_args} ..
+	cmake -GNinja ${configure_args} ..
 }
 
 post_install() {

From abf19141c751b12bf25d450648aa155a10c74646 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:32:10 +0100
Subject: [PATCH 1259/3482] fntsample: use make explicitly

---
 srcpkgs/fntsample/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/fntsample/template b/srcpkgs/fntsample/template
index 7abc88b2aa9f..500c58ff5521 100644
--- a/srcpkgs/fntsample/template
+++ b/srcpkgs/fntsample/template
@@ -5,6 +5,7 @@ revision=1
 build_style=cmake
 wrksrc="fntsample-release-${version}"
 configure_args="-DUNICODE_BLOCKS=../Blocks.txt"
+make_cmd=make
 hostmakedepends="gettext pkg-config"
 makedepends="cairo-devel fontconfig-devel freetype-devel glib-devel pango-devel"
 short_desc="PDF and PostScript font samples generator"
@@ -21,6 +22,8 @@ checksum="e4e8b50b0a5e984cfdaa32b7d133bd3bf0c62edb14f752f7df1190176023972b
 skip_extraction="Blocks.txt
  terms_of_use.html"
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 post_extract() {
 	cp "${XBPS_SRCDISTDIR}/fntsample-${version}/Blocks.txt" "${wrksrc}/"
 }

From ac2ee5cd35ba794342fe7500f671da3feeb5c42c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:33:48 +0100
Subject: [PATCH 1260/3482] bullet: use make explicitly

---
 srcpkgs/bullet/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/bullet/template b/srcpkgs/bullet/template
index 95772dbc509a..436a12532ce8 100644
--- a/srcpkgs/bullet/template
+++ b/srcpkgs/bullet/template
@@ -6,6 +6,7 @@ wrksrc="bullet3-${version}"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=1 -DBUILD_BULLET2_DEMOS=0 -DBUILD_CPU_DEMOS=0
  -DBUILD_UNIT_TESTS=0 -DBUILD_OPENGL3_DEMOS=0 -DBUILD_EXTRAS=1 -DINSTALL_EXTRA_LIBS=1"
+make_cmd=make
 makedepends="glu-devel"
 short_desc="3D Collision Detection and Rigid Body Dynamics Library"
 maintainer="John <me@johnnynator.dev>"
@@ -14,6 +15,8 @@ homepage="http://www.bulletphysics.com/Bullet/"
 distfiles="https://github.com/bulletphysics/bullet3/archive/${version}.tar.gz"
 checksum=621b36e91c0371933f3c2156db22c083383164881d2a6b84636759dc4cbb0bb8
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 post_install() {
 	vlicense LICENSE.txt
 }

From e1f1e335819509b6d0247208ffc3fcaf128abcea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:34:58 +0100
Subject: [PATCH 1261/3482] warsow: use make explicitly

---
 srcpkgs/warsow/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/warsow/template b/srcpkgs/warsow/template
index dfd8d8d75bab..8dad5adb742b 100644
--- a/srcpkgs/warsow/template
+++ b/srcpkgs/warsow/template
@@ -6,6 +6,7 @@ wrksrc="warsow_${version/./}_sdk"
 build_wrksrc="source/source"
 build_style=cmake
 configure_args="-DQFUSION_GAME=Warsow"
+make_cmd=make
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libvorbis-devel libtheora-devel libjpeg-turbo-devel
  libopenal-devel MesaLib-devel libXi-devel libXxf86dga-devel
@@ -21,6 +22,8 @@ checksum=99c88bc08f5e6055d28534de6e84fc204026dda51dc31e22caca1977f199453a
 
 archs="i686* x86_64*"
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 CFLAGS="-fcommon"
 
 do_install() {

From 7224bfacde5617c38fd94148a225d8b3c10de6b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:36:11 +0100
Subject: [PATCH 1262/3482] stepmania: use make explicitly

---
 srcpkgs/stepmania/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/stepmania/template b/srcpkgs/stepmania/template
index 9ec2c4c24213..4baeccb828da 100644
--- a/srcpkgs/stepmania/template
+++ b/srcpkgs/stepmania/template
@@ -3,6 +3,7 @@ pkgname=stepmania
 version=5.0.12
 revision=2
 build_style=cmake
+make_cmd=make
 cmake_builddir="Build"
 hostmakedepends="nasm yasm pkg-config git"
 makedepends="libmad-devel libvorbis-devel pcre-devel libjpeg-turbo-devel
@@ -19,6 +20,8 @@ checksum=df79bcadd69d4ed60cf560d45386ec275181343495ffd744c3ff8f73c83d4755
 # with Windows
 archs="i686 x86_64"
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 post_install() {
 	vlicense Docs/Licenses.txt
 

From 09562c17a351d0011d717024d74a3c93f0695b4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:38:14 +0100
Subject: [PATCH 1263/3482] ippusbxd: use make explicitly

---
 srcpkgs/ippusbxd/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/ippusbxd/template b/srcpkgs/ippusbxd/template
index b8036c30e824..ce4ff2ea9125 100644
--- a/srcpkgs/ippusbxd/template
+++ b/srcpkgs/ippusbxd/template
@@ -4,6 +4,7 @@ version=1.34
 revision=1
 build_wrksrc=src
 build_style=cmake
+make_cmd=make
 hostmakedepends="pkg-config"
 makedepends="libusb-devel avahi-libs-devel libxml2-devel cups-devel"
 short_desc="Internet Printing Protocol (IPP) over USB driver"
@@ -14,6 +15,8 @@ distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=996a572c8f6d1426a58ad3b95c21fea7f5b64d5db34a825c543d7869b3c77891
 conf_files="/etc/apparmor.d/usr.sbin.ippusbxd"
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 do_install() {
 	vbin build/ippusbxd
 	vman ../doc/ippusbxd.8

From d0bed1ac78bc094b6e6ad879656fd78d8f0be21f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:39:11 +0100
Subject: [PATCH 1264/3482] Cataclysm-DDA: use make explicitly

---
 srcpkgs/Cataclysm-DDA/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/Cataclysm-DDA/template b/srcpkgs/Cataclysm-DDA/template
index 7cc73c18306b..bbe66b9f29b9 100644
--- a/srcpkgs/Cataclysm-DDA/template
+++ b/srcpkgs/Cataclysm-DDA/template
@@ -4,6 +4,7 @@ version=0.E
 revision=4
 build_style=cmake
 configure_args="-DRELEASE=1 $(vopt_bool backtrace BACKTRACE) -DUSE_HOME_DIR=1 -DPREFIX=/usr"
+make_cmd=make
 hostmakedepends="gettext pkg-config"
 makedepends="$(vopt_if tiles 'SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel freetype-devel')
  ncurses-devel"
@@ -18,6 +19,8 @@ checksum=b0af9a9292929e17332edcea770bca9a91f1d08ea47726d78a47e09281a42fa3
 build_options="tiles backtrace"
 build_options_default="tiles"
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 case $XBPS_TARGET_MACHINE in
 	*-musl);;
 	*) build_options_default+=" backtrace";;

From cd06b1f4c4f41e678fcf32582f65ca04c0713aee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 18:13:19 +0100
Subject: [PATCH 1265/3482] arcan: use make explicitly

---
 srcpkgs/arcan/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 60db46d2acd0..7788f50d3329 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -4,6 +4,7 @@ version=0.6.0.1
 revision=1
 build_wrksrc=src
 build_style=cmake
+make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
@@ -27,6 +28,8 @@ checksum="7ae00a9dee79f9b58ac2bacbf532ff0631280297cfde30e8996382a3f42a52ed
  3a50a87c05b67c466a868cc77f8dc7f9cfc9466aeeafcd823daca0d108c504da"
 patch_args="-Np1"
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 replaces="arcan-wayland>=0"
 
 build_options="luajit tesseract tts wayland"

From be45a57352ed487f3728e49dac087c61a2a0427b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 18:32:17 +0100
Subject: [PATCH 1266/3482] zig: use make explicitly

---
 srcpkgs/zig/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/zig/template b/srcpkgs/zig/template
index e9fda2f3cde4..5345f01c4ef6 100644
--- a/srcpkgs/zig/template
+++ b/srcpkgs/zig/template
@@ -4,6 +4,7 @@ version=0.7.1
 revision=1
 archs="x86_64* aarch64*"
 build_style=cmake
+make_cmd=make
 makedepends="clang llvm11 lld-devel"
 short_desc="Programming language designed for robustness, optimality, and clarity"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -14,6 +15,8 @@ checksum=2db3b944ab368d955b48743d9f7c963b8f96de1a441ba5a35e197237cc6dae44
 nopie=yes
 nocross=yes
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 post_install() {
 	vlicense LICENSE
 }

From 0a3715ad0b618041d31c8f66a2946b30514e2c7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 18:34:05 +0100
Subject: [PATCH 1267/3482] z80ex: remove not needed sed calls

build/Makefile did never have a usr/local reference,
that one exists only in /Makefile, but that file isn't used

lib64 is now handled by xbps-src
---
 srcpkgs/z80ex/template | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/srcpkgs/z80ex/template b/srcpkgs/z80ex/template
index 8d74f415a211..00a24a6fb902 100644
--- a/srcpkgs/z80ex/template
+++ b/srcpkgs/z80ex/template
@@ -10,13 +10,6 @@ homepage="https://sourceforge.net/projects/z80ex/"
 distfiles="${SOURCEFORGE_SITE}/project/z80ex/z80ex/${version}/z80ex-${version}.tar.gz"
 checksum=6f5e521d068a614b41e10180ad4ae45b1bc258ec28c962543feb9078856c2530
 
-pre_configure() {
-	sed -i 's#lib64#lib#g' CMakeLists.txt
-}
-pre_build() {
-	sed -i 's#/usr/local#/usr#g' build/Makefile
-}
-
 z80ex-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From 833c5c20ecdc82dbfc9de94c2098a95c832d921f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 19:41:06 +0100
Subject: [PATCH 1268/3482] libcxxabi: remove VERBOSE=1 make_build_args

---
 srcpkgs/libcxxabi/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libcxxabi/template b/srcpkgs/libcxxabi/template
index 3b19b4de8af6..2f024625fa3c 100644
--- a/srcpkgs/libcxxabi/template
+++ b/srcpkgs/libcxxabi/template
@@ -7,7 +7,6 @@ build_style=cmake
 configure_args="-DLIBCXXABI_LIBCXX_INCLUDES=../../libcxx/include
  -DLIBCXXABI_USE_LLVM_UNWINDER=1
  -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}"
-make_build_args="VERBOSE=1"
 hostmakedepends="clang-tools-extra llvm11"
 makedepends="llvm11 llvm-libunwind-devel"
 short_desc="Low-level support for libc++ standard library"

From f7e7c92e18cc20607ba679643a07865684253807 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 22:39:33 +0100
Subject: [PATCH 1269/3482] supertux2: use make explicitly

---
 srcpkgs/supertux2/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 6546d1b0aa06..4c39b458dad4 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -9,6 +9,7 @@ configure_args="
  -DINSTALL_SUBDIR_BIN=bin
  -DINSTALL_SUBDIR_SHARE=share/supertux2
  -DWERROR=OFF"
+make_cmd=make
 hostmakedepends="pkg-config"
 makedepends="SDL2_image-devel boost-devel glew-devel libcurl-devel
  libopenal-devel libraqm-devel physfs-devel"
@@ -19,3 +20,5 @@ homepage="https://supertux.github.io/"
 distfiles="https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz"
 checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598
 replaces="supertux2-data>=0"
+
+export CMAKE_GENERATOR="Unix Makefiles"

From d15a5213a1a815a36c7dc9e948e690081de75c86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 22:45:57 +0100
Subject: [PATCH 1270/3482] nheko: remove build job restriction

I could not reproduce any significant memory load
that would justify a restriction to 8 jobs
---
 srcpkgs/nheko/template | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 198407862a4a..541d113a16e6 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -16,12 +16,3 @@ homepage="https://github.com/Nheko-Reborn/nheko"
 changelog="https://github.com/Nheko-Reborn/nheko/blob/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
 checksum=412908fcec0e66a0557db5359556b65e85dd22b8644a6a2ed569a90dea4bde3c
-
-# this one is very memory hungry and can use as much as 3GB per cc1plus
-# realistically, using any more than 8 jobs will easily lead to OOM
-do_build() {
-	cd build
-	local njobs=${XBPS_MAKEJOBS}
-	[ "$njobs" -gt 8 ] && njobs=8
-	make -j${njobs}
-}

From 4f1400c7109c5e3a09e6e11c551327c7b0910daa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 22:59:33 +0100
Subject: [PATCH 1271/3482] gnuradio-nrsc5: use make explicitly

---
 srcpkgs/gnuradio-nrsc5/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index 56f984f7bd32..6299e7c90b02 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -4,6 +4,7 @@ version=1.0.0
 revision=4
 wrksrc="gr-nrsc5-${version}"
 build_style=cmake
+make_cmd=make
 hostmakedepends="git automake libtool pkg-config gnuradio swig"
 makedepends="gnuradio-devel boost-devel libcppunit-devel python3-devel
  log4cpp-devel gmpxx-devel mpir-devel gsl-devel volk-devel"
@@ -14,6 +15,8 @@ homepage="https://github.com/argilo/gr-nrsc5/"
 distfiles="https://github.com/argilo/gr-nrsc5/archive/v${version}.tar.gz"
 checksum=d736c4cb1104254d07296d2a61880e07149c9bfd1a49aed504215672d4e09485
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		vsed -i CMakeLists.txt \

From b0b12a2bc9b46475147974316cffb76e89875450 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 23:00:28 +0100
Subject: [PATCH 1272/3482] libcxx: remove VERBOSE=1 make_build_args

---
 srcpkgs/libcxx/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libcxx/template b/srcpkgs/libcxx/template
index 87c400883a17..4e5799636798 100644
--- a/srcpkgs/libcxx/template
+++ b/srcpkgs/libcxx/template
@@ -9,7 +9,6 @@ configure_args+=" -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=
  -DLIBCXXABI_USE_LLVM_UNWINDER=1"
 hostmakedepends="llvm11 clang-tools-extra python3"
 makedepends="libcxxabi-devel llvm11 llvm-libunwind-devel"
-make_build_args="VERBOSE=1"
 short_desc="New implementation of the C++ standard library, targeting C++11, C++14 and above"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NCSA, MIT"

From fecf0d124335957794a06f4db44842c2fd9947c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 23:28:13 +0100
Subject: [PATCH 1273/3482] ktouch: remove not needed sed lines

---
 srcpkgs/ktouch/template | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/srcpkgs/ktouch/template b/srcpkgs/ktouch/template
index f6b172297235..ac95212e3c6e 100644
--- a/srcpkgs/ktouch/template
+++ b/srcpkgs/ktouch/template
@@ -16,12 +16,3 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/education/org.kde.ktouch"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktouch-${version}.tar.xz"
 checksum=76c80e85dcd30704341a5ed997915321a5daf2fc32f38ed2c2db59f84afd7d48
-
-post_configure() {
-	sed -e 's|/usr/bin/qmlcachegen|/usr/bin/qmlcachegen-qt5|g' \
-		-i build/src/CMakeFiles/ktouch.dir/build.make
-
-	# Fix path for qmlcachegen on cross builds
-	sed -e "s|${XBPS_CROSS_BASE}/usr/bin/qmlcachegen-qt5|/usr/bin/qmlcachegen-qt5|g" \
-		-i build/src/CMakeFiles/ktouch.dir/build.make
-}

From 765ddc76c6470058835c2ac0b68e2b3adbc1c5ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 23:59:57 +0100
Subject: [PATCH 1274/3482] calligra: use make explicitly

---
 srcpkgs/calligra/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index abed8c2f3481..6d9a441ab173 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -5,6 +5,7 @@ revision=2
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"
+make_cmd=make
 hostmakedepends="perl pkg-config extra-cmake-modules gettext"
 makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2
  exiv2-devel kactivities5-devel gsl-devel qt5-declarative-devel
@@ -30,6 +31,8 @@ replaces="calligra-braindump>=0 calligra-flow>=0"
 build_options="webengine"
 desc_option_webengine="Use Qt5 WebEngine for Calligra Gemini"
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
 	# webengine does not cross-build from 64bit to 32bit, use webkit
 	if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then

From 6ae82c81cd3bfb2bbafd1e9213eb69177f406f64 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 8 Feb 2021 11:50:11 +0100
Subject: [PATCH 1275/3482] pipewire: apply qjackctl fix from master

---
 ...0bea4167573d3d364e1a768605d11be241293.diff | 74 +++++++++++++++++++
 srcpkgs/pipewire/template                     |  2 +-
 2 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff

diff --git a/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff b/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff
new file mode 100644
index 000000000000..10cd090cce7c
--- /dev/null
+++ b/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff
@@ -0,0 +1,74 @@
+Fix https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/696
+diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
+index 5163d4a5e287d076160ee01bb8c1c1aac73ff35c..a7ead586db3d682b7ae0e6ba0069fec98458d69b 100644
+--- pipewire-jack/src/pipewire-jack.c
++++ pipewire-jack/src/pipewire-jack.c
+@@ -4719,7 +4719,12 @@ int jack_session_reply (jack_client_t        *client,
+ SPA_EXPORT
+ void jack_session_event_free (jack_session_event_t *event)
+ {
+-	pw_log_warn("not implemented");
++	if (event) {
++		free((void *)event->session_dir);
++		free((void *)event->client_uuid);
++		free(event->command_line);
++		free(event);
++	}
+ }
+ 
+ SPA_EXPORT
+@@ -4732,6 +4737,54 @@ char *jack_client_get_uuid (jack_client_t *client)
+ 	return spa_aprintf("%"PRIu64, client_make_uuid(c->node_id));
+ }
+ 
++SPA_EXPORT
++jack_session_command_t *jack_session_notify (
++        jack_client_t*             client,
++        const char                *target,
++        jack_session_event_type_t  type,
++        const char                *path)
++{
++	struct client *c = (struct client *) client;
++	spa_return_val_if_fail(c != NULL, NULL);
++	pw_log_warn("not implemented");
++	return NULL;
++}
++
++SPA_EXPORT
++void jack_session_commands_free (jack_session_command_t *cmds)
++{
++	int i;
++	if (cmds == NULL)
++		return;
++
++	for (i = 0; cmds[i].uuid != NULL; i++) {
++		free((char*)cmds[i].client_name);
++		free((char*)cmds[i].command);
++		free((char*)cmds[i].uuid);
++	}
++	free(cmds);
++}
++
++SPA_EXPORT
++int jack_reserve_client_name (jack_client_t *client,
++                          const char    *name,
++                          const char    *uuid)
++{
++	struct client *c = (struct client *) client;
++	spa_return_val_if_fail(c != NULL, -1);
++	pw_log_warn("not implemented");
++	return 0;
++}
++
++SPA_EXPORT
++int jack_client_has_session_callback (jack_client_t *client, const char *client_name)
++{
++	struct client *c = (struct client *) client;
++	spa_return_val_if_fail(c != NULL, -1);
++	return 0;
++}
++
++
+ SPA_EXPORT
+ int jack_client_real_time_priority (jack_client_t * client)
+ {
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 50d32828a47d..f327ea67fb22 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.21
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false
  -Dbluez5=true -Dffmpeg=true -Dpipewire-alsa=true -Dpipewire-jack=true

From a8cbda5f97a2e72f896084f799b913036b664595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 8 Feb 2021 14:02:43 -0300
Subject: [PATCH 1276/3482] firejail: update to 0.9.64.4.

Fixes a root privilege escalation bug by disabling the overlayfs
functionality completely.
---
 srcpkgs/firejail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firejail/template b/srcpkgs/firejail/template
index 498e89961c85..6b6a27403ec4 100644
--- a/srcpkgs/firejail/template
+++ b/srcpkgs/firejail/template
@@ -1,6 +1,6 @@
 # Template file for 'firejail'
 pkgname=firejail
-version=0.9.64.2
+version=0.9.64.4
 revision=1
 build_style=gnu-configure
 configure_args="--enable-apparmor"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://firejail.wordpress.com"
 changelog="https://github.com/netblue30/firejail/raw/master/RELNOTES"
 distfiles="https://github.com/netblue30/firejail/archive/${version}.tar.gz"
-checksum=fa4113ccdf74694eeeb3d223017c1ade92bb104232df9340d30873816856f61c
+checksum=17a20c4c9f114aa8fdab467cecb60309f599ad08b4bbb3e751c992d98a95ac18
 conf_files="/etc/firejail/* /etc/apparmor.d/local/firejail-default"
 
 nocross=yes

From 900bdf655b42e7d9cb016128d1242504200ba4db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 8 Feb 2021 19:47:17 -0300
Subject: [PATCH 1277/3482] musl-legacy-compat: add fflush call to error().

The testsuite for elfutils expects things printed to stdout before
calling error() to appear before the error message; glibc implements
this by calling fflush(stdout) after checking the stream is still valid.
Here, we will simply flush all output streams.
---
 srcpkgs/musl-legacy-compat/files/error.h | 4 ++++
 srcpkgs/musl-legacy-compat/template      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/musl-legacy-compat/files/error.h b/srcpkgs/musl-legacy-compat/files/error.h
index 4505784182ae..835d0cb7f7df 100644
--- a/srcpkgs/musl-legacy-compat/files/error.h
+++ b/srcpkgs/musl-legacy-compat/files/error.h
@@ -13,6 +13,10 @@ static unsigned int error_message_count = 0;
 
 static inline void error(int status, int errnum, const char* format, ...)
 {
+	/* should be fflush(stdout), but that's unspecified if stdout has been closed;
+	 * stick with fflush(NULL) for simplicity (glibc checks if the fd is still valid) */
+	fflush(NULL);
+
 	va_list ap;
 	fprintf(stderr, "%s: ", program_invocation_name);
 	va_start(ap, format);
diff --git a/srcpkgs/musl-legacy-compat/template b/srcpkgs/musl-legacy-compat/template
index afc447314f46..a59d4e7683f0 100644
--- a/srcpkgs/musl-legacy-compat/template
+++ b/srcpkgs/musl-legacy-compat/template
@@ -1,7 +1,7 @@
 # Template file for 'musl-legacy-compat'
 pkgname=musl-legacy-compat
 version=0.4
-revision=1
+revision=2
 archs="*-musl"
 bootstrap=yes
 short_desc="Legacy compatibility headers for the musl libc"

From 89d5a0f44a2e198ac1f059fa22de5af411011ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 16 Dec 2020 17:47:44 -0300
Subject: [PATCH 1278/3482] elfutils: update to 0.183.

Remove all patches: they are now all upstream :)

Also add more checkdepends so we skip less tests.
---
 srcpkgs/elfutils/patches/debuginfod.patch     |  13 ---
 srcpkgs/elfutils/patches/fts-obstack.patch    | 107 ------------------
 .../elfutils/patches/musl-asm_ptrace_h.patch  |  10 --
 srcpkgs/elfutils/patches/musl-macros.patch    |  74 ------------
 srcpkgs/elfutils/patches/musl-qsort_r.patch   |  65 -----------
 .../elfutils/patches/musl-strerror_r.patch    |  19 ----
 srcpkgs/elfutils/template                     |  22 ++--
 7 files changed, 11 insertions(+), 299 deletions(-)
 delete mode 100644 srcpkgs/elfutils/patches/debuginfod.patch
 delete mode 100644 srcpkgs/elfutils/patches/fts-obstack.patch
 delete mode 100644 srcpkgs/elfutils/patches/musl-asm_ptrace_h.patch
 delete mode 100644 srcpkgs/elfutils/patches/musl-macros.patch
 delete mode 100644 srcpkgs/elfutils/patches/musl-qsort_r.patch
 delete mode 100644 srcpkgs/elfutils/patches/musl-strerror_r.patch

diff --git a/srcpkgs/elfutils/patches/debuginfod.patch b/srcpkgs/elfutils/patches/debuginfod.patch
deleted file mode 100644
index d26d945d1ff1..000000000000
--- a/srcpkgs/elfutils/patches/debuginfod.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git debuginfod/debuginfod.cxx debuginfod/debuginfod.cxx
-index 3085f388..d2a434ee 100644
---- debuginfod/debuginfod.cxx
-+++ debuginfod/debuginfod.cxx
-@@ -46,7 +46,7 @@ extern "C" {
- #include <unistd.h>
- #include <stdlib.h>
- #include <error.h>
--// #include <libintl.h> // not until it supports C++ << better
-+#include <libintl.h>
- #include <locale.h>
- #include <pthread.h>
- #include <signal.h>
diff --git a/srcpkgs/elfutils/patches/fts-obstack.patch b/srcpkgs/elfutils/patches/fts-obstack.patch
deleted file mode 100644
index 44ef0aee70ea..000000000000
--- a/srcpkgs/elfutils/patches/fts-obstack.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git ChangeLog ChangeLog
-index 128da6c6..565d021c 100644
---- ChangeLog
-+++ ChangeLog
-@@ -1,3 +1,7 @@
-+2020-11-01  Érico N. Rolim  <erico.erc@gmail.com>
-+
-+	* configure.ac: Check for fts and obstack from outside libc.
-+
- 2020-10-28  Mark Wielaard  <mark@klomp.org>
- 
- 	* configure.ac: Set version to 0.182.
-diff --git configure.ac configure.ac
-index 515ac704..c1a6954d 100644
---- configure.ac
-+++ configure.ac
-@@ -542,6 +542,26 @@ else
- fi
- AC_SUBST([argp_LDADD])
- 
-+saved_LIBS="$LIBS"
-+AC_SEARCH_LIBS([fts_close], [fts])
-+LIBS="$saved_LIBS"
-+case "$ac_cv_search_fts_close" in
-+        no) AC_MSG_FAILURE([failed to find fts_close]) ;;
-+        -l*) fts_LIBS="$ac_cv_search_fts_close" ;;
-+        *) fts_LIBS= ;;
-+esac
-+AC_SUBST([fts_LIBS])
-+
-+saved_LIBS="$LIBS"
-+AC_SEARCH_LIBS([_obstack_free], [obstack])
-+LIBS="$saved_LIBS"
-+case "$ac_cv_search__obstack_free" in
-+        no) AC_MSG_FAILURE([failed to find obstack_free]) ;;
-+        -l*) obstack_LIBS="$ac_cv_search__obstack_free" ;;
-+        *) obstack_LIBS= ;;
-+esac
-+AC_SUBST([obstack_LIBS])
-+
- dnl The directories with content.
- 
- dnl Documentation.
-diff --git debuginfod/Makefile.am debuginfod/Makefile.am
-index 01985600..0af3b58c 100644
---- debuginfod/Makefile.am
-+++ debuginfod/Makefile.am
-@@ -71,10 +71,10 @@ bin_PROGRAMS += debuginfod-find
- endif
- 
- debuginfod_SOURCES = debuginfod.cxx
--debuginfod_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod) $(libmicrohttpd_LIBS) $(sqlite3_LIBS) $(libarchive_LIBS) -lpthread -ldl
-+debuginfod_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod) $(argp_LDADD) $(fts_LIBS) $(libmicrohttpd_LIBS) $(sqlite3_LIBS) $(libarchive_LIBS) -lpthread -ldl
- 
- debuginfod_find_SOURCES = debuginfod-find.c
--debuginfod_find_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod)
-+debuginfod_find_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod) $(argp_LDADD) $(fts_LIBS)
- 
- if LIBDEBUGINFOD
- noinst_LIBRARIES = libdebuginfod.a
-@@ -98,7 +98,7 @@ libdebuginfod_so_LIBS = libdebuginfod_pic.a
- if DUMMY_LIBDEBUGINFOD
- libdebuginfod_so_LDLIBS =
- else
--libdebuginfod_so_LDLIBS = $(libcurl_LIBS)
-+libdebuginfod_so_LDLIBS = $(libcurl_LIBS) $(fts_LIBS)
- endif
- libdebuginfod.so$(EXEEXT): $(srcdir)/libdebuginfod.map $(libdebuginfod_so_LIBS)
- 	$(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \
-diff --git libdw/Makefile.am libdw/Makefile.am
-index 33b5838d..1dbb3d5e 100644
---- libdw/Makefile.am
-+++ libdw/Makefile.am
-@@ -109,7 +109,7 @@ libdw_so_LIBS = ../libebl/libebl_pic.a ../backends/libebl_backends_pic.a \
- 		../libcpu/libcpu_pic.a libdw_pic.a ../libdwelf/libdwelf_pic.a \
- 		../libdwfl/libdwfl_pic.a
- libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so
--libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) -pthread
-+libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(fts_LIBS) $(obstack_LIBS) $(zip_LIBS) -pthread
- libdw_so_SOURCES =
- libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS)
- 	$(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \
-diff --git src/Makefile.am src/Makefile.am
-index e462e7d7..88d0ac8f 100644
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -69,7 +69,7 @@ ar_no_Wstack_usage = yes
- unstrip_no_Wstack_usage = yes
- 
- readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD)
--nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) \
-+nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(obstack_LIBS) \
- 	   $(demanglelib)
- size_LDADD = $(libelf) $(libeu) $(argp_LDADD)
- strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
-@@ -78,9 +78,9 @@ findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD)
- addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(demanglelib)
- elfcmp_LDADD = $(libebl) $(libdw) $(libelf) $(libeu) $(argp_LDADD)
- objdump_LDADD  = $(libasm) $(libebl) $(libdw) $(libelf) $(libeu) $(argp_LDADD)
--ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)
-+ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(obstack_LIBS)
- strings_LDADD = $(libelf) $(libeu) $(argp_LDADD)
--ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)
-+ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(obstack_LIBS)
- unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
- stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(demanglelib)
- elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
diff --git a/srcpkgs/elfutils/patches/musl-asm_ptrace_h.patch b/srcpkgs/elfutils/patches/musl-asm_ptrace_h.patch
deleted file mode 100644
index d4ebf315549c..000000000000
--- a/srcpkgs/elfutils/patches/musl-asm_ptrace_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- backends/ppc_initreg.c	2019-11-26 23:48:42.000000000 +0100
-+++ backends/ppc_initreg.c	2019-12-08 16:57:58.334872602 +0100
-@@ -32,6 +32,7 @@
- 
- #include <stdlib.h>
- #if defined(__powerpc__) && defined(__linux__)
-+# include <asm/ptrace.h>
- # include <sys/ptrace.h>
- # include <sys/user.h>
- #endif
diff --git a/srcpkgs/elfutils/patches/musl-macros.patch b/srcpkgs/elfutils/patches/musl-macros.patch
deleted file mode 100644
index 97a8c2bf3527..000000000000
--- a/srcpkgs/elfutils/patches/musl-macros.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git debuginfod/debuginfod-client.c debuginfod/debuginfod-client.c
-index 0e5177bc..ce1d819b 100644
---- debuginfod/debuginfod-client.c
-+++ debuginfod/debuginfod-client.c
-@@ -212,13 +212,13 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
-     return 0;
- 
-   /* Create the cache and config files as necessary.  */
--  if (stat(cache_path, &st) != 0 && mkdir(cache_path, 0777) < 0)
-+  if (stat(cache_path, &st) != 0 && mkdir(cache_path, ACCESSPERMS) < 0)
-     return -errno;
- 
-   int fd = -1;
- 
-   /* init cleaning interval config file.  */
--  fd = open(interval_path, O_CREAT | O_RDWR, 0666);
-+  fd = open(interval_path, O_CREAT | O_RDWR, DEFFILEMODE);
-   if (fd < 0)
-     return -errno;
- 
-@@ -227,7 +227,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
- 
-   /* init max age config file.  */
-   if (stat(maxage_path, &st) != 0
--      && (fd = open(maxage_path, O_CREAT | O_RDWR, 0666)) < 0)
-+      && (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0)
-     return -errno;
- 
-   if (dprintf(fd, "%ld", cache_default_max_unused_age_s) < 0)
-diff --git lib/system.h lib/system.h
-index 292082bd..5d16ebc6 100644
---- lib/system.h
-+++ lib/system.h
-@@ -85,6 +85,18 @@
-      __res; })
- #endif
- 
-+#ifndef ACCESSPERMS
-+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */
-+#endif
-+
-+#ifndef ALLPERMS
-+#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */
-+#endif
-+
-+#ifndef DEFFILEMODE
-+#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* DEFFILEMODE*/
-+#endif
-+
- static inline ssize_t __attribute__ ((unused))
- pwrite_retry (int fd, const void *buf, size_t len, off_t off)
- {
-diff --git src/unstrip.c src/unstrip.c
-index 0257d9cc..c99ee612 100644
---- src/unstrip.c
-+++ src/unstrip.c
-@@ -315,7 +315,7 @@ make_directories (const char *path)
-   if (dir == NULL)
-     error(EXIT_FAILURE, errno, _("memory exhausted"));
- 
--  while (mkdir (dir, 0777) < 0 && errno != EEXIST)
-+  while (mkdir (dir, ACCESSPERMS) < 0 && errno != EEXIST)
-     {
-       if (errno == ENOENT)
-         make_directories (dir);
-@@ -2192,7 +2192,7 @@ DWARF data in '%s' not adjusted for prelinking bias; consider prelink -u"),
- 
-       /* Copy the unstripped file and then modify it.  */
-       int outfd = open (output_file, O_RDWR | O_CREAT,
--			  stripped_ehdr->e_type == ET_REL ? 0666 : 0777);
-+			  stripped_ehdr->e_type == ET_REL ? DEFFILEMODE : ACCESSPERMS);
-       if (outfd < 0)
- 	error (EXIT_FAILURE, errno, _("cannot open '%s'"), output_file);
-       Elf *outelf = elf_begin (outfd, ELF_C_WRITE, NULL);
diff --git a/srcpkgs/elfutils/patches/musl-qsort_r.patch b/srcpkgs/elfutils/patches/musl-qsort_r.patch
deleted file mode 100644
index 10697d6023af..000000000000
--- a/srcpkgs/elfutils/patches/musl-qsort_r.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- src/readelf.c
-+++ src/readelf.c
-@@ -4773,10 +4773,11 @@ listptr_base (struct listptr *p)
-   return cudie_base (&cu);
- }
- 
-+static const char *listptr_name;
-+
- static int
--compare_listptr (const void *a, const void *b, void *arg)
-+compare_listptr (const void *a, const void *b)
- {
--  const char *name = arg;
-   struct listptr *p1 = (void *) a;
-   struct listptr *p2 = (void *) b;
- 
-@@ -4792,21 +4793,21 @@ compare_listptr (const void *a, const void *b, void *arg)
- 	  p1->warned = p2->warned = true;
- 	  error (0, 0,
- 		 gettext ("%s %#" PRIx64 " used with different address sizes"),
--		 name, (uint64_t) p1->offset);
-+		 listptr_name, (uint64_t) p1->offset);
- 	}
-       if (p1->dwarf64 != p2->dwarf64)
- 	{
- 	  p1->warned = p2->warned = true;
- 	  error (0, 0,
- 		 gettext ("%s %#" PRIx64 " used with different offset sizes"),
--		 name, (uint64_t) p1->offset);
-+		 listptr_name, (uint64_t) p1->offset);
- 	}
-       if (listptr_base (p1) != listptr_base (p2))
- 	{
- 	  p1->warned = p2->warned = true;
- 	  error (0, 0,
- 		 gettext ("%s %#" PRIx64 " used with different base addresses"),
--		 name, (uint64_t) p1->offset);
-+		 listptr_name, (uint64_t) p1->offset);
- 	}
-       if (p1->attr != p2 ->attr)
- 	{
-@@ -4814,7 +4815,7 @@ compare_listptr (const void *a, const void *b, void *arg)
- 	  error (0, 0,
- 		 gettext ("%s %#" PRIx64
- 			  " used with different attribute %s and %s"),
--		 name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr),
-+		 listptr_name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr),
- 		 dwarf_attr_name (p2->attr));
- 	}
-     }
-@@ -4885,9 +4886,11 @@ notice_listptr (enum section_e section, struct listptr_table *table,
- static void
- sort_listptr (struct listptr_table *table, const char *name)
- {
--  if (table->n > 0)
--    qsort_r (table->table, table->n, sizeof table->table[0],
--	     &compare_listptr, (void *) name);
-+  if (table->n > 0) {
-+    listptr_name = name;
-+    qsort (table->table, table->n, sizeof table->table[0],
-+	     &compare_listptr);
-+  }
- }
- 
- static bool
diff --git a/srcpkgs/elfutils/patches/musl-strerror_r.patch b/srcpkgs/elfutils/patches/musl-strerror_r.patch
deleted file mode 100644
index d7797e9214a4..000000000000
--- a/srcpkgs/elfutils/patches/musl-strerror_r.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- libdwfl/dwfl_error.c	2015-09-29 17:18:51.000000000 +0200
-+++ libdwfl/dwfl_error.c	2015-11-20 05:11:29.889002058 +0100
-@@ -154,7 +154,16 @@
-   switch (error &~ 0xffff)
-     {
-     case OTHER_ERROR (ERRNO):
-+#if defined(__GLIBC__)
-       return strerror_r (error & 0xffff, "bad", 0);
-+#else
-+      {
-+        static __thread char buf[128] = "";
-+        if (0 == strerror_r(error & 0xffff, buf, sizeof(buf)))
-+          return buf;
-+      }
-+      return "strerror_r() failed";
-+#endif
-     case OTHER_ERROR (LIBELF):
-       return elf_errmsg (error & 0xffff);
-     case OTHER_ERROR (LIBDW):
diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index 2f4fb896ec97..86e47a3e339e 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,38 +1,38 @@
 # Template file for 'elfutils'
 pkgname=elfutils
-version=0.182
-revision=4
+version=0.183
+revision=1
 build_style=gnu-configure
 configure_args="--program-prefix=eu-"
 hostmakedepends="automake libtool pkg-config"
 _devel_depends="bzip2-devel liblzma-devel zlib-devel libzstd-devel"
 makedepends="${_devel_depends} libcurl-devel libarchive-devel sqlite-devel
  libmicrohttpd-devel"
+checkdepends="zstd bzip2 curl rpm cpio"
 short_desc="Utilities to handle ELF object files"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://sourceware.org/elfutils/"
 distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2"
-checksum=ecc406914edf335f0b7fc084ebe6c460c4d6d5175bfdd6688c1c78d9146b8858
+checksum=c3637c208d309d58714a51e61e63f1958808fead882e9b607506a29e5474f2c5
 # subpackages require explicit ordering
 subpackages="debuginfod libdebuginfod libelf elfutils-devel"
 
-CFLAGS="-Wno-error"
-CXXFLAGS="-Wno-error -Wl,-z,stack-size=2097152"
-
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" argp-standalone musl-fts-devel musl-obstack-devel musl-legacy-compat"
+
+	# mainly warnings from using error.h
+	CFLAGS="-Wno-error"
 	# XXX: breaks some expected functionality
 	CFLAGS+=" -DFNM_EXTMATCH=0"
+	# warnings and avoid blowing the stack
+	CXXFLAGS="-Wno-error -Wl,-z,stack-size=2097152"
 fi
 
-pre_configure() {
-	autoreconf -if
-}
-
 do_check() {
+	# test failures also expected if building with debug disabled
 	make check ${makejobs} ||
-		msg_warn "Failure in testsuite, expected on musl systems, at least"
+		msg_warn "Failure in testsuite, expected on musl systems, at least\n"
 }
 
 libdebuginfod_package() {

From ad1d8cfdb61f1e07cf3484c88deb294ae012801d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Feb 2021 06:47:15 +0700
Subject: [PATCH 1279/3482] sip: update to 6.0.1.

---
 srcpkgs/sip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index eb7a4ac56f46..34d8d632bba5 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.0.0
+version=6.0.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=6185160e1aa8e167b5919c4761cbbf68cc7478d34fb655b3a28b3eb9acb5943a
+checksum=c933e92b24aedc6d5827748bd8167209102b5de1526e86681a2202549027a784
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"

From 666ee6e3ea04768978187f7e4f63164e12d259fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Feb 2021 06:48:52 +0700
Subject: [PATCH 1280/3482] python3-PyQt-builder: update to 1.8.0.

---
 srcpkgs/python3-PyQt-builder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-PyQt-builder/template b/srcpkgs/python3-PyQt-builder/template
index 956a6ab1cde5..0bd0436784a0 100644
--- a/srcpkgs/python3-PyQt-builder/template
+++ b/srcpkgs/python3-PyQt-builder/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-PyQt-builder'
 pkgname=python3-PyQt-builder
-version=1.7.0
+version=1.8.0
 revision=1
 wrksrc=PyQt-builder-$version
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://www.riverbankcomputing.com/software/pyqt/"
 distfiles="$PYPI_SITE/P/PyQt-builder/PyQt-builder-$version.tar.gz"
-checksum=b6e3c826f98ff4006ecb34df491ac6062a023b63a32e9f9f50904867aff72f2e
+checksum=30b5fd3d1bdafeae3131070ebdc55481cf72c6a05a1b73ea2b420678bed2650c
 
 post_install() {
 	rm -rf $DESTDIR/$py3_sitelib/pyqtbuild/bundle

From d2a262b640a92b085fc454c0a3d1593c68f9e687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 7 Feb 2021 17:31:27 +0700
Subject: [PATCH 1281/3482] python3-PyQt5: remove rpath

---
 srcpkgs/python3-PyQt5/template | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template
index 2a2733b439c4..058095e7c699 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-PyQt5'
 pkgname=python3-PyQt5
 version=5.15.2
-revision=2
+revision=3
 _sipver=12.8.0
 wrksrc="PyQt5-${version}"
 build_helper=qemu
-hostmakedepends="pkg-config qscintilla-qt5-devel python3-sip-PyQt5
+hostmakedepends="pkg-config python3-PyQt-builder qt5-host-tools qt5-qmake
+ python3-dbus"
+makedepends="qscintilla-qt5-devel python3-sip-PyQt5
  python3-devel python-dbus-devel qt5 qt5-devel qt5-tools-devel
- python3-PyQt-builder
  qt5-connectivity-devel qt5-declarative-devel qt5-location-devel
  qt5-multimedia-devel qt5-qmake qt5-sensors-devel qt5-serialport-devel
  qt5-svg-devel qt5-webchannel-devel qt5-webkit-devel qt5-websockets-devel
  qt5-x11extras-devel qt5-xmlpatterns-devel qt5-networkauth-devel pulseaudio-devel"
-makedepends="${hostmakedepends/pkg-config/}"
 depends="python3-sip-PyQt5>=${_sipver}"
 short_desc="Python 3 bindings for the Qt5 toolkit"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -32,7 +32,7 @@ _cross_configure() {
 	mkdir -p "${wrksrc}/.target-spec/linux-g++"
 	cat >"${wrksrc}/.target-spec/linux-g++/qmake.conf" <<-_EOF
 	MAKEFILE_GENERATOR      = UNIX
-	CONFIG                 += incremental
+	CONFIG                 += incremental no_qt_rpath
 	QMAKE_INCREMENTAL_STYLE = sublib
 
 	include(/usr/lib/qt5/mkspecs/common/linux.conf)
@@ -41,6 +41,7 @@ _cross_configure() {
 
 	QMAKE_TARGET_CONFIG     = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qconfig.pri
 	QMAKE_TARGET_MODULE     = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qmodule.pri
+	QMAKEMODULES            = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/modules
 	QMAKE_CC                = ${CC}
 	QMAKE_CXX               = ${CXX}
 	QMAKE_LINK              = ${CXX}
@@ -55,6 +56,7 @@ _cross_configure() {
 	QMAKE_CFLAGS            = ${CFLAGS}
 	QMAKE_CXXFLAGS          = ${CXXFLAGS}
 	QMAKE_LFLAGS            = ${LDFLAGS}
+	INCPATH                 = $XBPS_CROSS_BASE/usr/include/python$py3_ver
 	load(qt_config)
 	_EOF
 	ln -sf ${XBPS_CROSS_BASE}$qplatformdefs ${wrksrc}/.target-spec/linux-g++/
@@ -62,7 +64,7 @@ _cross_configure() {
 	mkdir -p "${wrksrc}/.host-spec/linux-g++"
 	cat > "${wrksrc}/.host-spec/linux-g++/qmake.conf" <<-_EOF
 	MAKEFILE_GENERATOR      = UNIX
-	CONFIG                 += incremental
+	CONFIG                 += incremental no_qt_rpath
 	QMAKE_INCREMENTAL_STYLE = sublib
 
 	include(/usr/lib/qt5/mkspecs/common/linux.conf)
@@ -138,13 +140,18 @@ case " \$* " in
 	exec /usr/lib/qt5/bin/qmake -qtconf $wrksrc/qt.conf "\$@" ;;
 esac
 _EOF
-	chmod +x $XBPS_WRAPPERDIR/qmake
 }
 
 do_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		_cross_configure
+	else
+		cat >$XBPS_WRAPPERDIR/qmake <<-'_EOF'
+		#!/bin/sh
+		exec /usr/lib/qt5/bin/qmake "$@" CONFIG+=no_qt_rpath
+		_EOF
 	fi
+	chmod +x $XBPS_WRAPPERDIR/qmake
 
 	mkdir -p build
 	sip-build --confirm-license --no-make \
@@ -152,14 +159,10 @@ do_configure() {
 		--build-dir build
 
 	if [ "$CROSS_BUILD" ]; then
-		# Fix location of libraries
+		# -I/usr/include/python$py3_ver is set by sip-build :(
 		find build -name Makefile |
 		xargs sed -i "
-			s, \\(/usr/lib/libQt\\), $XBPS_CROSS_BASE\\1,g
-			s,-L\\(/usr/lib\\),-L$XBPS_CROSS_BASE\\1,g
-			/INSTALL_ROOT/s,$XBPS_CROSS_BASE,,g
 			s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g
-			s,-I\\(/usr/lib\\),-I$XBPS_CROSS_BASE\\1,g
 			"
 	fi
 }

From 8e4e1bb6c53b3c7549f92b61c8c5833a6916c043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Feb 2021 23:22:42 +0700
Subject: [PATCH 1282/3482] python3-PyQt5-webengine: remove rpath

---
 srcpkgs/python3-PyQt5-webengine/template | 31 ++++++++++++------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index ae385283b7ff..7f4cb452f8e5 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -1,11 +1,10 @@
 # Template file for 'python3-PyQt5-webengine'
 pkgname=python3-PyQt5-webengine
 version=5.15.2
-revision=1
+revision=2
 wrksrc="PyQtWebEngine-${version}"
-hostmakedepends="pkg-config qt5-qmake python3-PyQt5 sip qt5-webengine-devel
- python3-PyQt-builder python3-PyQt5-devel
- qt5-declarative-devel qt5-webchannel-devel qt5-location-devel"
+hostmakedepends="pkg-config qt5-qmake python3-PyQt5-devel
+ sip python3-PyQt-builder"
 makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
  qt5-webengine-devel python3-devel python3-PyQt5-devel"
 depends="python3-PyQt5>=${version}_1 python3-PyQt5-webchannel>=${version}_1"
@@ -33,7 +32,7 @@ _cross_configure() {
 	mkdir -p "${wrksrc}/.target-spec/linux-g++"
 	cat >"${wrksrc}/.target-spec/linux-g++/qmake.conf" <<-_EOF
 	MAKEFILE_GENERATOR      = UNIX
-	CONFIG                 += incremental
+	CONFIG                 += incremental no_qt_rpath
 	QMAKE_INCREMENTAL_STYLE = sublib
 
 	include(/usr/lib/qt5/mkspecs/common/linux.conf)
@@ -42,6 +41,7 @@ _cross_configure() {
 
 	QMAKE_TARGET_CONFIG     = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qconfig.pri
 	QMAKE_TARGET_MODULE     = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qmodule.pri
+	QMAKEMODULES            = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/modules
 	QMAKE_CC                = ${CC}
 	QMAKE_CXX               = ${CXX}
 	QMAKE_LINK              = ${CXX}
@@ -56,6 +56,8 @@ _cross_configure() {
 	QMAKE_CFLAGS            = ${CFLAGS}
 	QMAKE_CXXFLAGS          = ${CXXFLAGS}
 	QMAKE_LFLAGS            = ${LDFLAGS}
+	INCPATH                 = $XBPS_CROSS_BASE/usr/include/python$py3_ver
+	INCPATH                += $XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel
 	load(qt_config)
 	_EOF
 	ln -sf ${XBPS_CROSS_BASE}$qplatformdefs ${wrksrc}/.target-spec/linux-g++/
@@ -63,7 +65,7 @@ _cross_configure() {
 	mkdir -p "${wrksrc}/.host-spec/linux-g++"
 	cat > "${wrksrc}/.host-spec/linux-g++/qmake.conf" <<-_EOF
 	MAKEFILE_GENERATOR      = UNIX
-	CONFIG                 += incremental
+	CONFIG                 += incremental no_qt_rpath
 	QMAKE_INCREMENTAL_STYLE = sublib
 
 	include(/usr/lib/qt5/mkspecs/common/linux.conf)
@@ -139,28 +141,27 @@ case " \$* " in
 	exec /usr/lib/qt5/bin/qmake -qtconf $wrksrc/qt.conf "\$@" ;;
 esac
 EOF
-	chmod +x $XBPS_WRAPPERDIR/qmake
 }
 
 do_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		_cross_configure
+	else
+		cat >$XBPS_WRAPPERDIR/qmake <<-'_EOF'
+		#!/bin/sh
+		exec /usr/lib/qt5/bin/qmake "$@" CONFIG+=no_qt_rpath
+		_EOF
 	fi
+	chmod +x $XBPS_WRAPPERDIR/qmake
 	mkdir -p build
 	sip-build --no-make \
 		--api-dir /usr/share/qt5/qsci/api/python \
 		--build-dir build
 
 	if [ "$CROSS_BUILD" ]; then
-		# Fix location of libraries
+		# Fix location of python include
 		find build -name Makefile |
-		xargs sed -i "
-			s, \\(/usr/lib/libQt\\), $XBPS_CROSS_BASE\\1,g
-			s,-L\\(/usr/lib\\),-L$XBPS_CROSS_BASE\\1,g
-			/INSTALL_ROOT/s,$XBPS_CROSS_BASE,,g
-			s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g
-			s,-I\\(/usr/lib\\),-I$XBPS_CROSS_BASE\\1,g
-			"
+		xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
 	fi
 }
 

From a0847dc404d0145635f63b0e178cb9b9d82c5520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 31 Jan 2021 09:43:17 +0700
Subject: [PATCH 1283/3482] cmake-gui: remove unnecessary patches

---
 .../patches/0001-Disable-try_run.patch        | 27 -------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 srcpkgs/cmake-gui/patches/0001-Disable-try_run.patch

diff --git a/srcpkgs/cmake-gui/patches/0001-Disable-try_run.patch b/srcpkgs/cmake-gui/patches/0001-Disable-try_run.patch
deleted file mode 100644
index 3e05af1a581f..000000000000
--- a/srcpkgs/cmake-gui/patches/0001-Disable-try_run.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 544abc16419065c009361b9627f69665471cfb6d Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens@artixlinux.org>
-Date: Fri, 20 Nov 2020 22:24:08 -0600
-Subject: [PATCH] Disable try_run
-
-If cross-building, try_run cannot run during
-cross-build so cause build to fail
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git CMakeLists.txt CMakeLists.txt
-index 2d860d4..c14a203 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -61,7 +61,7 @@ if("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
-     if(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)
-       message(FATAL_ERROR "TRY_RUN not allowed with CMAKE_TRY_COMPILE_OSX_ARCHITECTURES=[${CMAKE_TRY_COMPILE_OSX_ARCHITECTURES}]")
-     else()
--      _TRY_RUN(${ARGV})
-+			#  _TRY_RUN(${ARGV})
-     endif()
-   endmacro()
- endif()
--- 
-2.29.2
-

From a786086c750c51b5cbd6c9638c8475d52bb3d791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 18:31:51 -0300
Subject: [PATCH 1284/3482] polkit: update to 0.118.

Also add checkdepends.
---
 srcpkgs/polkit/template | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template
index 0681449a0d97..13a1c10c1d21 100644
--- a/srcpkgs/polkit/template
+++ b/srcpkgs/polkit/template
@@ -1,23 +1,24 @@
 # Template file for 'polkit'
 pkgname=polkit
-version=0.116
-revision=3
+version=0.118
+revision=1
 build_style=gnu-configure
-build_helper="gir"
+build_helper=gir
 configure_args="$(vopt_enable gir introspection) -disable-static
- --with-authfw=pam  --with-os-type=void --with-mozjs=mozjs-60.0"
+ --with-authfw=pam  --with-os-type=void"
 make_dirs="
  /etc/polkit-1/rules.d 0700 polkitd polkitd
  /usr/share/polkit-1/rules.d 0700 polkitd polkitd"
 hostmakedepends="autoconf-archive automake gettext-devel glib-devel
  gobject-introspection gtk-doc intltool libtool pkg-config"
-makedepends="elogind-devel mozjs60-devel pam-devel"
+makedepends="elogind-devel mozjs78-devel pam-devel"
+checkdepends="python3-dbus python3-dbusmock"
 short_desc="Authorization Toolkit"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/polkit"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.gz"
-checksum=88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1
+checksum=6d54e984e7072339f0d3147179e16e34e5fe0705158f259a765d772dcf78956b
 system_accounts="polkitd"
 #replaces="polkit-elogind>=0"
 #provides="polkit-elogind-${version}_${revision}"
@@ -29,14 +30,7 @@ build_options_default="gir"
 pre_configure() {
 	autoreconf -fi
 	# Drop requirement of /sys/fs/cgroup/systemd test in configure... WTF.
-	sed -e 's,/sys/fs/cgroup/systemd/,/sys/fs/cgroup,g' -i configure
-}
-
-post_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		sed -e "s#-include \(/usr/include/mozjs-52/js/RequiredDefines\.h\)#-include ${XBPS_CROSS_BASE}\1#" \
-			-i $(find -name Makefile)
-	fi
+	vsed -e 's,/sys/fs/cgroup/systemd/,/sys/fs/cgroup,g' -i configure
 }
 
 post_install() {

From ba77011f5026360936c3de469c3cb818888d9919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 18:40:51 -0300
Subject: [PATCH 1285/3482] mozjs60: remove package.

---
 common/shlibs                                 |   1 -
 srcpkgs/mozjs60-devel                         |   1 -
 .../0001-silence-sandbox-violations.patch     |  30 -
 ...nd-restore-non-volatile-x28-on-arm64.patch |  64 ---
 ...-clobbering-it-in-the-regex-compiler.patch |  97 ----
 .../mozjs60/patches/0004-fix-soname-lib.patch |  30 -
 .../mozjs60/patches/0005-fix-musl-build.patch |  16 -
 srcpkgs/mozjs60/patches/0006-endianness.patch | 127 -----
 .../patches/0007-jsproperty-endian.patch      |  22 -
 .../mozjs60/patches/0008-copy-headers.patch   |  30 -
 .../mozjs60/patches/0009-mips-sgidefs_h.patch |  11 -
 srcpkgs/mozjs60/patches/0010-mips-LIR.patch   | 511 ------------------
 .../patches/0011-mips-macroassembler.patch    |  27 -
 .../0012-mozjs60.pc-honor-sysroot.patch       |  13 -
 srcpkgs/mozjs60/template                      |  69 ---
 srcpkgs/mozjs60/update                        |   1 -
 srcpkgs/removed-packages/template             |   1 +
 17 files changed, 1 insertion(+), 1050 deletions(-)
 delete mode 120000 srcpkgs/mozjs60-devel
 delete mode 100644 srcpkgs/mozjs60/patches/0001-silence-sandbox-violations.patch
 delete mode 100644 srcpkgs/mozjs60/patches/0002-save-and-restore-non-volatile-x28-on-arm64.patch
 delete mode 100644 srcpkgs/mozjs60/patches/0003-save-x28-before-clobbering-it-in-the-regex-compiler.patch
 delete mode 100644 srcpkgs/mozjs60/patches/0004-fix-soname-lib.patch
 delete mode 100644 srcpkgs/mozjs60/patches/0005-fix-musl-build.patch
 delete mode 100644 srcpkgs/mozjs60/patches/0006-endianness.patch
 delete mode 100644 srcpkgs/mozjs60/patches/0007-jsproperty-endian.patch
 delete mode 100644 srcpkgs/mozjs60/patches/0008-copy-headers.patch
 delete mode 100644 srcpkgs/mozjs60/patches/0009-mips-sgidefs_h.patch
 delete mode 100644 srcpkgs/mozjs60/patches/0010-mips-LIR.patch
 delete mode 100644 srcpkgs/mozjs60/patches/0011-mips-macroassembler.patch
 delete mode 100644 srcpkgs/mozjs60/patches/0012-mozjs60.pc-honor-sysroot.patch
 delete mode 100644 srcpkgs/mozjs60/template
 delete mode 100644 srcpkgs/mozjs60/update

diff --git a/common/shlibs b/common/shlibs
index a39ff167fa6b..d8cd5943d882 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3465,7 +3465,6 @@ libmaxminddb.so.0 libmaxminddb-1.3.2_1
 libmysqlpp.so.3 mysql++-3.2.5_1
 libKF5Syndication.so.5 syndication-5.50.0_1
 liblqr-1.so.0 liblqr-0.4.2_1
-libmozjs-60.so.0 mozjs60-60.0.2_1
 libmozjs-78.so.0 mozjs78-78.1.0_1
 libebur128.so.1 libebur128-1.2.4_1
 libgtksourceview-4.so.0 gtksourceview4-4.0.2_1
diff --git a/srcpkgs/mozjs60-devel b/srcpkgs/mozjs60-devel
deleted file mode 120000
index 46261b43dbe5..000000000000
--- a/srcpkgs/mozjs60-devel
+++ /dev/null
@@ -1 +0,0 @@
-mozjs60
\ No newline at end of file
diff --git a/srcpkgs/mozjs60/patches/0001-silence-sandbox-violations.patch b/srcpkgs/mozjs60/patches/0001-silence-sandbox-violations.patch
deleted file mode 100644
index 918202671822..000000000000
--- a/srcpkgs/mozjs60/patches/0001-silence-sandbox-violations.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream: no
-From 9ad10569e11a2fb96377188f895bc66abcc9511d Mon Sep 17 00:00:00 2001
-From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Date: Wed, 5 Sep 2018 15:05:24 +0200
-Subject: [PATCH] silence sandbox violations
-
-Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
----
- python/mozbuild/mozbuild/frontend/emitter.py | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
-index 642b381c0..c37fbf5d0 100644
---- a/python/mozbuild/mozbuild/frontend/emitter.py
-+++ b/python/mozbuild/mozbuild/frontend/emitter.py
-@@ -1127,11 +1127,6 @@ class TreeMetadataEmitter(LoggingMixin):
-                 raise SandboxValidationError('Path specified in LOCAL_INCLUDES '
-                     'does not exist: %s (resolved to %s)' % (local_include,
-                     full_path), context)
--            if (full_path == context.config.topsrcdir or
--                    full_path == context.config.topobjdir):
--                raise SandboxValidationError('Path specified in LOCAL_INCLUDES '
--                    'is not allowed: %s (resolved to %s)' % (local_include,
--                    full_path), context)
-             include_obj = LocalInclude(context, local_include)
-             local_includes.append(include_obj.path.full_path)
-             yield include_obj
--- 
-2.18.0
-
diff --git a/srcpkgs/mozjs60/patches/0002-save-and-restore-non-volatile-x28-on-arm64.patch b/srcpkgs/mozjs60/patches/0002-save-and-restore-non-volatile-x28-on-arm64.patch
deleted file mode 100644
index 46d280d06aee..000000000000
--- a/srcpkgs/mozjs60/patches/0002-save-and-restore-non-volatile-x28-on-arm64.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-# HG changeset patch
-# User Lars T Hansen <lhansen@mozilla.com>
-# Date 1519822672 -3600
-# Node ID 800abe66894d6b07b24bccecbf6a65e2261076f6
-# Parent  223c97459e96183eb616aed39147207bdb953ba8
-Bug 1375074 - Save and restore non-volatile x28 on ARM64 for generated unboxed object constructor.  r=sstangl
-
-Origin: upstream
-Applied-upstream: 61, commit: https://hg.mozilla.org/mozilla-central/rev/800abe66894d
----
- js/src/vm/UnboxedObject.cpp | 30 ++++++++++++++++++++++++++----
- 1 file changed, 26 insertions(+), 4 deletions(-)
-
-diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp
-index 35ca20d7405f..1c20a1093d13 100644
---- a/js/src/vm/UnboxedObject.cpp
-+++ b/js/src/vm/UnboxedObject.cpp
-@@ -86,9 +86,16 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1;
- #endif
-
- #ifdef JS_CODEGEN_ARM64
--  // ARM64 communicates stack address via sp, but uses a pseudo-sp for
--  // addressing.
--  masm.initStackPtr();
-+    // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for
-+    // addressing.  The register we use for PSP may however also be used by
-+    // calling code, and it is nonvolatile, so save it.  Do this as a special
-+    // case first because the generic save/restore code needs the PSP to be
-+    // initialized already.
-+    MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
-+    masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
-+
-+    // Initialize the PSP from the SP.
-+    masm.initStackPtr();
- #endif
-
-   MOZ_ASSERT(propertiesReg.volatile_());
-@@ -239,7 +246,22 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1;
-   if (ScratchDoubleReg.volatile_()) masm.pop(ScratchDoubleReg);
-   masm.PopRegsInMask(savedNonVolatileRegisters);
-
--  masm.abiret();
-+#ifdef JS_CODEGEN_ARM64
-+    // Now restore the value that was in the PSP register on entry, and return.
-+
-+    // Obtain the correct SP from the PSP.
-+    masm.Mov(sp, PseudoStackPointer64);
-+
-+    // Restore the saved value of the PSP register, this value is whatever the
-+    // caller had saved in it, not any actual SP value, and it must not be
-+    // overwritten subsequently.
-+    masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
-+
-+    // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
-+    masm.Ret(vixl::lr);
-+#else
-+    masm.abiret();
-+#endif
-
-   masm.bind(&failureStoreOther);
-
---
-2.21.0
-
diff --git a/srcpkgs/mozjs60/patches/0003-save-x28-before-clobbering-it-in-the-regex-compiler.patch b/srcpkgs/mozjs60/patches/0003-save-x28-before-clobbering-it-in-the-regex-compiler.patch
deleted file mode 100644
index 3886c0e9b210..000000000000
--- a/srcpkgs/mozjs60/patches/0003-save-x28-before-clobbering-it-in-the-regex-compiler.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-# HG changeset patch
-# User Lars T Hansen <lhansen@mozilla.com>
-# Date 1521449886 -3600
-# Node ID 903a79a1efff18fc7cc50db09a3fe5d768adc9a8
-# Parent  4d2955a9ca7e30ca4c3af9c214ccc77fb2fe7fb8
-Bug 1445907 - Save x28 before clobbering it in the regex compiler. r=sstangl
-
-Origin: upstream
-Applied-upstream: 61, commit: https://hg.mozilla.org/mozilla-central/rev/903a79a1efff
----
-diff --git a/js/src/irregexp/NativeRegExpMacroAssembler.cpp b/js/src/irregexp/NativeRegExpMacroAssembler.cpp
---- a/js/src/irregexp/NativeRegExpMacroAssembler.cpp
-+++ b/js/src/irregexp/NativeRegExpMacroAssembler.cpp
-@@ -118,17 +118,25 @@ NativeRegExpMacroAssembler::GenerateCode
-
-     Label return_temp0;
-
-     // Finalize code - write the entry point code now we know how many
-     // registers we need.
-     masm.bind(&entry_label_);
-
- #ifdef JS_CODEGEN_ARM64
--    // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing.
-+    // ARM64 communicates stack address via SP, but uses a pseudo-sp (PSP) for
-+    // addressing.  The register we use for PSP may however also be used by
-+    // calling code, and it is nonvolatile, so save it.  Do this as a special
-+    // case first because the generic save/restore code needs the PSP to be
-+    // initialized already.
-+    MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
-+    masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
-+
-+    // Initialize the PSP from the SP.
-     masm.initStackPtr();
- #endif
-
-     // Push non-volatile registers which might be modified by jitcode.
-     size_t pushedNonVolatileRegisters = 0;
-     for (GeneralRegisterForwardIterator iter(savedNonVolatileRegisters); iter.more(); ++iter) {
-         masm.Push(*iter);
-         pushedNonVolatileRegisters++;
-@@ -416,17 +424,32 @@ NativeRegExpMacroAssembler::GenerateCode
-     masm.pop(temp0);
-     masm.movePtr(temp0, StackPointer);
- #endif
-
-     // Restore non-volatile registers which were saved on entry.
-     for (GeneralRegisterBackwardIterator iter(savedNonVolatileRegisters); iter.more(); ++iter)
-         masm.Pop(*iter);
-
-+#ifdef JS_CODEGEN_ARM64
-+    // Now restore the value that was in the PSP register on entry, and return.
-+
-+    // Obtain the correct SP from the PSP.
-+    masm.Mov(sp, PseudoStackPointer64);
-+
-+    // Restore the saved value of the PSP register, this value is whatever the
-+    // caller had saved in it, not any actual SP value, and it must not be
-+    // overwritten subsequently.
-+    masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
-+
-+    // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
-+    masm.Ret(vixl::lr);
-+#else
-     masm.abiret();
-+#endif
-
-     // Backtrack code (branch target for conditional backtracks).
-     if (backtrack_label_.used()) {
-         masm.bind(&backtrack_label_);
-         Backtrack();
-     }
-
-     // Backtrack stack overflow code.
-diff --git a/js/src/jit-test/tests/regexp/bug1445907.js b/js/src/jit-test/tests/regexp/bug1445907.js
-new file mode 100644
---- /dev/null
-+++ b/js/src/jit-test/tests/regexp/bug1445907.js
-@@ -0,0 +1,15 @@
-+// On ARM64, we failed to save x28 properly when generating code for the regexp
-+// matcher.
-+//
-+// There's wasm and Debugger code here because the combination forces the use of
-+// x28 and exposes the bug when running on the simulator.
-+
-+if (!wasmIsSupported())
-+    quit();
-+
-+var g = newGlobal('');
-+var dbg = new Debugger(g);
-+g.eval(`var m = new WebAssembly.Instance(new WebAssembly.Module(wasmTextToBinary('(module (func (export "test")))')))`);
-+var re = /./;
-+dbg.onEnterFrame = function(frame) { re.exec("x") };
-+result = g.eval("m.exports.test()");
-
---
-2.21.0
-
diff --git a/srcpkgs/mozjs60/patches/0004-fix-soname-lib.patch b/srcpkgs/mozjs60/patches/0004-fix-soname-lib.patch
deleted file mode 100644
index b9147fa20c9b..000000000000
--- a/srcpkgs/mozjs60/patches/0004-fix-soname-lib.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Source: Arch Linux
-Upstream: Unknown
-Reason: fixes linking against libmozjs-60
-
-diff --git i/js/src/build/Makefile.in w/js/src/build/Makefile.in
-index ee19104e0ef5..a0f06fd35a18 100644
---- i/js/src/build/Makefile.in
-+++ w/js/src/build/Makefile.in
-@@ -89,6 +89,8 @@ ifneq (,$(REAL_LIBRARY))
- endif
- ifneq (,$(SHARED_LIBRARY))
- 	$(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir)
-+	mv -f $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).0
-+	ln -s $(SHARED_LIBRARY).0 $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
- ifeq ($(OS_ARCH),Darwin)
- 	install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
- endif
-diff --git i/js/src/build/moz.build w/js/src/build/moz.build
-index a7f5fa4ce8eb..726687c13fb0 100644
---- i/js/src/build/moz.build
-+++ w/js/src/build/moz.build
-@@ -23,6 +23,7 @@ if not CONFIG['JS_STANDALONE']:
- if CONFIG['JS_SHARED_LIBRARY']:
-     GeckoSharedLibrary('js', linkage=None)
-     SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
-+    LDFLAGS += ['-Wl,-soname,lib{}.so.0'.format(SHARED_LIBRARY_NAME)]
- else:
-     Library('js')
- 
-
diff --git a/srcpkgs/mozjs60/patches/0005-fix-musl-build.patch b/srcpkgs/mozjs60/patches/0005-fix-musl-build.patch
deleted file mode 100644
index af394673990e..000000000000
--- a/srcpkgs/mozjs60/patches/0005-fix-musl-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream: No
-Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD:
-https://github.com/void-linux/void-packages/issues/2598
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -1272,6 +1272,9 @@
-     *-android*|*-linuxandroid*)
-       :
-       ;;
-+    *-musl*)
-+      :
-+      ;;
-     *)
-       AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
-       ;;
diff --git a/srcpkgs/mozjs60/patches/0006-endianness.patch b/srcpkgs/mozjs60/patches/0006-endianness.patch
deleted file mode 100644
index 56352b74c706..000000000000
--- a/srcpkgs/mozjs60/patches/0006-endianness.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-Bug 1488552 - Ensure proper running on 64-bit and 32-bit BE platforms.
-
-Index: mozjs60/js/src/gc/Marking-inl.h
-===================================================================
---- a/js/src/gc/Marking-inl.h	2019-02-21 14:44:28.296951992 +0100
-+++ b/js/src/gc/Marking-inl.h	2019-02-22 10:22:54.612120604 +0100
-@@ -82,12 +82,28 @@
-   MOZ_ASSERT(!isForwarded());
-   // The location of magic_ is important because it must never be valid to see
-   // the value Relocated there in a GC thing that has not been moved.
-+#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32
-+  // On 32-bit, the magic_ aliases with whatever comes after the first
-+  // pointer; on little-endian 64-bit, the magic_ aliases with the
-+  // 32 most significant bits of the pointer, which are the second half.
-   static_assert(offsetof(RelocationOverlay, magic_) ==
-                     offsetof(JSObject, group_) + sizeof(uint32_t),
-                 "RelocationOverlay::magic_ is in the wrong location");
-   static_assert(offsetof(RelocationOverlay, magic_) ==
-                     offsetof(js::Shape, base_) + sizeof(uint32_t),
-                 "RelocationOverlay::magic_ is in the wrong location");
-+#elif JS_BITS_PER_WORD == 64
-+  // On big-endian 64-bit, the magic_ aliases with the 32 most
-+  // significant bits of the pointer, but now that's the first half.
-+  static_assert(offsetof(RelocationOverlay, magic_) ==
-+                    offsetof(JSObject, group_),
-+                "RelocationOverlay::magic_ is in the wrong location");
-+  static_assert(offsetof(RelocationOverlay, magic_) ==
-+                    offsetof(js::Shape, base_),
-+                "RelocationOverlay::magic_ is in the wrong location");
-+#else
-+#  error "Unknown endianness or word size"
-+#endif
-   static_assert(
-       offsetof(RelocationOverlay, magic_) == offsetof(JSString, d.u1.length),
-       "RelocationOverlay::magic_ is in the wrong location");
-Index: mozjs60/js/src/gc/RelocationOverlay.h
-===================================================================
---- a/js/src/gc/RelocationOverlay.h	2019-02-21 14:44:28.296951992 +0100
-+++ b/js/src/gc/RelocationOverlay.h	2019-02-22 10:19:41.816822202 +0100
-@@ -34,14 +34,25 @@
-     /* See comment in js/public/HeapAPI.h. */
-     static const uint32_t Relocated = js::gc::Relocated;
- 
-+#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32
-     /*
--     * Keep the low 32 bits untouched. Use them to distinguish strings from
-+     * Keep the first 32 bits untouched. Use them to distinguish strings from
-      * objects in the nursery.
-      */
-     uint32_t preserve_;
- 
-     /* Set to Relocated when moved. */
-     uint32_t magic_;
-+#elif JS_BITS_PER_WORD == 64
-+  /*
-+   * On big-endian, we need to reorder to keep preserve_ lined up with the
-+   * low 32 bits of the aligned group_ pointer in JSObject.
-+   */
-+  uint32_t magic_;
-+  uint32_t preserve_;
-+#else
-+#  error "Unknown endianness or word size"
-+#endif
- 
-     /* The location |this| was moved to. */
-     Cell* newLocation_;
-Index: mozjs60/js/src/jsfriendapi.h
-===================================================================
---- a/js/src/jsfriendapi.h	2019-02-21 14:44:28.484951245 +0100
-+++ b/js/src/jsfriendapi.h	2019-02-22 10:24:25.663774399 +0100
-@@ -9,6 +9,7 @@
- 
- #include "mozilla/Atomics.h"
- #include "mozilla/Casting.h"
-+#include "mozilla/EndianUtils.h"
- #include "mozilla/Maybe.h"
- #include "mozilla/MemoryReporting.h"
- #include "mozilla/UniquePtr.h"
-@@ -640,8 +641,15 @@
-     static const uint32_t LATIN1_CHARS_BIT = JS_BIT(6);
-     static const uint32_t EXTERNAL_FLAGS   = LINEAR_BIT | NON_ATOM_BIT | JS_BIT(5);
-     static const uint32_t TYPE_FLAGS_MASK  = JS_BIT(6) - 1;
-+#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32
-     uint32_t flags;
-     uint32_t length;
-+#elif JS_BITS_PER_WORD == 64
-+    uint32_t length;
-+    uint32_t flags;
-+#else
-+#  error "Unknown endianness or word size"
-+#endif
-     union {
-         const JS::Latin1Char* nonInlineCharsLatin1;
-         const char16_t* nonInlineCharsTwoByte;
-Index: mozjs60/js/src/vm/StringType.h
-===================================================================
---- a/js/src/vm/StringType.h	2019-02-21 14:44:29.072948907 +0100
-+++ b/js/src/vm/StringType.h	2019-02-22 10:21:20.464469244 +0100
-@@ -7,6 +7,7 @@
- #ifndef vm_StringType_h
- #define vm_StringType_h
- 
-+#include "mozilla/EndianUtils.h"
- #include "mozilla/MemoryReporting.h"
- #include "mozilla/PodOperations.h"
- #include "mozilla/Range.h"
-@@ -166,8 +167,20 @@
-     {
-         union {
-             struct {
-+#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32
-                 uint32_t           flags;               /* JSString */
-                 uint32_t           length;              /* JSString */
-+#elif JS_BITS_PER_WORD == 64
-+                /*
-+                 * On big-endian, we need to reorder to keep flags lined up
-+                 * with the low 32 bits of the aligned group_ pointer in
-+                 * JSObject.
-+                 */
-+                uint32_t length; /* JSString */
-+                uint32_t flags;  /* JSString */
-+#else
-+#  error "Unknown endianness or word size"
-+#endif
-             };
-             uintptr_t              flattenData;         /* JSRope (temporary while flattening) */
-         } u1;
diff --git a/srcpkgs/mozjs60/patches/0007-jsproperty-endian.patch b/srcpkgs/mozjs60/patches/0007-jsproperty-endian.patch
deleted file mode 100644
index dd01c37ac925..000000000000
--- a/srcpkgs/mozjs60/patches/0007-jsproperty-endian.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Bug 1543659 - fix JSPropertySpec::ValueWrapper on 64-bit big-endian platforms
-
-Add some padding to make the union's int32 member correspond to the
-low-order bits of the string member.  This fixes TypedArray tests on
-s390x.
-
---- a/js/src/jsapi.h
-+++ b/js/src/jsapi.h
-@@ -1702,7 +1702,12 @@
-         uintptr_t   type;
-         union {
-             const char* string;
--            int32_t     int32;
-+            struct {
-+#if MOZ_BIG_ENDIAN && JS_BITS_PER_WORD == 64
-+                uint32_t    padding;
-+#endif
-+                int32_t     int32;
-+            };
-         };
-     };
- 
diff --git a/srcpkgs/mozjs60/patches/0008-copy-headers.patch b/srcpkgs/mozjs60/patches/0008-copy-headers.patch
deleted file mode 100644
index a43674110652..000000000000
--- a/srcpkgs/mozjs60/patches/0008-copy-headers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 5 Jul 2017 22:45:59 -0700
-Subject: build: Copy headers on install instead of symlinking
-
-Patch ported forward to mozjs52 by Philip Chimento
-<philip.chimento@gmail.com>.
----
- python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
-index dd9020d..6918ef8 100644
---- a/python/mozbuild/mozbuild/backend/recursivemake.py
-+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -1427,11 +1427,11 @@ class RecursiveMakeBackend(CommonBackend):
-                                 raise Exception("Wildcards are only supported in the filename part of "
-                                                 "srcdir-relative or absolute paths.")
- 
--                            install_manifest.add_pattern_link(basepath, wild, path)
-+                            install_manifest.add_pattern_copy(basepath, wild, path)
-                         else:
--                            install_manifest.add_pattern_link(f.srcdir, f, path)
-+                            install_manifest.add_pattern_copy(f.srcdir, f, path)
-                     else:
--                        install_manifest.add_link(f.full_path, dest)
-+                        install_manifest.add_copy(f.full_path, dest)
-                 else:
-                     install_manifest.add_optional_exists(dest)
-                     backend_file.write('%s_FILES += %s\n' % (
-
diff --git a/srcpkgs/mozjs60/patches/0009-mips-sgidefs_h.patch b/srcpkgs/mozjs60/patches/0009-mips-sgidefs_h.patch
deleted file mode 100644
index fdd25c616446..000000000000
--- a/srcpkgs/mozjs60/patches/0009-mips-sgidefs_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/js/src/jsmath.cpp	2019-07-03 02:08:06.000000000 +0200
-+++ b/js/src/jsmath.cpp	2019-11-10 19:04:26.132589059 +0100
-@@ -71,7 +71,7 @@
- #elif defined(__s390__)
- #define GETRANDOM_NR 349
- #elif defined(__mips__)
--#include <sgidefs.h>
-+#include <asm/sgidefs.h>
- #if _MIPS_SIM == _MIPS_SIM_ABI32
- #define GETRANDOM_NR 4353
- #elif _MIPS_SIM == _MIPS_SIM_ABI64
diff --git a/srcpkgs/mozjs60/patches/0010-mips-LIR.patch b/srcpkgs/mozjs60/patches/0010-mips-LIR.patch
deleted file mode 100644
index 4bdb08ad6e2a..000000000000
--- a/srcpkgs/mozjs60/patches/0010-mips-LIR.patch
+++ /dev/null
@@ -1,511 +0,0 @@
-From: Dragan Mladjenovic <dragan.mladjenovic@rt-rk.com>
-Date: Fri, 9 Mar 2018 07:58:43 +0100
-Subject: Bug 1444303 : [MIPS] Fix build failures after Bug 1425580 part 17
-
-From upstream, via firefox-esr 60.2.0esr-1.
-
-Reviewed-by: jandem
-Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1444303
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908486
-Applied-upstream: 61, commit:https://hg.mozilla.org/mozilla-central/rev/7de4ca7b082a
----
- js/src/jit/mips-shared/LIR-mips-shared.h | 88 +++++++++++++++++++++-----------
- js/src/jit/mips32/LIR-mips32.h           | 26 ++++++++--
- js/src/jit/mips64/LIR-mips64.h           | 33 ++++++++----
- 3 files changed, 102 insertions(+), 45 deletions(-)
-
-Index: mozjs-60.8.0/js/src/jit/mips-shared/LIR-mips-shared.h
-===================================================================
---- mozjs-60.8.0.orig/js/src/jit/mips-shared/LIR-mips-shared.h
-+++ mozjs-60.8.0/js/src/jit/mips-shared/LIR-mips-shared.h
-@@ -15,7 +15,10 @@ class LWasmUint32ToDouble : public LInst
-  public:
-   LIR_HEADER(WasmUint32ToDouble)
- 
--  LWasmUint32ToDouble(const LAllocation& input) { setOperand(0, input); }
-+  LWasmUint32ToDouble(const LAllocation& input)
-+      : LInstructionHelper(classOpcode) {
-+    setOperand(0, input);
-+  }
- };
- 
- // Convert a 32-bit unsigned integer to a float32.
-@@ -23,15 +26,18 @@ class LWasmUint32ToFloat32 : public LIns
-  public:
-   LIR_HEADER(WasmUint32ToFloat32)
- 
--  LWasmUint32ToFloat32(const LAllocation& input) { setOperand(0, input); }
-+  LWasmUint32ToFloat32(const LAllocation& input)
-+      : LInstructionHelper(classOpcode) {
-+    setOperand(0, input);
-+  }
- };
- 
- class LDivI : public LBinaryMath<1> {
-  public:
-   LIR_HEADER(DivI);
- 
--  LDivI(const LAllocation& lhs, const LAllocation& rhs,
--        const LDefinition& temp) {
-+  LDivI(const LAllocation& lhs, const LAllocation& rhs, const LDefinition& temp)
-+      : LBinaryMath(classOpcode) {
-     setOperand(0, lhs);
-     setOperand(1, rhs);
-     setTemp(0, temp);
-@@ -47,15 +53,13 @@ class LDivPowTwoI : public LInstructionH
-   LIR_HEADER(DivPowTwoI)
- 
-   LDivPowTwoI(const LAllocation& lhs, int32_t shift, const LDefinition& temp)
--      : shift_(shift) {
-+      : LInstructionHelper(classOpcode), shift_(shift) {
-     setOperand(0, lhs);
-     setTemp(0, temp);
-   }
- 
-   const LAllocation* numerator() { return getOperand(0); }
--
--  int32_t shift() { return shift_; }
--
-+  int32_t shift() const { return shift_; }
-   MDiv* mir() const { return mir_->toDiv(); }
- };
- 
-@@ -64,14 +68,14 @@ class LModI : public LBinaryMath<1> {
-   LIR_HEADER(ModI);
- 
-   LModI(const LAllocation& lhs, const LAllocation& rhs,
--        const LDefinition& callTemp) {
-+        const LDefinition& callTemp)
-+      : LBinaryMath(classOpcode) {
-     setOperand(0, lhs);
-     setOperand(1, rhs);
-     setTemp(0, callTemp);
-   }
- 
-   const LDefinition* callTemp() { return getTemp(0); }
--
-   MMod* mir() const { return mir_->toMod(); }
- };
- 
-@@ -80,12 +84,13 @@ class LModPowTwoI : public LInstructionH
- 
-  public:
-   LIR_HEADER(ModPowTwoI);
--  int32_t shift() { return shift_; }
- 
--  LModPowTwoI(const LAllocation& lhs, int32_t shift) : shift_(shift) {
-+  LModPowTwoI(const LAllocation& lhs, int32_t shift)
-+      : LInstructionHelper(classOpcode), shift_(shift) {
-     setOperand(0, lhs);
-   }
- 
-+  int32_t shift() const { return shift_; }
-   MMod* mir() const { return mir_->toMod(); }
- };
- 
-@@ -97,14 +102,13 @@ class LModMaskI : public LInstructionHel
- 
-   LModMaskI(const LAllocation& lhs, const LDefinition& temp0,
-             const LDefinition& temp1, int32_t shift)
--      : shift_(shift) {
-+      : LInstructionHelper(classOpcode), shift_(shift) {
-     setOperand(0, lhs);
-     setTemp(0, temp0);
-     setTemp(1, temp1);
-   }
- 
-   int32_t shift() const { return shift_; }
--
-   MMod* mir() const { return mir_->toMod(); }
- };
- 
-@@ -114,7 +118,8 @@ class LTableSwitch : public LInstruction
-   LIR_HEADER(TableSwitch);
- 
-   LTableSwitch(const LAllocation& in, const LDefinition& inputCopy,
--               const LDefinition& jumpTablePointer, MTableSwitch* ins) {
-+               const LDefinition& jumpTablePointer, MTableSwitch* ins)
-+      : LInstructionHelper(classOpcode) {
-     setOperand(0, in);
-     setTemp(0, inputCopy);
-     setTemp(1, jumpTablePointer);
-@@ -122,7 +127,6 @@ class LTableSwitch : public LInstruction
-   }
- 
-   MTableSwitch* mir() const { return mir_->toTableSwitch(); }
--
-   const LAllocation* index() { return getOperand(0); }
-   const LDefinition* tempInt() { return getTemp(0); }
-   // This is added to share the same CodeGenerator prefixes.
-@@ -136,7 +140,8 @@ class LTableSwitchV : public LInstructio
- 
-   LTableSwitchV(const LBoxAllocation& input, const LDefinition& inputCopy,
-                 const LDefinition& floatCopy,
--                const LDefinition& jumpTablePointer, MTableSwitch* ins) {
-+                const LDefinition& jumpTablePointer, MTableSwitch* ins)
-+      : LInstructionHelper(classOpcode) {
-     setBoxOperand(InputValue, input);
-     setTemp(0, inputCopy);
-     setTemp(1, floatCopy);
-@@ -157,6 +162,8 @@ class LMulI : public LBinaryMath<0> {
-  public:
-   LIR_HEADER(MulI);
- 
-+  LMulI() : LBinaryMath(classOpcode) {}
-+
-   MMul* mir() { return mir_->toMul(); }
- };
- 
-@@ -164,6 +171,8 @@ class LUDivOrMod : public LBinaryMath<0>
-  public:
-   LIR_HEADER(UDivOrMod);
- 
-+  LUDivOrMod() : LBinaryMath(classOpcode) {}
-+
-   MBinaryArithInstruction* mir() const {
-     MOZ_ASSERT(mir_->isDiv() || mir_->isMod());
-     return static_cast<MBinaryArithInstruction*>(mir_);
-@@ -194,12 +203,13 @@ class LWasmUnalignedLoadBase : public de
-  public:
-   typedef LWasmLoadBase<NumDefs, 2> Base;
- 
--  explicit LWasmUnalignedLoadBase(const LAllocation& ptr,
-+  explicit LWasmUnalignedLoadBase(LNode::Opcode opcode, const LAllocation& ptr,
-                                   const LDefinition& valueHelper)
--      : Base(ptr, LAllocation()) {
-+      : Base(opcode, ptr, LAllocation()) {
-     Base::setTemp(0, LDefinition::BogusTemp());
-     Base::setTemp(1, valueHelper);
-   }
-+
-   const LAllocation* ptr() { return Base::getOperand(0); }
-   const LDefinition* ptrCopy() { return Base::getTemp(0); }
- };
-@@ -208,19 +218,21 @@ class LWasmUnalignedLoadBase : public de
- 
- class LWasmUnalignedLoad : public details::LWasmUnalignedLoadBase<1> {
-  public:
-+  LIR_HEADER(WasmUnalignedLoad);
-+
-   explicit LWasmUnalignedLoad(const LAllocation& ptr,
-                               const LDefinition& valueHelper)
--      : LWasmUnalignedLoadBase(ptr, valueHelper) {}
--  LIR_HEADER(WasmUnalignedLoad);
-+      : LWasmUnalignedLoadBase(classOpcode, ptr, valueHelper) {}
- };
- 
- class LWasmUnalignedLoadI64
-     : public details::LWasmUnalignedLoadBase<INT64_PIECES> {
-  public:
-+  LIR_HEADER(WasmUnalignedLoadI64);
-+
-   explicit LWasmUnalignedLoadI64(const LAllocation& ptr,
-                                  const LDefinition& valueHelper)
--      : LWasmUnalignedLoadBase(ptr, valueHelper) {}
--  LIR_HEADER(WasmUnalignedLoadI64);
-+      : LWasmUnalignedLoadBase(classOpcode, ptr, valueHelper) {}
- };
- 
- namespace details {
-@@ -234,12 +246,14 @@ class LWasmUnalignedStoreBase : public L
-   static const size_t PtrIndex = 0;
-   static const size_t ValueIndex = 1;
- 
--  LWasmUnalignedStoreBase(const LAllocation& ptr,
--                          const LDefinition& valueHelper) {
-+  LWasmUnalignedStoreBase(LNode::Opcode opcode, const LAllocation& ptr,
-+                          const LDefinition& valueHelper)
-+      : Base(opcode) {
-     Base::setOperand(0, ptr);
-     Base::setTemp(0, LDefinition::BogusTemp());
-     Base::setTemp(1, valueHelper);
-   }
-+
-   MWasmStore* mir() const { return Base::mir_->toWasmStore(); }
-   const LAllocation* ptr() { return Base::getOperand(PtrIndex); }
-   const LDefinition* ptrCopy() { return Base::getTemp(0); }
-@@ -250,11 +264,13 @@ class LWasmUnalignedStoreBase : public L
- class LWasmUnalignedStore : public details::LWasmUnalignedStoreBase<2> {
-  public:
-   LIR_HEADER(WasmUnalignedStore);
-+
-   LWasmUnalignedStore(const LAllocation& ptr, const LAllocation& value,
-                       const LDefinition& valueHelper)
--      : LWasmUnalignedStoreBase(ptr, valueHelper) {
-+      : LWasmUnalignedStoreBase(classOpcode, ptr, valueHelper) {
-     setOperand(1, value);
-   }
-+
-   const LAllocation* value() { return Base::getOperand(ValueIndex); }
- };
- 
-@@ -264,9 +280,10 @@ class LWasmUnalignedStoreI64
-   LIR_HEADER(WasmUnalignedStoreI64);
-   LWasmUnalignedStoreI64(const LAllocation& ptr, const LInt64Allocation& value,
-                          const LDefinition& valueHelper)
--      : LWasmUnalignedStoreBase(ptr, valueHelper) {
-+      : LWasmUnalignedStoreBase(classOpcode, ptr, valueHelper) {
-     setInt64Operand(1, value);
-   }
-+
-   const LInt64Allocation value() { return getInt64Operand(ValueIndex); }
- };
- 
-@@ -278,7 +295,8 @@ class LWasmCompareExchangeI64
- 
-   LWasmCompareExchangeI64(const LAllocation& ptr,
-                           const LInt64Allocation& oldValue,
--                          const LInt64Allocation& newValue) {
-+                          const LInt64Allocation& newValue)
-+      : LInstructionHelper(classOpcode) {
-     setOperand(0, ptr);
-     setInt64Operand(1, oldValue);
-     setInt64Operand(1 + INT64_PIECES, newValue);
-@@ -299,8 +317,8 @@ class LWasmAtomicExchangeI64
-  public:
-   LIR_HEADER(WasmAtomicExchangeI64);
- 
--  LWasmAtomicExchangeI64(const LAllocation& ptr,
--                         const LInt64Allocation& value) {
-+  LWasmAtomicExchangeI64(const LAllocation& ptr, const LInt64Allocation& value)
-+      : LInstructionHelper(classOpcode) {
-     setOperand(0, ptr);
-     setInt64Operand(1, value);
-   }
-@@ -317,14 +335,14 @@ class LWasmAtomicBinopI64
-  public:
-   LIR_HEADER(WasmAtomicBinopI64);
- 
--  LWasmAtomicBinopI64(const LAllocation& ptr, const LInt64Allocation& value) {
-+  LWasmAtomicBinopI64(const LAllocation& ptr, const LInt64Allocation& value)
-+      : LInstructionHelper(classOpcode) {
-     setOperand(0, ptr);
-     setInt64Operand(1, value);
-   }
- 
-   const LAllocation* ptr() { return getOperand(0); }
-   const LInt64Allocation value() { return getInt64Operand(1); }
--
-   const MWasmAtomicBinopHeap* mir() const {
-     return mir_->toWasmAtomicBinopHeap();
-   }
-Index: mozjs-60.8.0/js/src/jit/mips32/LIR-mips32.h
-===================================================================
---- mozjs-60.8.0.orig/js/src/jit/mips32/LIR-mips32.h
-+++ mozjs-60.8.0/js/src/jit/mips32/LIR-mips32.h
-@@ -18,7 +18,7 @@ class LBoxFloatingPoint : public LInstru
- 
-   LBoxFloatingPoint(const LAllocation& in, const LDefinition& temp,
-                     MIRType type)
--      : type_(type) {
-+      : LInstructionHelper(classOpcode), type_(type) {
-     setOperand(0, in);
-     setTemp(0, temp);
-   }
-@@ -31,6 +31,8 @@ class LUnbox : public LInstructionHelper
-  public:
-   LIR_HEADER(Unbox);
- 
-+  LUnbox() : LInstructionHelper(classOpcode) {}
-+
-   MUnbox* mir() const { return mir_->toUnbox(); }
-   const LAllocation* payload() { return getOperand(0); }
-   const LAllocation* type() { return getOperand(1); }
-@@ -45,12 +47,12 @@ class LUnboxFloatingPoint : public LInst
- 
-   static const size_t Input = 0;
- 
--  LUnboxFloatingPoint(const LBoxAllocation& input, MIRType type) : type_(type) {
-+  LUnboxFloatingPoint(const LBoxAllocation& input, MIRType type)
-+      : LInstructionHelper(classOpcode), type_(type) {
-     setBoxOperand(Input, input);
-   }
- 
-   MUnbox* mir() const { return mir_->toUnbox(); }
--
-   MIRType type() const { return type_; }
-   const char* extraName() const { return StringFromMIRType(type_); }
- };
-@@ -63,14 +65,17 @@ class LDivOrModI64
-   static const size_t Lhs = 0;
-   static const size_t Rhs = INT64_PIECES;
- 
--  LDivOrModI64(const LInt64Allocation& lhs, const LInt64Allocation& rhs) {
-+  LDivOrModI64(const LInt64Allocation& lhs, const LInt64Allocation& rhs)
-+      : LCallInstructionHelper(classOpcode) {
-     setInt64Operand(Lhs, lhs);
-     setInt64Operand(Rhs, rhs);
-   }
-+
-   MBinaryArithInstruction* mir() const {
-     MOZ_ASSERT(mir_->isDiv() || mir_->isMod());
-     return static_cast<MBinaryArithInstruction*>(mir_);
-   }
-+
-   bool canBeDivideByZero() const {
-     if (mir_->isMod()) return mir_->toMod()->canBeDivideByZero();
-     return mir_->toDiv()->canBeDivideByZero();
-@@ -94,7 +99,8 @@ class LUDivOrModI64
-   static const size_t Lhs = 0;
-   static const size_t Rhs = INT64_PIECES;
- 
--  LUDivOrModI64(const LInt64Allocation& lhs, const LInt64Allocation& rhs) {
-+  LUDivOrModI64(const LInt64Allocation& lhs, const LInt64Allocation& rhs)
-+      : LCallInstructionHelper(classOpcode) {
-     setInt64Operand(Lhs, lhs);
-     setInt64Operand(Rhs, rhs);
-   }
-@@ -102,6 +108,7 @@ class LUDivOrModI64
-     MOZ_ASSERT(mir_->isDiv() || mir_->isMod());
-     return static_cast<MBinaryArithInstruction*>(mir_);
-   }
-+
-   bool canBeDivideByZero() const {
-     if (mir_->isMod()) return mir_->toMod()->canBeDivideByZero();
-     return mir_->toDiv()->canBeDivideByZero();
-@@ -121,7 +128,10 @@ class LWasmTruncateToInt64 : public LCal
-  public:
-   LIR_HEADER(WasmTruncateToInt64);
- 
--  explicit LWasmTruncateToInt64(const LAllocation& in) { setOperand(0, in); }
-+  explicit LWasmTruncateToInt64(const LAllocation& in)
-+      : LCallInstructionHelper(classOpcode) {
-+    setOperand(0, in);
-+  }
- 
-   MWasmTruncateToInt64* mir() const { return mir_->toWasmTruncateToInt64(); }
- };
-@@ -131,7 +141,8 @@ class LInt64ToFloatingPoint
-  public:
-   LIR_HEADER(Int64ToFloatingPoint);
- 
--  explicit LInt64ToFloatingPoint(const LInt64Allocation& in) {
-+  explicit LInt64ToFloatingPoint(const LInt64Allocation& in)
-+      : LCallInstructionHelper(classOpcode) {
-     setInt64Operand(0, in);
-   }
- 
-@@ -142,7 +153,9 @@ class LWasmAtomicLoadI64 : public LInstr
-  public:
-   LIR_HEADER(WasmAtomicLoadI64);
- 
--  LWasmAtomicLoadI64(const LAllocation& ptr) { setOperand(0, ptr); }
-+  LWasmAtomicLoadI64(const LAllocation& ptr) : LInstructionHelper(classOpcode) {
-+    setOperand(0, ptr);
-+  }
- 
-   const LAllocation* ptr() { return getOperand(0); }
-   const MWasmLoad* mir() const { return mir_->toWasmLoad(); }
-@@ -153,7 +166,8 @@ class LWasmAtomicStoreI64 : public LInst
-   LIR_HEADER(WasmAtomicStoreI64);
- 
-   LWasmAtomicStoreI64(const LAllocation& ptr, const LInt64Allocation& value,
--                      const LDefinition& tmp) {
-+                      const LDefinition& tmp)
-+      : LInstructionHelper(classOpcode) {
-     setOperand(0, ptr);
-     setInt64Operand(1, value);
-     setTemp(0, tmp);
-Index: mozjs-60.8.0/js/src/jit/mips64/LIR-mips64.h
-===================================================================
---- mozjs-60.8.0.orig/js/src/jit/mips64/LIR-mips64.h
-+++ mozjs-60.8.0/js/src/jit/mips64/LIR-mips64.h
-@@ -11,10 +11,18 @@ namespace js {
- namespace jit {
- 
- class LUnbox : public LInstructionHelper<1, 1, 0> {
-+ protected:
-+  LUnbox(LNode::Opcode opcode, const LAllocation& input)
-+      : LInstructionHelper(opcode) {
-+    setOperand(0, input);
-+  }
-+
-  public:
-   LIR_HEADER(Unbox);
- 
--  explicit LUnbox(const LAllocation& input) { setOperand(0, input); }
-+  explicit LUnbox(const LAllocation& input) : LInstructionHelper(classOpcode) {
-+    setOperand(0, input);
-+  }
- 
-   static const size_t Input = 0;
- 
-@@ -29,7 +37,7 @@ class LUnboxFloatingPoint : public LUnbo
-   LIR_HEADER(UnboxFloatingPoint);
- 
-   LUnboxFloatingPoint(const LAllocation& input, MIRType type)
--      : LUnbox(input), type_(type) {}
-+      : LUnbox(classOpcode, input), type_(type) {}
- 
-   MIRType type() const { return type_; }
- };
-@@ -39,18 +47,19 @@ class LDivOrModI64 : public LBinaryMath<
-   LIR_HEADER(DivOrModI64)
- 
-   LDivOrModI64(const LAllocation& lhs, const LAllocation& rhs,
--               const LDefinition& temp) {
-+               const LDefinition& temp)
-+      : LBinaryMath(classOpcode) {
-     setOperand(0, lhs);
-     setOperand(1, rhs);
-     setTemp(0, temp);
-   }
- 
-   const LDefinition* remainder() { return getTemp(0); }
--
-   MBinaryArithInstruction* mir() const {
-     MOZ_ASSERT(mir_->isDiv() || mir_->isMod());
-     return static_cast<MBinaryArithInstruction*>(mir_);
-   }
-+
-   bool canBeDivideByZero() const {
-     if (mir_->isMod()) return mir_->toMod()->canBeDivideByZero();
-     return mir_->toDiv()->canBeDivideByZero();
-@@ -71,14 +80,14 @@ class LUDivOrModI64 : public LBinaryMath
-   LIR_HEADER(UDivOrModI64);
- 
-   LUDivOrModI64(const LAllocation& lhs, const LAllocation& rhs,
--                const LDefinition& temp) {
-+                const LDefinition& temp)
-+      : LBinaryMath(classOpcode) {
-     setOperand(0, lhs);
-     setOperand(1, rhs);
-     setTemp(0, temp);
-   }
- 
-   const LDefinition* remainder() { return getTemp(0); }
--
-   const char* extraName() const {
-     return mir()->isTruncated() ? "Truncated" : nullptr;
-   }
-@@ -87,7 +96,6 @@ class LUDivOrModI64 : public LBinaryMath
-     MOZ_ASSERT(mir_->isDiv() || mir_->isMod());
-     return static_cast<MBinaryArithInstruction*>(mir_);
-   }
--
-   bool canBeDivideByZero() const {
-     if (mir_->isMod()) return mir_->toMod()->canBeDivideByZero();
-     return mir_->toDiv()->canBeDivideByZero();
-@@ -103,7 +111,10 @@ class LWasmTruncateToInt64 : public LIns
-  public:
-   LIR_HEADER(WasmTruncateToInt64);
- 
--  explicit LWasmTruncateToInt64(const LAllocation& in) { setOperand(0, in); }
-+  explicit LWasmTruncateToInt64(const LAllocation& in)
-+      : LInstructionHelper(classOpcode) {
-+    setOperand(0, in);
-+  }
- 
-   MWasmTruncateToInt64* mir() const { return mir_->toWasmTruncateToInt64(); }
- };
-@@ -112,7 +123,8 @@ class LInt64ToFloatingPoint : public LIn
-  public:
-   LIR_HEADER(Int64ToFloatingPoint);
- 
--  explicit LInt64ToFloatingPoint(const LInt64Allocation& in) {
-+  explicit LInt64ToFloatingPoint(const LInt64Allocation& in)
-+      : LInstructionHelper(classOpcode) {
-     setInt64Operand(0, in);
-   }
- 
-
diff --git a/srcpkgs/mozjs60/patches/0011-mips-macroassembler.patch b/srcpkgs/mozjs60/patches/0011-mips-macroassembler.patch
deleted file mode 100644
index 990eba6f7935..000000000000
--- a/srcpkgs/mozjs60/patches/0011-mips-macroassembler.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Dragan Mladjenovic <dragan.mladjenovic>
-Date: Mon, 12 Mar 2018 10:31:24 +0100
-Subject: Bug 1444834 : [MIPS] Stubout MacroAssembler::speculationBarrier
-
-From upstream, via firefox-esr 60.2.0esr-1.
-
-Reviewed-by: jandem
-Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1444834
-Applied-upstream: 61, commit:https://hg.mozilla.org/mozilla-central/rev/739c536d2cd6
----
- js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: mozjs-60.8.0/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp
-===================================================================
---- mozjs-60.8.0.orig/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp
-+++ mozjs-60.8.0/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp
-@@ -2687,4 +2687,8 @@ void MacroAssembler::atomicEffectOpJS(Sc
-                  maskTemp);
- }
- 
-+// ========================================================================
-+// Spectre Mitigations.
-+
-+void MacroAssembler::speculationBarrier() { MOZ_CRASH(); }
- //}}} check_macroassembler_style
-
diff --git a/srcpkgs/mozjs60/patches/0012-mozjs60.pc-honor-sysroot.patch b/srcpkgs/mozjs60/patches/0012-mozjs60.pc-honor-sysroot.patch
deleted file mode 100644
index 5c0b45a5ea5f..000000000000
--- a/srcpkgs/mozjs60/patches/0012-mozjs60.pc-honor-sysroot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
- js/src/build/js.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/src/build/js.pc.in b/js/src/build/js.pc.in
-index 2eae393..0a6fd5c 100644
---- a/js/src/build/js.pc.in
-+++ b/js/src/build/js.pc.in
-@@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript
- Version: @MOZILLA_VERSION@
- @PKGCONF_REQUIRES_PRIVATE@
- Libs: -L${libdir} -l@JS_LIBRARY_NAME@
--Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@
-+Cflags: -include ${pc_sysrootdir}${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@
diff --git a/srcpkgs/mozjs60/template b/srcpkgs/mozjs60/template
deleted file mode 100644
index d2366ac11d6d..000000000000
--- a/srcpkgs/mozjs60/template
+++ /dev/null
@@ -1,69 +0,0 @@
-# Template file for 'mozjs60'
-pkgname=mozjs60
-version=60.8.0
-revision=5
-wrksrc="firefox-${version}"
-build_wrksrc=js/src
-build_style=gnu-configure
-hostmakedepends="perl python pkg-config automake autoconf213 autoconf-archive
- which"
-makedepends="icu-devel libffi-devel nspr-devel python-devel readline-devel zlib-devel"
-depends="nspr>=4.19"
-short_desc="Mozilla JavaScript interpreter and library (60.x series)"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MPL-2.0"
-homepage="https://www.mozilla.org/js/"
-distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=c13387d944e635aebd5f1d2ce9ab77cb706a74043a240cbb7b70654519487fbe
-patch_args="-Np1"
-CXXFLAGS="-Wno-class-memaccess"
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	LDFLAGS+=" -latomic"
-fi
-
-do_configure() {
-	local _args
-
-	if [ "$CROSS_BUILD" ]; then
-		export HOST_CFLAGS="-Os"
-		export HOST_CXXFLAGS="-Os"
-		_args+=" --target=$XBPS_CROSS_TRIPLET --enable-linker=bfd"
-	fi
-
-	autoconf-2.13 old-configure.in > old-configure
-
-	touch ${wrksrc}/js/src/configure
-	touch ${wrksrc}/js/src/old-configure
-	SHELL=/bin/bash PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-		--disable-jemalloc --disable-optimize --enable-ctypes --enable-pie \
-		--enable-readline --enable-shared-js --enable-system-ffi \
-		--enable-tests --with-intl-api --with-system-icu \
-		--with-system-nspr --with-system-zlib --target=${XBPS_TRIPLET} \
-		--host=${XBPS_TRIPLET} \
-		${_args}
-}
-
-do_check() {
-	dist/bin/jsapi-tests
-}
-
-post_install() {
-	# Fix the '-include' directive, otherwise it tries to use the hosts' header
-	vsed 's|^Cflags:.*|Cflags: -include ${pc_sysrootdir}/${includedir}/mozjs-60/js/RequiredDefines.h -I${includedir}/mozjs-60|' \
-		-i ${DESTDIR}/usr/lib/pkgconfig/mozjs-60.pc
-}
-
-mozjs60-devel_package() {
-	depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/js60-config
-		vmove usr/include
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.ajs"
-		vmove usr/lib/pkgconfig
-	}
-}
diff --git a/srcpkgs/mozjs60/update b/srcpkgs/mozjs60/update
deleted file mode 100644
index 1947e19217f0..000000000000
--- a/srcpkgs/mozjs60/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname='mozjs'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 106ec0d9e083..27e8669c24ff 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -167,6 +167,7 @@ replaces="
  mirrorbits<=0.5.1_1
  mongroup<=0.4.1_2
  mozjs52<=52.9.0_7
+ mozjs60<=60.8.0_5
  mozjs68<=68.11.0_1
  orage<=4.12.1_7
  phonon-backend-gstreamer<=4.9.0_2

From 8f42c34b51727a77d370e4bcc704dcba1a721035 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 7 Feb 2021 11:07:20 +0100
Subject: [PATCH 1286/3482] cgrep: update to 6.6.33.

---
 srcpkgs/cgrep/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index cc3d6625b135..7b4047614a71 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,16 +1,16 @@
 # Template file for 'cgrep'
 pkgname=cgrep
-version=6.6.32
-revision=4
+version=6.6.33
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-16.18"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://awgn.github.io/${pkgname}/"
+homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"
-checksum=c45d680a2a00ef9524fc921e4c10fc7e68f02e57f4d6f1e640b7638a2f49c198
+checksum=f0d7114e9c26dc3ff3515711cce63864f3995ac06ed3743acf2560fc5a1eb78e
 nocross=yes
 nopie_files="/usr/bin/cgrep"
 conflicts="codesearch"

From 4977dd1e43a30ebcaf257be92a373da29891795b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 12:32:43 -0300
Subject: [PATCH 1287/3482] duktape: update to 2.6.0.

Also clean up template.
---
 common/shlibs            |  2 +-
 srcpkgs/duktape/template | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d8cd5943d882..ea9bb53a05f9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3053,7 +3053,7 @@ libbrotlienc.so.1 brotli-1.0.2_1
 libfilteraudio.so filter_audio-0.0.1_1
 libgstreamermm-1.0.so.1 gstreamermm-1.8.0_1
 libmovit.so.8 movit-1.6.0_1
-libduktape.so.204 duktape-2.4.0_1
+libduktape.so.206 duktape-2.6.0_1
 libccgnu2-1.8.so.0 commoncpp2-1.8.1_1
 libccext2-1.8.so.0 commoncpp2-1.8.1_1
 libucommon.so.8 ucommon-7.0.0_1
diff --git a/srcpkgs/duktape/template b/srcpkgs/duktape/template
index c7d5a957a18b..7b2e9f7dab65 100644
--- a/srcpkgs/duktape/template
+++ b/srcpkgs/duktape/template
@@ -1,6 +1,6 @@
 # Template file for 'duktape'
 pkgname=duktape
-version=2.4.0
+version=2.6.0
 revision=1
 build_style=gnu-makefile
 make_build_args="-f Makefile.sharedlibrary"
@@ -8,17 +8,17 @@ make_install_args="-f Makefile.sharedlibrary INSTALL_PREFIX=\${DESTDIR}/usr"
 short_desc="Embeddable JavaScript engine"
 maintainer="Christopher Brannon <chris@the-brannons.com>"
 license="MIT"
-homepage="http://duktape.org"
-distfiles="https://github.com/svaarala/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=86a89307d1633b5cedb2c6e56dc86e92679fc34b05be551722d8cc69ab0771fc
+homepage="https://duktape.org"
+distfiles="https://github.com/svaarala/duktape/releases/download/v${version}/${pkgname}-${version}.tar.xz"
+checksum=96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7
 
-pre_build() {
-	sed -i 's|^CC.*||g' Makefile.sharedlibrary
+post_patch() {
+	vsed -i 's|^CC.*||g' Makefile.sharedlibrary
 }
 
 pre_install() {
-	vmkdir /usr/lib
-	vmkdir /usr/include
+	vmkdir usr/lib
+	vmkdir usr/include
 }
 
 post_install() {
@@ -26,8 +26,7 @@ post_install() {
 	# Two libraries were installed, one with debugging symbols, one
 	# without.  Maybe that makes sense on a distro without debug
 	# splitting, but not on Void.  Replace libduktape.
-	cd "${DESTDIR}/usr/lib"
-	rm libduktaped.*
+	rm ${DESTDIR}/usr/lib/libduktaped.*
 }
 
 duktape-devel_package() {

From 53bc4f2492f58cf7946ee0f60fbccd628d108eb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 12:32:35 -0300
Subject: [PATCH 1288/3482] OpenRCT2: revbump for duktape-2.6.0.

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 5dc6d2498536..c99234aaa555 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}

From 7fe803191dccb22ee0eb4a00205dca1e4df5f595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 12:32:35 -0300
Subject: [PATCH 1289/3482] edbrowse: revbump for duktape-2.6.0.

Also xlint.
---
 srcpkgs/edbrowse/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/edbrowse/template b/srcpkgs/edbrowse/template
index 7c8fb265e29a..e6718922902f 100644
--- a/srcpkgs/edbrowse/template
+++ b/srcpkgs/edbrowse/template
@@ -1,16 +1,16 @@
 # Template file for 'edbrowse'
 pkgname=edbrowse
 version=3.7.7
-revision=1
-hostmakedepends="perl pkg-config"
+revision=2
 build_style=cmake
+hostmakedepends="perl pkg-config"
 makedepends="duktape-devel libcurl-devel libtidy5-devel pcre-devel
  readline-devel"
 short_desc="Line-oriented text editor, web browser and mail client similar to ed(1)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3.0-or-later"
+license="GPL-3.0-or-later, MIT"
 homepage="http://edbrowse.org/"
-distfiles="https://github.com/CMB/${pkgname}/archive/v${version}.tar.gz"
+distfiles="https://github.com/CMB/edbrowse/archive/v${version}.tar.gz"
 checksum=bc015decc022d90f482a7f1028e9a56aa84f17406879f9aa1060e1dc175ed00f
 
 CFLAGS="-fcommon"

From 59e0b8847cb11224939f7f3213f0278f43e83d17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 12:32:35 -0300
Subject: [PATCH 1290/3482] gerbera: revbump for duktape-2.6.0.

---
 srcpkgs/gerbera/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 0c2cae408e12..451f9eff5398 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"

From 1b38fe8c58913b798d274f81a021bead5b427c37 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Mon, 8 Feb 2021 21:43:06 +0000
Subject: [PATCH 1291/3482] gnote: update to 3.38.1.

---
 srcpkgs/gnote/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template
index 9f13ddb0cd10..0ed64fd9239b 100644
--- a/srcpkgs/gnote/template
+++ b/srcpkgs/gnote/template
@@ -1,6 +1,6 @@
 # Template file for 'gnote'
 pkgname=gnote
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -13,5 +13,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gnote"
 distfiles="${GNOME_SITE}/gnote/${version%.*}/gnote-${version}.tar.xz"
-checksum=fd36351f5fc8b4bf2e3a53d7d39798e0a33f0fc77ff781809577a346b85acfc6
+checksum=c427d5e177339106e53976ab4f65f8719a48f7f712ce94d2184d545da174b2a9
 lib32disabled=yes

From 5c9cc3613f556314621727f81954d3db9a054b14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 9 Feb 2021 00:21:43 -0300
Subject: [PATCH 1292/3482] libtorrent: don't depend on libcppunit in the
 resulting package.

Probably some rebel linker options screwing things up and leaving
libcppunit as a required library in libtorrent. This isn't a proper fix,
because the final library doesn't use libcppunit symbols and
-Wl,--as-needed in LDFLAGS should have caught it.
---
 srcpkgs/libtorrent/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index 92da1d727aa8..fe2e4d73c219 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,17 +1,19 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libcppunit-devel libressl-devel zlib-devel"
+makedepends="libressl-devel zlib-devel"
+# XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
+checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/rakshasa/${pkgname}"
-distfiles="https://github.com/rakshasa/${pkgname}/archive/v${version}.tar.gz"
+homepage="https://github.com/rakshasa/libtorrent"
+distfiles="https://github.com/rakshasa/libtorrent/archive/v${version}.tar.gz"
 checksum=0f6c2e7ffd3a1723ab47fdac785ec40f85c0a5b5a42c1d002272205b988be722
 
 # https://github.com/rakshasa/rtorrent/issues/156

From 52dc27fe60551c13465098d685e85260de3c315b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 20 Oct 2020 16:47:33 -0300
Subject: [PATCH 1293/3482] xmlrpc-c: update to 1.51.06.

---
 common/shlibs             |  2 +-
 srcpkgs/xmlrpc-c/template | 23 ++++++++---------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ea9bb53a05f9..ebaf844a55c4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1739,7 +1739,7 @@ libxmlrpc++.so.8 xmlrpc-c-1.39.07_1
 libxmlrpc_server.so.3 xmlrpc-c-1.25.28_1
 libxmlrpc_packetsocket.so.8 xmlrpc-c-1.39.07_1
 libxmlrpc.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_util.so.3 xmlrpc-c-1.25.28_1
+libxmlrpc_util.so.4 xmlrpc-c-1.51.06_1
 libxmlrpc_abyss.so.3 xmlrpc-c-1.25.28_1
 libxmlrpc_server_abyss++.so.8 xmlrpc-c-1.39.07_1
 libxmlrpc_cpp.so.8 xmlrpc-c-1.39.07_1
diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index 39e0c3b295e2..eab75c686ece 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,32 +1,25 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
-version=1.39.13
-revision=2
+version=1.51.06
+revision=1
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"
-hostmakedepends="pkg-config python"
+hostmakedepends="pkg-config python3"
 makedepends="libcurl-devel libxml2-devel"
 short_desc="XML-RPC for C and C++"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://xmlrpc-c.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz"
-checksum=491e44cae3763d285fc2a75fe6574882964f16451adbb7e6f3293916e120fca9
-
-disable_parallel_build=yes
+checksum=06dcd87d9c88374559369ffbe83b3139cf41418c1a2d03f20e08808085f89fd0
 
 pre_configure() {
-	sed 's,XMLRPC_ABYSS_EXPORTED,XMLRPC_DLLEXPORT,g' -i include/xmlrpc-c/abyss.h
-	sed -i configure \
-		-e "s;AR=.*;AR=${AR};" \
-		-e "s;RANLIB=.*;RANLIB=${RANLIB};"
+	export AR RANLIB
 }
-post_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # Enable linux-gnu configuration for shlibs
-			sed -e "s;linux-gnu;linux-musl;g" -i ${wrksrc}/config.mk
-	esac
+
+do_check() {
+	: # tests don't work with --disable-cgi-server
 }
 
 post_install() {

From 5c23be2bff3bd4c2b64d0a26f224d5803363031b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 20 Oct 2020 16:49:02 -0300
Subject: [PATCH 1294/3482] rtorrent: rebuild for xmlrpc-c.

---
 srcpkgs/rtorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtorrent/template b/srcpkgs/rtorrent/template
index b8b3ba3513f0..7d44897de237 100644
--- a/srcpkgs/rtorrent/template
+++ b/srcpkgs/rtorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'rtorrent'
 pkgname=rtorrent
 version=0.9.8
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-xmlrpc-c"
 hostmakedepends="automake libtool pkg-config"

From 24e19d824ae348687889746cbc72305a937e1870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 8 Feb 2021 23:59:36 -0300
Subject: [PATCH 1295/3482] igt-gpu-tools: rebuild xmlrpc-c.

---
 srcpkgs/igt-gpu-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template
index ddbbdce106cf..46f941f50a8a 100644
--- a/srcpkgs/igt-gpu-tools/template
+++ b/srcpkgs/igt-gpu-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'igt-gpu-tools'
 pkgname=igt-gpu-tools
 version=1.25
-revision=3
+revision=4
 build_style=meson
 configure_args="-Db_ndebug=false -Db_lto=false"
 # b_lto=true makes the build hang at a random point

From f9b1c75b217517bdfabf7e4781fc44be4acb31b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 8 Feb 2021 14:15:31 -0300
Subject: [PATCH 1296/3482] connman: update to 1.39.

Fixes CVE-2021-26675 and CVE-2021-26676.
---
 srcpkgs/connman/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index 2fbc7f484853..59d11269a34f 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -1,7 +1,7 @@
 # Template file for 'connman'
 pkgname=connman
-version=1.38
-revision=2
+version=1.39
+revision=1
 build_style=gnu-configure
 configure_args="--enable-polkit --enable-client --enable-pie --enable-ethernet
  --enable-wifi --enable-bluetooth --enable-loopback --enable-nmcompat
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://01.org/connman"
 distfiles="${KERNEL_SITE}/network/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cb30aca97c2f79ccaed8802aa2909ac5100a3969de74c0af8a9d73b85fc4932b
+checksum=9f62a7169b7491c670a1ff2e335b0d966308fb2f62e285c781105eb90f181af3
 lib32disabled=yes
 
 pre_configure() {

From c2cdc01513b1249884e3f96f6ace4408e69bc9a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 8 Feb 2021 22:06:39 -0300
Subject: [PATCH 1297/3482] zimwriterfs: rebuild for libzim API break.

---
 srcpkgs/zimwriterfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zimwriterfs/template b/srcpkgs/zimwriterfs/template
index e8b9c7899e05..5d42e16a119d 100644
--- a/srcpkgs/zimwriterfs/template
+++ b/srcpkgs/zimwriterfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zimwriterfs'
 pkgname=zimwriterfs
 version=1.3.7
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="file-devel gumbo-parser-devel icu-devel libzim-devel

From a2755b0a58d6b9e61e489ae4faf5779e14d75719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 8 Feb 2021 22:06:39 -0300
Subject: [PATCH 1298/3482] zim-tools: rebuild for libzim API break.

libzim seems to be missing the _ZN3zim6writer7CreatorC2Eb symbol which
these programs rely on.

Fixes #28600
---
 srcpkgs/zim-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zim-tools/template b/srcpkgs/zim-tools/template
index f4900c02d495..6f765d11c423 100644
--- a/srcpkgs/zim-tools/template
+++ b/srcpkgs/zim-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'zim-tools'
 pkgname=zim-tools
 version=1.2.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libzim-devel xapian-core-devel icu-devel"

From c085deae94a6fbd3d113eaceaaee4f0f947e091d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 9 Feb 2021 12:41:30 +0100
Subject: [PATCH 1299/3482] busybox: fix build w/ musl-1.2.2 (time64)

---
 srcpkgs/busybox/patches/time64.patch | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/busybox/patches/time64.patch

diff --git a/srcpkgs/busybox/patches/time64.patch b/srcpkgs/busybox/patches/time64.patch
new file mode 100644
index 000000000000..b38f4dcb97e1
--- /dev/null
+++ b/srcpkgs/busybox/patches/time64.patch
@@ -0,0 +1,28 @@
+--- coreutils/date.c	2019-06-10 12:50:53.000000000 +0200
++++ coreutils/date.c	2021-02-09 12:39:19.127054192 +0100
+@@ -274,7 +274,11 @@
+ #if ENABLE_FEATURE_DATE_NANO
+ 		/* libc has incredibly messy way of doing this,
+ 		 * typically requiring -lrt. We just skip all this mess */
++#if defined(__NR_clock_gettime32)
++		syscall(__NR_clock_gettime32, CLOCK_REALTIME, &ts);
++#else
+ 		syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts);
++#endif
+ #else
+ 		time(&ts.tv_sec);
+ #endif
+--- libbb/time.c	2019-06-10 12:50:53.000000000 +0200
++++ libbb/time.c	2021-02-09 12:35:35.125037118 +0100
+@@ -257,7 +257,11 @@
+  * typically requiring -lrt. We just skip all this mess */
+ static void get_mono(struct timespec *ts)
+ {
++#if defined(__NR_clock_gettime32)
++	if (syscall(__NR_clock_gettime32, CLOCK_MONOTONIC, ts))
++#else
+ 	if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts))
++#endif
+ 		bb_error_msg_and_die("clock_gettime(MONOTONIC) failed");
+ }
+ unsigned long long FAST_FUNC monotonic_ns(void)

From c9307124d9513f5ad6d26f2ba3c114ac7e4eb430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 9 Feb 2021 10:50:01 -0300
Subject: [PATCH 1300/3482] busybox: fix time64 patch.

The syscall name was changed explicitly so compilation broke instead of
allowing programs using the raw syscall to use the time64 struct
timespec with a syscall expecting the old one.

Since we have modern glibc and musl, we can just force clock_gettime
usage.

The previous patch also broke y2038 support.

Not revbumping, since c085deae94a6fbd3d113eaceaaee4f0f947e091d didn't
either.
---
 srcpkgs/busybox/patches/time64.patch | 48 +++++++++++++++++-----------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/busybox/patches/time64.patch b/srcpkgs/busybox/patches/time64.patch
index b38f4dcb97e1..fc6531e85b0e 100644
--- a/srcpkgs/busybox/patches/time64.patch
+++ b/srcpkgs/busybox/patches/time64.patch
@@ -1,28 +1,38 @@
---- coreutils/date.c	2019-06-10 12:50:53.000000000 +0200
-+++ coreutils/date.c	2021-02-09 12:39:19.127054192 +0100
-@@ -274,7 +274,11 @@
+diff --git coreutils/date.c coreutils/date.c
+index 3414d38..6e12f36 100644
+--- coreutils/date.c
++++ coreutils/date.c
+@@ -272,9 +272,7 @@ int date_main(int argc UNUSED_PARAM, char **argv)
+ #endif
+ 	} else {
  #if ENABLE_FEATURE_DATE_NANO
- 		/* libc has incredibly messy way of doing this,
- 		 * typically requiring -lrt. We just skip all this mess */
-+#if defined(__NR_clock_gettime32)
-+		syscall(__NR_clock_gettime32, CLOCK_REALTIME, &ts);
-+#else
- 		syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts);
-+#endif
+-		/* libc has incredibly messy way of doing this,
+-		 * typically requiring -lrt. We just skip all this mess */
+-		syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts);
++		clock_gettime(CLOCK_REALTIME, &ts);
  #else
  		time(&ts.tv_sec);
  #endif
---- libbb/time.c	2019-06-10 12:50:53.000000000 +0200
-+++ libbb/time.c	2021-02-09 12:35:35.125037118 +0100
-@@ -257,7 +257,11 @@
-  * typically requiring -lrt. We just skip all this mess */
+diff --git libbb/time.c libbb/time.c
+index f9b8da0..600b60b 100644
+--- libbb/time.c
++++ libbb/time.c
+@@ -247,17 +247,10 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp)
+ #if ENABLE_MONOTONIC_SYSCALL
+ 
+ #include <sys/syscall.h>
+-/* Old glibc (< 2.3.4) does not provide this constant. We use syscall
+- * directly so this definition is safe. */
+-#ifndef CLOCK_MONOTONIC
+-#define CLOCK_MONOTONIC 1
+-#endif
+ 
+-/* libc has incredibly messy way of doing this,
+- * typically requiring -lrt. We just skip all this mess */
  static void get_mono(struct timespec *ts)
  {
-+#if defined(__NR_clock_gettime32)
-+	if (syscall(__NR_clock_gettime32, CLOCK_MONOTONIC, ts))
-+#else
- 	if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts))
-+#endif
+-	if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts))
++	if (clock_gettime(CLOCK_MONOTONIC, ts))
  		bb_error_msg_and_die("clock_gettime(MONOTONIC) failed");
  }
  unsigned long long FAST_FUNC monotonic_ns(void)

From bfa1bd4174d5259b6f5487f66c49a1238769e6c6 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Mon, 8 Feb 2021 13:49:48 +0100
Subject: [PATCH 1301/3482] mcabber: use aspell instead of enchant

Reference #27710
---
 srcpkgs/mcabber/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mcabber/template b/srcpkgs/mcabber/template
index 3c30cfae508f..674ea4f43c3d 100644
--- a/srcpkgs/mcabber/template
+++ b/srcpkgs/mcabber/template
@@ -1,11 +1,11 @@
 # Template file for 'mcabber'
 pkgname=mcabber
 version=1.1.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-hgcset --enable-enchant --enable-otr"
+configure_args="--enable-hgcset --enable-aspell --enable-otr"
 hostmakedepends="pkg-config"
-makedepends="enchant-devel gpgme-devel libgcrypt-devel libotr-devel
+makedepends="aspell-devel gpgme-devel libgcrypt-devel libotr-devel
  loudmouth-devel"
 short_desc="Small XMPP (Jabber) console client"
 maintainer="Lukas Epple <sternenseemann@lukasepple.de>"

From aa5df25ecc1faa1d1e7277922797aa7b369d59cf Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Mon, 8 Feb 2021 13:52:51 +0100
Subject: [PATCH 1302/3482] loudmouth, mcabber: orphan

I haven't been using void linux for a few years and forgot to orphan
these packages at my departure.
---
 srcpkgs/loudmouth/template | 2 +-
 srcpkgs/mcabber/template   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 50d205fdcb19..37212d47d81f 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -7,7 +7,7 @@ configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
 makedepends="libglib-devel libidn-devel libressl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
-maintainer="Lukas Epple <sternenseemann@lukasepple.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/mcabber/loudmouth"
 distfiles="https://github.com/mcabber/${pkgname}/archive/${version}.tar.gz"
diff --git a/srcpkgs/mcabber/template b/srcpkgs/mcabber/template
index 674ea4f43c3d..0403e9c27825 100644
--- a/srcpkgs/mcabber/template
+++ b/srcpkgs/mcabber/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config"
 makedepends="aspell-devel gpgme-devel libgcrypt-devel libotr-devel
  loudmouth-devel"
 short_desc="Small XMPP (Jabber) console client"
-maintainer="Lukas Epple <sternenseemann@lukasepple.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://mcabber.com"
 distfiles="${homepage}/files/mcabber-${version}.tar.bz2"

From a5cadcf49d1bb730dbce50a70715f99f7bfbcb00 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 9 Feb 2021 17:01:41 +0100
Subject: [PATCH 1303/3482] weechat: update to 3.0.1.

Switch to aspell, fix update check.
---
 srcpkgs/weechat/template | 8 ++++----
 srcpkgs/weechat/update   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/weechat/update

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index 86daa67b1740..0b4f25139b1a 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,13 +1,13 @@
 # Template file for 'weechat'
 pkgname=weechat
-version=3.0
+version=3.0.1
 revision=1
 build_style=cmake
-configure_args="-DENABLE_MAN=ON -DENABLE_ENCHANT=ON -DENABLE_PERL=ON
+configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
  -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON
  -DENABLE_GUILE=OFF -DENABLE_PHP=OFF -DENABLE_JAVASCRIPT=OFF"
 hostmakedepends="ruby-asciidoctor libgcrypt-devel pkg-config python3 tcl-devel"
-makedepends="enchant-devel gnutls-devel libcurl-devel lua53-devel ncurses-devel
+makedepends="aspell-devel gnutls-devel libcurl-devel lua53-devel ncurses-devel
  perl python3-devel ruby-devel tcl-devel"
 depends="ca-certificates"
 short_desc="Fast, light and extensible IRC client"
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.weechat.org"
 changelog="https://raw.githubusercontent.com/weechat/weechat/master/ChangeLog.adoc"
 distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz"
-checksum=6cb7d25a363b66b835f1b9f29f3580d6f09ac7d38505b46a62c178b618d9f1fb
+checksum=781d9bfc7e1321447de9949263b82e3ee45639b7d71693558f40ff87211ca6dd
 lib32disabled=yes
 
 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl"
diff --git a/srcpkgs/weechat/update b/srcpkgs/weechat/update
new file mode 100644
index 000000000000..db719a6da223
--- /dev/null
+++ b/srcpkgs/weechat/update
@@ -0,0 +1 @@
+site='https://weechat.org/download/'

From 67b2f540b316a4e0b917615db3989c67d57ea0b7 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 24 Jan 2021 13:25:24 +0100
Subject: [PATCH 1304/3482] iputils: update to 20200821.

---
 .../iputils/patches/fix-arping-exitcode.patch   | 17 -----------------
 srcpkgs/iputils/template                        |  6 +++---
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/iputils/patches/fix-arping-exitcode.patch

diff --git a/srcpkgs/iputils/patches/fix-arping-exitcode.patch b/srcpkgs/iputils/patches/fix-arping-exitcode.patch
deleted file mode 100644
index 1bebcd02c3f3..000000000000
--- a/srcpkgs/iputils/patches/fix-arping-exitcode.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git arping.c arping.c
-index 77c9c56..2c87c15 100644
---- arping.c
-+++ arping.c
-@@ -792,7 +792,11 @@ static int event_loop(struct run_state *ctl)
- 	close(tfd);
- 	freeifaddrs(ctl->ifa0);
- 	rc |= finish(ctl);
--	rc |= (ctl->sent != ctl->received);
-+	if (ctl->dad && ctl->quit_on_reply)
-+		/* Duplicate address detection mode return value */
-+		rc |= !(ctl->brd_sent != ctl->received);
-+	else
-+		rc |= (ctl->sent != ctl->received);
- 	return rc;
- }
- 
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 97215e5d421a..d7701c5080e7 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,7 +1,7 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20190709
-revision=3
+version=20200821
+revision=1
 wrksrc="${pkgname}-s${version}"
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/s${version}.tar.gz"
-checksum=a15720dd741d7538dd2645f9f516d193636ae4300ff7dbc8bfca757bf166490a
+checksum=f265da0d02dd2259efd8c57a9c2e0c8bb3361abb14639fcffb26707be5783a5b
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping

From 633944ba008e0a6833bffc3473e2b8db1a895e1d Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 24 Jan 2021 12:18:09 +0100
Subject: [PATCH 1305/3482] iproute2: update to 5.10.0.

---
 srcpkgs/iproute2/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 0b7504b9beaf..540ee3126912 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,7 +1,7 @@
 # Template file for 'iproute2'
 pkgname=iproute2
-version=5.9.0
-revision=2
+version=5.10.0
+revision=1
 build_style=configure
 make_install_args="SBINDIR=/usr/bin"
 hostmakedepends="pkg-config perl flex"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.linuxfoundation.org/networking/iproute2"
 distfiles="${KERNEL_SITE}/utils/net/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=a25dac94bcdcf2f73316c7f812115ea7a5710580bad892b08a83d00c6b33dacf
+checksum=a54a34ae309c0406b2d1fb3a46158613ffb83d33fefd5d4a27f0010237ac53e9
 
 conf_files="
  /etc/iproute2/ematch_map

From 02437a74a26d7bf746ea02ec00eaef66fd5a03b9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 9 Feb 2021 19:27:44 +0100
Subject: [PATCH 1306/3482] linux5.4: update to 5.4.96.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 94f18ddcc51a..276ae9fc7e29 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.95
+version=5.4.96
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=030ae544f346bfa2ce619dd9e17e93d10ec393632d3b6d6cf5d1fc84b914d449
+checksum=f728de695ec5eb17efa15acaecc48fcd7a6c4a912b51704ed137cccf93f9f5e0
 python_version=3
 patch_args="-Np1"
 

From 8fa03d7f38c61faf904c24d71df4d3382fd6a670 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 9 Feb 2021 19:30:02 +0100
Subject: [PATCH 1307/3482] linux4.19: update to 4.19.174.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index afb47ee2f59c..a5e1047ef930 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.173
+version=4.19.174
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=d2fdd236e6f31aa8e939f4a686c95417d8571bde3d091fc6a2535937c144195f
+checksum=0ff6c703e90c714f31904850f4c0c74c0b1caa9ddabbecaa28de0eb61c049ee5
 python_version=2 #unverified
 patch_args="-Np1"
 

From 2d4a5916209007f18f805b4b7d092a23e015c3b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 9 Feb 2021 19:31:18 +0100
Subject: [PATCH 1308/3482] leatherman: fix build w/ gcc-10.2.1pre1

---
 srcpkgs/leatherman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template
index c4c5089c8412..e8b2080deb22 100644
--- a/srcpkgs/leatherman/template
+++ b/srcpkgs/leatherman/template
@@ -14,7 +14,7 @@ distfiles="https://github.com/puppetlabs/leatherman/archive/${version}.tar.gz>${
 checksum=0d470b6f3240bc605f48631546dd77c814116b1ff6b2a36aa9f395c4a4eab319
 python_version=3
 
-CXXFLAGS+=" -Wno-ignored-qualifiers -Wno-class-memaccess -Wno-catch-value -Wno-deprecated-copy"
+CXXFLAGS="-Wno-ignored-qualifiers -Wno-class-memaccess -Wno-catch-value -Wno-deprecated-copy -Wno-type-limits"
 
 leatherman-devel_package() {
 	short_desc+=" - development files"

From 22c0746cd4e385d91770cbacd98a1b3b69c726e9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 9 Feb 2021 20:52:13 +0200
Subject: [PATCH 1309/3482] oblibs: update to 0.1.3.0.

---
 srcpkgs/oblibs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oblibs/template b/srcpkgs/oblibs/template
index c0e2f13f4477..43add1381b43 100644
--- a/srcpkgs/oblibs/template
+++ b/srcpkgs/oblibs/template
@@ -1,6 +1,6 @@
 # Template file for 'oblibs'
 pkgname=oblibs
-version=0.1.2.0
+version=0.1.3.0
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=configure
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://framagit.org/Obarun/oblibs"
 distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.bz2"
-checksum=0009cbe48d786bca14e8e973a5092de5270713db1940d538f38d6dfaa9e75e0a
+checksum=40f8ef6ba08cecd467e03a137dad14eba649789049bde10f08b0706a657e970d
 
 post_install() {
 	vlicense LICENSE

From dd610bead9382ca4b9cd77253f0e95319179528f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 9 Feb 2021 20:52:19 +0200
Subject: [PATCH 1310/3482] 66: update to 0.6.1.1.

---
 srcpkgs/66/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index e53d54b9801c..1a81ba6b8986 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,6 +1,6 @@
 # Template file for '66'
 pkgname=66
-version=0.6.0.1
+version=0.6.1.1
 revision=1
 wrksrc="66-v${version}"
 build_style=configure
@@ -17,7 +17,7 @@ license="ISC"
 homepage="http://web.obarun.org/software/"
 changelog="https://framagit.org/Obarun/66/raw/master/NEWS.md"
 distfiles="https://framagit.org/Obarun/66/-/archive/v${version}/66-v${version}.tar.bz2"
-checksum=6267e6b51fa6a5c56ef10f385f89bbbf87dca51ff397be32a7dac161cbc25a9b
+checksum=4f80d94851a8c26e9666ea0f274890fc3abb6185ca1fe9fd8e2ad71e27a2ade9
 
 conf_files="/etc/66/init /etc/66/init.conf"
 

From f1dc93d99fd750d75b75a20a3c4f19c51f2b935b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 9 Feb 2021 20:51:03 +0200
Subject: [PATCH 1311/3482] notcurses: update to 2.2.0.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 7ac0f656f87a..0b7259fe3b4a 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.1.8
+version=2.2.0
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=35a8da40e4eaabbe9aba9ca8d29c30126e47c0d8dbc477532018f72aced07380
+checksum=5002106938ce9f371790162f2d8acc7d43d76b3a565eb1c3e7f1c205c3d1b664
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From 8693c1ae4a1186cdda1d2d18df7dcc7cde77639e Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Mon, 8 Feb 2021 21:56:27 +0000
Subject: [PATCH 1312/3482] qsynth: update to 0.9.1.

---
 srcpkgs/qsynth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index 058743f761f3..2e703d7a2996 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,6 +1,6 @@
 # Template file for 'qsynth'
 pkgname=qsynth
-version=0.9.0
+version=0.9.1
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -12,7 +12,7 @@ maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-2.0-or-later"
 homepage="http://qsynth.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=72ab545c39b7ca518be3dfaaee61c8ce88b20d4c34dff946898a8ca7d8e85ae4
+checksum=54d708e5039569c1c1708ea9b04be19bbf9c393a70af6a4c5579a4ee73173626
 
 if [ "${CROSS_BUILD}" ]; then
 	hostmakedepends+=" qt5-x11extras-devel"

From f8860d60a4abb93325cb9d89e08ff997348449f2 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sat, 23 Jan 2021 19:38:52 +0000
Subject: [PATCH 1313/3482] libinput-gestures: update to 2.57.

---
 srcpkgs/libinput-gestures/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libinput-gestures/template b/srcpkgs/libinput-gestures/template
index a211736bfb5a..9b3a1dd6b69e 100644
--- a/srcpkgs/libinput-gestures/template
+++ b/srcpkgs/libinput-gestures/template
@@ -1,14 +1,14 @@
 # Template file for 'libinput-gestures'
 pkgname=libinput-gestures
-version=2.50
-revision=2
+version=2.57
+revision=1
 depends="python3 libinput xdotool wmctrl hicolor-icon-theme"
 short_desc="Action gestures on your touchpad using libinput"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/bulletmark/libinput-gestures"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=679c03b53b1f3d1df2b074056b6f80868ddac004589d6af79e34a40699f174de
+checksum=4259ae64276636c0a2497a462582ef43e044c580fc27c24d647ecd0ba7f7a8a7
 conf_files="/etc/libinput-gestures.conf"
 
 do_install() {

From 20b3fbffc3bcafdddc4bc5fc8e82059d64bfccde Mon Sep 17 00:00:00 2001
From: Laurence de Bruxelles <lfdebrux@gmail.com>
Date: Sun, 7 Feb 2021 16:06:30 +0000
Subject: [PATCH 1314/3482] fbgrab: update to 1.4, xlint.

Updates fbgrab to 1.4 and changes homepage and distfiles source to
GitHub as website has been removed.

Also remove outdated sed.

Closes: #28572 [via git-merge-pr]
---
 srcpkgs/fbgrab/template | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/fbgrab/template b/srcpkgs/fbgrab/template
index a71290405bc0..b0c1000a63a9 100644
--- a/srcpkgs/fbgrab/template
+++ b/srcpkgs/fbgrab/template
@@ -1,16 +1,12 @@
 # Template file for 'fbgrab'
 pkgname=fbgrab
-version=1.3
-revision=2
+version=1.4
+revision=1
 build_style=gnu-makefile
 makedepends="zlib-devel libpng-devel"
-short_desc="A linux framebuffer screenshot program"
+short_desc="Linux framebuffer screenshot program"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="http://fbgrab.monells.se/"
-distfiles="http://fbgrab.monells.se/fbgrab-$version.tar.gz"
-checksum=5fab478cbf8731fbacefaa76236a8f8b38ccff920c53b3a8253bc35509fba8ed
-
-pre_install() {
-	sed 's,/usr/man,/usr/share/man,' -i Makefile
-}
+homepage="https://github.com/GunnarMonell/fbgrab"
+distfiles="https://github.com/GunnarMonell/fbgrab/archive/$version.tar.gz"
+checksum="62d7aa82138ac36db0921832f3b5267b4cffc0dc22c8701857ebcb997960a32e"

From 53a1ad7e46993ee94834e0359e68c91f32ef77cc Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Tue, 9 Feb 2021 18:35:52 +0100
Subject: [PATCH 1315/3482] pari-seadata: fix vcopy

---
 srcpkgs/pari-seadata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pari-seadata/template b/srcpkgs/pari-seadata/template
index 3a5d8c72df72..3c836eafc156 100644
--- a/srcpkgs/pari-seadata/template
+++ b/srcpkgs/pari-seadata/template
@@ -1,7 +1,7 @@
 # Template file for 'pari-seadata'
 pkgname=pari-seadata
 version=20090618
-revision=2
+revision=3
 create_wrksrc=yes
 depends="pari"
 short_desc="PARI/GP package needed by ellap for large primes up to 750 bit"
@@ -13,5 +13,5 @@ checksum=c9282a525ea3f92c1f9c6c69e37ac5a87b48fb9ccd943cfd7c881a3851195833
 
 do_install() {
  vmkdir usr/share/pari/seadata
- vcopy data/seadata/sea* usr/share/pari
+ vcopy data/seadata/sea* usr/share/pari/seadata
 }

From 4785d0b0782da7fb21628a58abba047e2c16341a Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Tue, 9 Feb 2021 10:20:49 +0000
Subject: [PATCH 1316/3482] io.elementary.calculator: update to 1.6.0.

---
 srcpkgs/io.elementary.calculator/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template
index 0c613ce37d19..c39cde8fed5a 100644
--- a/srcpkgs/io.elementary.calculator/template
+++ b/srcpkgs/io.elementary.calculator/template
@@ -1,6 +1,6 @@
 # Template file for 'io.elementary.calculator'
 pkgname=io.elementary.calculator
-version=1.5.5
+version=1.6.0
 revision=1
 wrksrc="calculator-${version}"
 build_style=meson
@@ -11,7 +11,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/elementary/calculator"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b8dc3ebdb1d19b86232731efedb58fa08ecebc49a34d5c4a5855823c8e57f1ea
+checksum=c650d5ff7d2df2d122ade0cbd35be50927f22b0d260f28e374b1112114f24540
 
 pantheon-calculator_package() {
 	depends="io.elementary.calculator>=${version}_${revision}"

From 30fb5e13ce16276ec67b6193b5211c1c30119381 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Tue, 9 Feb 2021 09:26:38 +0000
Subject: [PATCH 1317/3482] xfce4-taskmanager: update to 1.4.1.

---
 srcpkgs/xfce4-taskmanager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index c8e3ea4b1309..9b7dd16b34a7 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
-version=1.4.0
+version=1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -8,8 +8,8 @@ hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="XFCE task manager plugin"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-taskmanager"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=655684ddfc15fc09071f78f9fce5439d20bbd2d80ecfc5ba0a08fb38313e7d43
+checksum=1141d2fde7bd498ccc2ce063800721e3ebb62dc9c9278cf1e2842df474965b5b

From 57c99a285cd0fbc1fedf0db53c6d99057fb1d8e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 8 Feb 2021 00:09:45 -0300
Subject: [PATCH 1318/3482] libtool: revbump for the gcc update.

libtool hardcodes some internal gcc paths, which include the GCC version
information. Some applications can fail to build if these paths are
used. Revbumping libtool is enough for the recorded paths to be updated.

A proper solution is importing the fixes Debian applies:
https://salsa.debian.org/metux-guest/libtool/-/blob/ef64614b54a8da38fc4b4424639251fde9d135bf/debian/rules#L115

Also add comment to gcc template about the requirement.
---
 srcpkgs/gcc/template     | 2 ++
 srcpkgs/libtool/template | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 5417d8d87bb8..c838403941c8 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -1,4 +1,6 @@
 # Template file for 'gcc'
+# Revbump libtool when updating gcc, since it hardcodes some internal compiler paths
+# which use the version number.
 _majorver=10
 _minorver=${_majorver}.2
 _patchver=${_minorver}.1
diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index 1cdc2649b966..d8533aac5b6e 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.6
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz"
 depends="tar sed"

From e3fbbf79e4ecf5f8e398fc2dc49f290204e3ce1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 9 Feb 2021 21:34:16 -0300
Subject: [PATCH 1319/3482] wxPython4: rebuild so wx doesn't complain of ABI
 mismatch.

---
 srcpkgs/wxPython4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template
index 7060e894b0aa..60356a02f9f5 100644
--- a/srcpkgs/wxPython4/template
+++ b/srcpkgs/wxPython4/template
@@ -1,7 +1,7 @@
 # Template file for 'wxPython4'
 pkgname=wxPython4
 version=4.0.7
-revision=2
+revision=3
 wrksrc="wxPython-${version}"
 build_style=python3-module
 make_build_args="--skip-build"

From 69a5762cb619e208677821fac6d3b76f087d3742 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 7 Feb 2021 10:39:21 +0100
Subject: [PATCH 1320/3482] cpuminer: update to 2.5.1, fix license

By ericonr: license is GPL-2.0-or-later, as seen in
https://github.com/pooler/cpuminer/blob/b5071a8cc6a2ba8b952598940f5582bf3e0eb226/cpu-miner.c

Closes: #28559 [via git-merge-pr]
---
 srcpkgs/cpuminer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cpuminer/template b/srcpkgs/cpuminer/template
index 30fbe49a9970..8afb7a5c4877 100644
--- a/srcpkgs/cpuminer/template
+++ b/srcpkgs/cpuminer/template
@@ -1,13 +1,13 @@
 # Template file for 'cpuminer'
 pkgname=cpuminer
-version=2.5.0
+version=2.5.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config yasm"
 makedepends="libcurl-devel ncurses-devel jansson-devel"
 short_desc="Multi-threaded CPU miner for Litecoin and Bitcoin"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="https://github.com/pooler/cpuminer"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/pooler-${pkgname}-${version}.tar.gz"
-checksum=ea16761a952b8f0fbba22fd16d48bb5e20abc48a10af99a00c70c332b3cb54f5
+checksum=337f04fdb32f34b85819d09d59f6d3cf62991ac2e656735c43661dd3d4c57631

From 3be4d4508da749ce9048675164cda5742ad644e2 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 7 Feb 2021 11:29:10 +0100
Subject: [PATCH 1321/3482] chessx: update to 1.5.4, add upstream translation
 patches

---
 ...001-remove-unmaintained-translations.patch | 33 ++++++++++++
 ...slations-into-separate-resource-file.patch | 50 +++++++++++++++++++
 srcpkgs/chessx/template                       | 12 ++---
 3 files changed, 89 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/chessx/patches/0001-remove-unmaintained-translations.patch
 create mode 100644 srcpkgs/chessx/patches/0002-extract-translations-into-separate-resource-file.patch

diff --git a/srcpkgs/chessx/patches/0001-remove-unmaintained-translations.patch b/srcpkgs/chessx/patches/0001-remove-unmaintained-translations.patch
new file mode 100644
index 000000000000..32e495def39a
--- /dev/null
+++ b/srcpkgs/chessx/patches/0001-remove-unmaintained-translations.patch
@@ -0,0 +1,33 @@
+From 2e300dfa4f6915a752d17c465b8d932849e17910 Mon Sep 17 00:00:00 2001
+From: Isarhamster <frodo.hobbit@gmx.net>
+Date: Sun, 17 May 2020 18:23:30 +0200
+Subject: [PATCH] Remove a couple of unmaintained translations from resource
+
+---
+ resources.qrc | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/resources.qrc b/resources.qrc
+index c826912f..770f9934 100644
+--- resources.qrc
++++ resources.qrc
+@@ -12,11 +12,7 @@
+         <file alias="help/about4.html">data/help/about4.html</file>
+         <file alias="help/about5.html">data/help/about5.html</file>
+         <file alias="help/about6.html">data/help/about6.html</file>
+-        <file alias="i18n/chessx_da.qm">i18n/chessx_da.qm</file>
+         <file alias="i18n/chessx_de.qm">i18n/chessx_de.qm</file>
+-        <file alias="i18n/chessx_fr.qm">i18n/chessx_fr.qm</file>
+-        <file alias="i18n/chessx_it.qm">i18n/chessx_it.qm</file>
+-        <file alias="i18n/chessx_cz.qm">i18n/chessx_cz.qm</file>
+         <file alias="images/accept.png">data/images/accept.png</file>
+         <file alias="images/annotate.png">data/images/annotate.png</file>
+         <file alias="images/arrow_green.png">data/images/arrow_green.png</file>
+@@ -180,7 +176,6 @@
+         <file alias="themes/shadow/leipzig.png">data/themes/shadow/leipzig.png</file>
+         <file alias="themes/shadow/merida.png">data/themes/shadow/merida.png</file>
+         <file alias="themes/shadow/spatial.png">data/themes/shadow/spatial.png</file>
+-        <file alias="i18n/chessx_ru.qm">i18n/chessx_ru.qm</file>
+         <file alias="images/threat_black.png">data/images/threat_black.png</file>
+         <file alias="images/threat_white.png">data/images/threat_white.png</file>
+         <file alias="images/black_wall.png">data/images/black_wall.png</file>
diff --git a/srcpkgs/chessx/patches/0002-extract-translations-into-separate-resource-file.patch b/srcpkgs/chessx/patches/0002-extract-translations-into-separate-resource-file.patch
new file mode 100644
index 000000000000..7e484dad822c
--- /dev/null
+++ b/srcpkgs/chessx/patches/0002-extract-translations-into-separate-resource-file.patch
@@ -0,0 +1,50 @@
+From 346a9dd4e8d913c846b2cfcb48290eb065ee149c Mon Sep 17 00:00:00 2001
+From: Eugene Rysaj <eugene.rysaj@gmail.com>
+Date: Fri, 15 May 2020 13:38:49 +0300
+Subject: [PATCH] Extract translations into separate resource file
+
+This makes easier enabling/disabling localizations.
+---
+ chessx.pro       | 2 +-
+ resources.qrc    | 1 -
+ translations.qrc | 6 ++++++
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+ create mode 100644 translations.qrc
+
+diff --git a/chessx.pro b/chessx.pro
+index 8e1364e1..22fc0163 100644
+--- chessx.pro
++++ chessx.pro
+@@ -481,7 +481,7 @@ lc0 {
+ }
+ 
+ RESOURCES = \
+-    resources.qrc
++    resources.qrc translations.qrc
+ 
+ TRANSLATIONS = i18n/chessx_de.ts
+ 
+diff --git a/resources.qrc b/resources.qrc
+index 770f9934..172405eb 100644
+--- resources.qrc
++++ resources.qrc
+@@ -12,7 +12,6 @@
+         <file alias="help/about4.html">data/help/about4.html</file>
+         <file alias="help/about5.html">data/help/about5.html</file>
+         <file alias="help/about6.html">data/help/about6.html</file>
+-        <file alias="i18n/chessx_de.qm">i18n/chessx_de.qm</file>
+         <file alias="images/accept.png">data/images/accept.png</file>
+         <file alias="images/annotate.png">data/images/annotate.png</file>
+         <file alias="images/arrow_green.png">data/images/arrow_green.png</file>
+diff --git a/translations.qrc b/translations.qrc
+new file mode 100644
+index 00000000..d0428c8b
+--- /dev/null
++++ translations.qrc
+@@ -0,0 +1,6 @@
++<RCC>
++    <qresource prefix="/">
++        <file alias="i18n/chessx_de.qm">i18n/chessx_de.qm</file>
++    </qresource>
++</RCC>
++
diff --git a/srcpkgs/chessx/template b/srcpkgs/chessx/template
index 16146fc8bda3..da4b1e394749 100644
--- a/srcpkgs/chessx/template
+++ b/srcpkgs/chessx/template
@@ -1,19 +1,19 @@
 # Template file for 'chessx'
 pkgname=chessx
-version=1.5.0
+version=1.5.4
 revision=1
 build_style=qmake
 hostmakedepends="qt5-tools"
-makedepends="qt5-multimedia-devel qt5-svg-devel pulseaudio-devel"
+makedepends="qt5-multimedia-devel qt5-svg-devel qt5-speech-devel pulseaudio-devel"
 short_desc="Open Source chess database"
 maintainer="cipr3s <cipr3s@gmx.com>"
-license="GPL-2"
-homepage="http://chessx.sourceforge.net"
+license="GPL-2.0-only"
+homepage="https://chessx.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz"
-checksum=d130ad3220821da9ea19e7228222a5528fabca3ca06bc41b4d7f702454f63827
+checksum=e2dbacff2a6c055cfbe4ce0344331f77262867e228a5fe2895e6c242772065a8
 
 if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-multimedia-devel qt5-svg-devel"
+	hostmakedepends+=" qt5-host-tools qt5-multimedia-devel qt5-speech-devel qt5-svg-devel"
 fi
 
 do_install() {

From 2b2ba9ebeec1c1eec34b182bee69812e481813c9 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 7 Feb 2021 14:53:25 +0100
Subject: [PATCH 1322/3482] lingot: update to 1.1.1.

---
 srcpkgs/lingot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lingot/template b/srcpkgs/lingot/template
index c7d3f58f7579..e428c85b7a8c 100644
--- a/srcpkgs/lingot/template
+++ b/srcpkgs/lingot/template
@@ -1,14 +1,14 @@
 # Template file for 'lingot'
 pkgname=lingot
-version=1.0.1
+version=1.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
-makedepends="alsa-lib-devel gtk+3-devel jack-devel fftw-devel libglade-devel
+makedepends="alsa-lib-devel gtk+3-devel jack-devel json-c-devel fftw-devel libglade-devel
  pulseaudio-devel"
-short_desc="A musical instrument tuner"
+short_desc="Musical instrument tuner"
 maintainer="David <kalichakra@zoho.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/lingot/"
 distfiles="http://download.savannah.gnu.org/releases/lingot/${pkgname}-${version}.tar.gz"
-checksum=71b8c77bb988e8384a0ecbf4c861d838f7b985284a8e18f75532ab9816c6a00f
+checksum=c4f97e496a3666c70786d136e6f2ccc5e8a3813eb08cda35cacd7eb0d16f4d56

From a0377be5a679d892f7de4ad6b876a6fd8cdf1e6c Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 7 Feb 2021 17:22:17 +0100
Subject: [PATCH 1323/3482] wmbubble: update to 1.54.

---
 srcpkgs/wmbubble/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wmbubble/template b/srcpkgs/wmbubble/template
index 312cfd5ba4a3..38cd4d9a473b 100644
--- a/srcpkgs/wmbubble/template
+++ b/srcpkgs/wmbubble/template
@@ -1,6 +1,6 @@
 # Template file for 'wmbubble'
 pkgname=wmbubble
-version=1.53
+version=1.54
 revision=1
 build_style=gnu-makefile
 makedepends="libX11-devel"
@@ -9,6 +9,4 @@ maintainer="bertronika <nejc@bertoncelj.eu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/rnjacobs/wmbubble"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=bcdbbf4ea6a426bf75427eac511aa124228508e74c385ea75338979ace06dfd6
-
-CFLAGS="-fcommon"
+checksum=ccbc9a74864ef86fbafad4ac08186de190d4a7a269bcb58493de7194c4c80933

From 92598c3bec79a9041db71885ae5e776d7fc85d01 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 6 Feb 2021 17:50:47 +0100
Subject: [PATCH 1324/3482] zim: update to 0.73.5.

---
 srcpkgs/zim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zim/template b/srcpkgs/zim/template
index 5fcc9a5a5945..d0f426e74e48 100644
--- a/srcpkgs/zim/template
+++ b/srcpkgs/zim/template
@@ -1,6 +1,6 @@
 # Template file for 'zim'
 pkgname=zim
-version=0.73.4
+version=0.73.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-gobject python3-xdg gtk+3"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://zim-wiki.org/"
 distfiles="http://zim-wiki.org/downloads/${pkgname}-${version}.tar.gz"
-checksum=1f729d3390a04221a086526e9a894526c4d02b154af59ad535123066155213da
+checksum=a36f15d92c3994c0d55b07f83253b3d8b826beb3714865edbabc14f1cc91d63a

From 86e541d825e9eac6505e034444d33c3033cf27b1 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 6 Feb 2021 17:52:43 +0100
Subject: [PATCH 1325/3482] libhandy: adopt, various improvements

* enable tests
* install demo to libhandy-demo
* fix license
* combine vala and gir build options
---
 srcpkgs/libhandy-demo     |  1 +
 srcpkgs/libhandy/template | 36 +++++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/libhandy-demo

diff --git a/srcpkgs/libhandy-demo b/srcpkgs/libhandy-demo
new file mode 120000
index 000000000000..a94d500bb81a
--- /dev/null
+++ b/srcpkgs/libhandy-demo
@@ -0,0 +1 @@
+libhandy
\ No newline at end of file
diff --git a/srcpkgs/libhandy/template b/srcpkgs/libhandy/template
index c19c3897efad..796cd46e7359 100644
--- a/srcpkgs/libhandy/template
+++ b/srcpkgs/libhandy/template
@@ -1,26 +1,26 @@
 # Template file for 'libhandy'
 pkgname=libhandy
 version=0.0.13
-revision=2
+revision=3
 wrksrc="libhandy-v${version}"
 build_style=meson
 build_helper="gir"
-# tests need X anyway, so no need to build them
-configure_args="-Dexamples=false -Dtests=false $(vopt_bool vala vapi)
- -Dglade_catalog=$(vopt_if glade enabled disabled)
+configure_args="-Dexamples=true -Dtests=true
+ $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if vala vala-devel)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
-short_desc="Library full of GTK+ widgets for mobile phones"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.0-or-later"
+checkdepends="xvfb-run"
+short_desc="GTK+3 building blocks for modern adaptive applications"
+maintainer="Paper <paper@tilde.institute>"
+license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy"
-distfiles="$homepage/-/archive/v${version}/libhandy-v${version}.tar.gz"
+distfiles="https://gitlab.gnome.org/GNOME/libhandy/-/archive/v${version}/libhandy-v${version}.tar.gz"
 checksum=645355a009f23f254eaec7752b9489c3c2f5832397fcec75433a7e00efbfe52f
 
-build_options="gir vala glade"
+build_options="gir glade"
 desc_option_glade="Generate glade modules and catalog files"
-build_options_default="gir vala glade"
+build_options_default="gir glade"
 
 # https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/559
 CFLAGS="-DGPC_OBJECT_DELIMITER=GLADE_PROPERTY_DEF_OBJECT_DELIMITER"
@@ -28,6 +28,10 @@ CFLAGS+=" -Dglade_widget_action_get_class=glade_widget_action_get_def"
 # https://gitlab.gnome.org/GNOME/glade/-/commit/bb626dd
 CFLAGS+=" -DGWA_GET_CLASS=GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS"
 
+do_check() {
+	xvfb-run ninja -C build test
+}
+
 libhandy-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} gtk+3-devel"
 	short_desc+=" - development files"
@@ -41,9 +45,15 @@ libhandy-devel_package() {
 		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}
 }
+
+libhandy-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/handy-0.0-demo
+	}
+}

From 6ad8fb732730f9558b89759e6b2ba8d07556a1b5 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 7 Feb 2021 17:33:37 +0100
Subject: [PATCH 1326/3482] windowchef: update to 0.5.2.

---
 srcpkgs/windowchef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/windowchef/template b/srcpkgs/windowchef/template
index 0cc90bdf9611..2a7f6fe31a12 100644
--- a/srcpkgs/windowchef/template
+++ b/srcpkgs/windowchef/template
@@ -1,6 +1,6 @@
 # Template file for 'windowchef'
 pkgname=windowchef
-version=0.5.0
+version=0.5.2
 revision=1
 build_style=gnu-makefile
 makedepends="xcb-util-wm-devel xcb-util-keysyms-devel"
@@ -9,7 +9,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="ISC"
 homepage="https://github.com/tudurom/windowchef"
 distfiles="https://github.com/tudurom/windowchef/archive/v${version}.tar.gz"
-checksum=25a1ff361468f98df5291bd002946cf9adea9e14ef762a4b6e76e17919c52f6d
+checksum=d130b4f2367b4a026c364b20522f34464dba59461943952640af6a7ca65ed2c9
 
 pre_build() {
 	sed -i 's|^CFLAGS +=|override CFLAGS +=|g' config.mk

From 8e9b49771de1bc552aa2ea81200e9ba3c8083ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 7 Feb 2021 21:44:54 +0100
Subject: [PATCH 1327/3482] visidata: update to 2.2.1.

---
 srcpkgs/visidata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/visidata/template b/srcpkgs/visidata/template
index c95ceb254c16..8ec4a94a004e 100644
--- a/srcpkgs/visidata/template
+++ b/srcpkgs/visidata/template
@@ -1,6 +1,6 @@
 # Template file for 'visidata'
 pkgname=visidata
-version=2.1.1
+version=2.2.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,4 +12,4 @@ license="GPL-3.0-only"
 homepage="https://visidata.org/"
 changelog="https://raw.githubusercontent.com/saulpw/visidata/stable/CHANGELOG.md"
 distfiles="https://github.com/saulpw/visidata/archive/v${version}.tar.gz"
-checksum=f33ebe21fa6b6aaffd7bf1540b6a0da3b1e816d5b32df563f7b3cd40040d55dd
+checksum=8e73e8290f8ac01d0a9b7ed44613170f55a4687c1087ac92f5dd92e9f0546cf4

From 36151d047d3038875c843ade03cd91fedd34f322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 9 Feb 2021 22:06:41 -0300
Subject: [PATCH 1328/3482] wxPython4: mark nocross temporarily.

Error:

Checking for python version >= 2.7.0     : 3.9.1
python-config                            : /usr/armv7l-linux-musleabihf/bin/python3-config
Checking for library python3.9 in LIBDIR : not found
Checking for library python3.9 in python_LIBPL : not found
Checking for library python3.9 in $prefix/libs : not found
Checking for library python3.9m in LIBDIR      : not found
Checking for library python3.9m in python_LIBPL : not found
Checking for library python3.9m in $prefix/libs : not found
Checking for library python39 in LIBDIR         : not found
Checking for library python39 in python_LIBPL   : not found
Checking for library python39 in $prefix/libs   : not found
Checking for header Python.h                    : Distutils not installed? Broken python installation? Get python-config now!
---
 srcpkgs/wxPython4/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template
index 60356a02f9f5..08dcc5d5c128 100644
--- a/srcpkgs/wxPython4/template
+++ b/srcpkgs/wxPython4/template
@@ -16,6 +16,8 @@ license="custom:wxWindows"
 homepage="http://www.wxpython.org/"
 distfiles="${PYPI_SITE}/w/wxPython/wxPython-${version}.tar.gz"
 checksum=3be608bfdede3063678cc703453850ab0a018b82bafd5ee057302250b18f0233
+# FIXME
+nocross="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/31785/steps/shell_3/logs/stdio"
 
 if [ "$CROSS_BUILD" ]; then
 	CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}"

From 425eedf77cd5395692a1ae33cbd3d43272bf7fc3 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Fri, 5 Feb 2021 10:41:54 +0000
Subject: [PATCH 1329/3482] papirus-icon-theme: update to 20210201.

---
 srcpkgs/papirus-icon-theme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index 61892a81f988..41b6ad6d3b16 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20201001
+version=20210201
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=e71c8d5aa7bdd8f89c08df43493deac023c05ba344bf8168d1031611c6f028a0
+checksum=3ecb1ff3e193532b8e5a651c021381b40be131625269f1e31849c9e5ebd654be
 
 do_install() {
 	vmkdir usr/share/icons

From d1ffbe13b398df7a13bdddddd18b5348f57a35ee Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 5 Feb 2021 13:45:04 +0100
Subject: [PATCH 1330/3482] mednaffe: update to 0.9.1.

---
 srcpkgs/mednaffe/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mednaffe/template b/srcpkgs/mednaffe/template
index 82ae75c22e57..7e5a7462c6b8 100644
--- a/srcpkgs/mednaffe/template
+++ b/srcpkgs/mednaffe/template
@@ -1,9 +1,8 @@
 # Template file for 'mednaffe'
 pkgname=mednaffe
-version=0.8.8
+version=0.9.1
 revision=1
 build_style=gnu-configure
-configure_args="--enable-gtk3"
 hostmakedepends="pkg-config"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme mednafen"
@@ -12,4 +11,4 @@ maintainer="VladTheImpaler <vladimir-romanov-ii@yandex.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/AmatCoder/mednaffe"
 distfiles="https://github.com/AmatCoder/mednaffe/releases/download/${version}/mednaffe-${version}.tar.gz"
-checksum=e3713790296e6e0177f14818b47b30e8f96464f3de01e8870a4fb25761dc78d8
+checksum=426cd53342db9f6d619f5b7fafda3a262e5b4789aa87790265bb09ce674b454f

From 520be3a5de9cb98cfb972f3e13c1d979dfca75d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 9 Feb 2021 22:52:56 -0300
Subject: [PATCH 1331/3482] common/wrappers: add -L/usr/lib{32,64} to arguments
 ignored by cross-cc.

Detected when cross building timg after rebuilding GraphicsMagick with
new libdir directories. Could be fixed in all offending packages, but
it's easier to fix it in one place, and arguably more correct.
---
 common/wrappers/cross-cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/wrappers/cross-cc b/common/wrappers/cross-cc
index f5333a03bb2f..0e08bc91d0fc 100644
--- a/common/wrappers/cross-cc
+++ b/common/wrappers/cross-cc
@@ -16,7 +16,8 @@ while [ $i -lt ${#ARGS[@]} ]; do
 		fi
 		unset incpath
 	elif [ "$libpath" ]; then
-		if [ "$arg" = "/usr/lib" -o "$arg" = "/lib" ]; then
+		# XXX: avoid so much repetition
+		if [ "$arg" = "/usr/lib" -o "$arg" = "/usr/lib32" -o "$arg" = "/usr/lib64" -o "$arg" = "/lib" ]; then
 			echo "[cc-wrapper] ignoring -L $arg"
 		else
 			MYARGS+=("-L${arg}")
@@ -26,7 +27,9 @@ while [ $i -lt ${#ARGS[@]} ]; do
 		incpath=1
 	elif [ "$arg" = "-L" ]; then
 		libpath=1
-	elif [ "$arg" = "-I/usr/include" -o "$arg" = "-L/usr/lib" -o "$arg" = "-L/lib" ]; then
+	elif [ "$arg" = "-I/usr/include" -o "$arg" = "-L/usr/lib" \
+		-o "$arg" = "-L/usr/lib32" -o "$arg" = "-L/usr/lib64" \
+		-o "$arg" = "-L/lib" ]; then
 		echo "[cc-wrapper] ignoring $arg"
 	else
 		MYARGS+=("${arg}")

From cf0da56f37ee96f42081af4b27884025b42f363f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 9 Feb 2021 22:51:28 -0300
Subject: [PATCH 1332/3482] GraphicsMagick: add some makedepends to the -devel
 package.

These libraries are requested at link time when using
GraphicsMagick*-config programs, so they should be included in the
-devel package instead of being added to makedepends of all the other
packages.

Also shorten INSTALL.msg.
---
 srcpkgs/GraphicsMagick/INSTALL.msg | 12 ++----------
 srcpkgs/GraphicsMagick/template    | 14 ++++++++------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/GraphicsMagick/INSTALL.msg b/srcpkgs/GraphicsMagick/INSTALL.msg
index 8edd2838f58a..60ac04bd6bb2 100644
--- a/srcpkgs/GraphicsMagick/INSTALL.msg
+++ b/srcpkgs/GraphicsMagick/INSTALL.msg
@@ -1,12 +1,4 @@
- The libgraphicsmagick-devel package contain also:
-
- - The documentation for GraphicsMagick found in:
-
-   /usr/share/doc/GraphicsMagick/www
-
- - GraphicsMagick PERL extension.
-   To install this extension follow the instructions in:
+ The libgraphicsmagick-devel package contains the GraphicsMagick PERL
+ extension. To install this extension follow the instructions in:
 
    /usr/share/doc/GraphicsMagick/PerlMagick/README.txt
-
-  The Void Linux Team
diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index a1c4e4e93d46..945ed5c3aee5 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -1,15 +1,17 @@
 # Template file for 'GraphicsMagick'
 pkgname=GraphicsMagick
 version=1.3.35
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1
  --with-modules --with-perl --without-lcms --without-jp2 --enable-shared --disable-static"
 hostmakedepends="pkg-config perl"
-makedepends="perl libjpeg-turbo-devel libpng-devel tiff-devel
- lcms2-devel freetype-devel libwebp-devel fontconfig-devel libXext-devel
- libXt-devel libltdl-devel libxml2-devel libwmf-devel liblzma-devel libgomp-devel
- ghostscript-devel"
+# libraries listed in GraphicsMagick++-config --libs
+_develdepends="lcms2-devel freetype-devel libXext-devel libSM-devel libICE-devel
+ libX11-devel liblzma-devel bzip2-devel zlib-devel libltdl-devel libgomp-devel"
+makedepends="perl libjpeg-turbo-devel libpng-devel tiff-devel libwebp-devel
+ fontconfig-devel libXt-devel libxml2-devel libwmf-devel ghostscript-devel
+ ${_develdepends}"
 depends="ghostscript"
 short_desc="GraphicsMagick Image Processing System"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -34,7 +36,7 @@ libgraphicsmagick_package() {
 }
 libgraphicsmagick-devel_package() {
 	short_desc="GraphicsMagick image manipulation libraries - development files"
-	depends="libgraphicsmagick>=${version}_${revision}"
+	depends="libgraphicsmagick>=${version}_${revision} ${_develdepends}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

From a4a336ac65d62f67d0414a3f37a826c684154f64 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 6 Feb 2021 14:02:27 +0100
Subject: [PATCH 1333/3482] timg: update to 0.9.9, enable video decoding
 support.

By ericonr:
- use MAGICK_CXXFLAGS instead of CXXFLAGS: guarantee usage of target
headers
- clean up makedepends now provided by libgraphicsmagick-devel
- install man page

Closes: #28546 [via git-merge-pr]
---
 srcpkgs/timg/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/timg/template b/srcpkgs/timg/template
index 9221bc491dfa..84b6ac543eba 100644
--- a/srcpkgs/timg/template
+++ b/srcpkgs/timg/template
@@ -1,21 +1,21 @@
 # Template file for 'timg'
 pkgname=timg
-version=0.9.8
+version=0.9.9
 revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
-hostmakedepends="libgraphicsmagick-devel"
-makedepends="libgraphicsmagick-devel libX11-devel libXext-devel libwebp-devel
- lcms2-devel libSM-devel freetype-devel libltdl-devel libgomp-devel"
-short_desc="24-bit color image viewer for terminal"
+make_use_env=yes
+make_build_args="WITH_VIDEO_DECODING=1 MAGICK_CXXFLAGS=-I${XBPS_CROSS_BASE}/usr/include/GraphicsMagick"
+hostmakedepends="pkg-config libgraphicsmagick-devel"
+makedepends="libgraphicsmagick-devel ffmpeg-devel"
+short_desc="24-bit color image & video viewer for terminal"
 maintainer="Daniel Santana <daniel@santana.tech>"
 license="GPL-2.0-only"
 homepage="https://github.com/hzeller/timg"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=436e2c3b5f43e906786ca150d11e521281d558329a7bc00198fe30d6907ee8c4
-
-CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/GraphicsMagick"
+checksum=f43df657e93d47a1184a81c0976e67978cbdce21a83be5ec1df83403cda24caf
 
 do_install() {
+	vman ../man/timg.1.gz
 	vbin timg
 }

From 3ce6995ae8f1ae419c44d8c64d69de4fab004efe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Feb 2021 10:02:15 -0500
Subject: [PATCH 1334/3482] talloc: update to 2.3.2.

---
 srcpkgs/talloc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/talloc/template b/srcpkgs/talloc/template
index 50f629f3db70..8ad2baf8937a 100644
--- a/srcpkgs/talloc/template
+++ b/srcpkgs/talloc/template
@@ -1,7 +1,7 @@
 # Template file for 'talloc'
 pkgname=talloc
-version=2.3.1
-revision=2
+version=2.3.2
+revision=1
 build_style=waf3
 build_helper="qemu"
 configure_script="buildtools/bin/waf"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://talloc.samba.org/"
 distfiles="http://samba.org/ftp/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ef4822d2fdafd2be8e0cabc3ec3c806ae29b8268e932c5e9a4cd5585f37f9f77
+checksum=27a03ef99e384d779124df755deb229cd1761f945eca6d200e8cfd9bf5297bd7
 
 export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config"
 

From 493c3fa36a12d5e5c8ad05d5c6739e29f54e0e77 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Feb 2021 11:17:42 -0500
Subject: [PATCH 1335/3482] samba: update to 4.13.4.

Closes: #28527 [via git-merge-pr]
---
 srcpkgs/samba/files/nmbd/run | 6 +++++-
 srcpkgs/samba/files/smbd/run | 6 +++++-
 srcpkgs/samba/template       | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/samba/files/nmbd/run b/srcpkgs/samba/files/nmbd/run
index c27f740c3491..6378a6e234f4 100755
--- a/srcpkgs/samba/files/nmbd/run
+++ b/srcpkgs/samba/files/nmbd/run
@@ -1,6 +1,10 @@
 #!/bin/sh
 
+exec 2>&1
+
+[ -r ./conf ] && . ./conf
+
 mkdir -p /run/samba
 mkdir -p /run/lock/samba
 
-exec nmbd -F -S
+exec nmbd -F ${OPTS:--S -d1}
diff --git a/srcpkgs/samba/files/smbd/run b/srcpkgs/samba/files/smbd/run
index 136e19788aec..bcc2e07d95e8 100755
--- a/srcpkgs/samba/files/smbd/run
+++ b/srcpkgs/samba/files/smbd/run
@@ -1,6 +1,10 @@
 #!/bin/sh
 
+exec 2>&1
+
+[ -r ./conf ] &&  . ./conf
+
 mkdir -p /run/samba
 mkdir -p /run/lock/samba
 
-exec smbd -F -S
+exec smbd -F ${OPTS:--S -d1}
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index cb5eaf453764..90be22e57059 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,6 +1,6 @@
 # Template file for 'samba'
 pkgname=samba
-version=4.13.3
+version=4.13.4
 revision=1
 build_style=waf3
 build_helper="qemu"
@@ -27,7 +27,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.samba.org"
 distfiles="http://download.samba.org/pub/samba/stable/${pkgname}-${version}.tar.gz"
-checksum=c10585d43f33656fe4e1f9ff8bf40ea57d8d5b653521c1cc198fbf4922756541
+checksum=a1b34c63f7100cc8626902d80f335c7cb0b45d4707dd3c4b010f7a28ed615c78
 lib32disabled=yes
 conf_files="/etc/pam.d/samba /etc/samba/smb.conf"
 make_dirs="/etc/samba/private 0750 root root"

From 5410a30a37c3818df69bb046d526f67e1f454303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 01:35:37 -0300
Subject: [PATCH 1336/3482] kiwix-tools: rebuild to fix ABI mismatch with
 kiwix-lib.

Introduced with
https://github.com/kiwix/kiwix-lib/commit/08464f23bc0756fc99e2e1559f95d325f52fba87

Fixes #28615
---
 srcpkgs/kiwix-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kiwix-tools/template b/srcpkgs/kiwix-tools/template
index 10fd9b543a2a..e9f0841b61ae 100644
--- a/srcpkgs/kiwix-tools/template
+++ b/srcpkgs/kiwix-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-tools'
 pkgname=kiwix-tools
 version=3.1.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="kiwix-lib-devel zlib-devel libmicrohttpd-devel libuuid-devel"

From cfb168bd5ede9f876beac4001ba02e49b3087151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 10 Feb 2021 13:34:11 +0100
Subject: [PATCH 1337/3482] lollypop: update to 1.4.16

---
 srcpkgs/lollypop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 69993862d1a4..becd5dacec19 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,6 +1,6 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.4.15
+version=1.4.16
 revision=1
 build_style=meson
 hostmakedepends="cmake git glib-devel gobject-introspection intltool itstool pkg-config"
@@ -13,4 +13,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/${pkgname}-${version}.tar.xz"
-checksum=084f3e731eb6002940ba13e9d1592e5e1de923d8cc623d7fe3f77d861626826d
+checksum=7384c57e4f8922c8e5e3b4b2a93e4bc15cc019579fdf1f99d0c42555e1238222

From f16cf1dc79186e54c9a2391af16fd649be7493d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 10 Feb 2021 13:33:44 +0100
Subject: [PATCH 1338/3482] exiftool: update to 12.18.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 8c81c61209de..4b3e06ad4eab 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.17
+version=12.18
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=6580b143a1d07257f4ef08d7c6abb79ec653cd7112fe19e757d7b5a8635b96ff
+checksum=56814e537652d2d0f84bd891a8f3ab5f9f5a47743ef58cd0a18a1f9a02fc3404

From c1866dfc2fb34195497f476c1c2669fec2835967 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 5 Feb 2021 09:01:03 +0100
Subject: [PATCH 1339/3482] vscode: update to 1.53.1.

---
 srcpkgs/vscode/patches/remove_git_command.patch | 10 +++++-----
 srcpkgs/vscode/template                         |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index a99643c055f6..2818b47ab233 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,10 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index ef8fa4a47f66..7b8b710636a7 100644
+index 18ccef884a9d..61acb0a4d10b 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -73,5 +73,3 @@ yarnInstall('test/automation'); // node modules required for smoketest
- yarnInstall('test/smoke'); // node modules required for smoketest
- yarnInstall('test/integration/browser'); // node modules required for integration
- yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron
+@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+ 	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
+ 	yarnInstall(watchPath);
+ }
 -
 -cp.execSync('git config pull.rebase true');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 639a812a738e..fc31bf3ddaa6 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,8 +1,8 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.52.1
+version=1.53.1
 revision=1
-_electronver=9.3.4
+_electronver=9.4.1
 hostmakedepends="pkg-config python nodejs yarn tar git"
 makedepends="libxkbfile-devel libsecret-devel electron9"
 depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron9"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=4a2b4e3500bff73503322fc3a68099ec4151d3e800cf2bb6e9478f2e94637b6a
+checksum=e64d6962389cb1e1f09558fa231f1e0eece87a059b09d6ba55a894e994997a39
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 75603afb514c349e77da5fb753f929223d057ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 10 Feb 2021 15:32:26 +0700
Subject: [PATCH 1340/3482] git: update to 2.30.1.

---
 srcpkgs/git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9d91458acc89..9002f487b6af 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.30.0
+version=2.30.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=55735021109565721af805af382c45cce73c3cfaa59daad22443d1477d334d19
+checksum=f988a8a095089978dab2932af4edb22b4d7d67d67b81aaa1986fa29ef45d9467
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 8f8c5789b9c82c7b9c8d361a0209fa0d91830f2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Feb 2021 06:47:45 +0700
Subject: [PATCH 1341/3482] common/00-libdir: only create lib{32,64} symlink if
 not exists

---
 common/hooks/pre-install/00-libdir.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/hooks/pre-install/00-libdir.sh b/common/hooks/pre-install/00-libdir.sh
index f19f68088ff8..4c57fbcb1e0e 100644
--- a/common/hooks/pre-install/00-libdir.sh
+++ b/common/hooks/pre-install/00-libdir.sh
@@ -1,7 +1,9 @@
 # This hook creates the wordsize specific libdir symlink.
 
 hook() {
-	if [ "${pkgname}" != "base-files" ]; then
+	if [ -L ${PKGDESTDIR}/usr/lib${XBPS_TARGET_WORDSIZE} ]; then
+		return 0
+	elif [ "${pkgname}" != "base-files" ]; then
 		vmkdir usr/lib
 		ln -sf lib ${PKGDESTDIR}/usr/lib${XBPS_TARGET_WORDSIZE}
 	fi

From 97ac363b4586e43a5127f9f87bf2f663ecb6edab Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 10 Feb 2021 15:50:08 +0100
Subject: [PATCH 1342/3482] mumble: update to 1.3.4.

---
 srcpkgs/mumble/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index f068f9172296..f60bf7310cf8 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
-version=1.3.3
-revision=4
+version=1.3.4
+revision=1
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -18,7 +18,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="BSD-3-Clause"
 homepage="http://mumble.sourceforge.net/"
 distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=727047624edaa8cce6fed98b778666dd8a4b76c0ada895e5d2b87e3246e02f80
+checksum=615f4ebfc3385d945163f369efd3e910c8b6d0f025797a7eed541515fccb6093
 
 build_options="jack"
 desc_option_jack="Enable support for the JACK sound server"

From 8d75a011373de5b5f8b8b64f82f95f3dbd37b97c Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 6 Feb 2021 14:08:58 +0100
Subject: [PATCH 1343/3482] just: update to 0.8.4.

---
 srcpkgs/just/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index 0c585b5929ac..d4266e9f158b 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=0.8.0
+version=0.8.4
 revision=1
 build_style=cargo
 short_desc="Just a command runner"
@@ -9,7 +9,12 @@ license="CC0-1.0"
 homepage="https://github.com/casey/just"
 changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md"
 distfiles="https://github.com/casey/just/archive/v${version}.tar.gz"
-checksum=624cf1681cf7df8e50b70f37b29e4194cf4ad7327a335fcdf94dd83b19e45a2b
+checksum=7aee472e4b70e62e89d7d5185493a3c680aeae4cc323c842e4c5b9b8af47040a
+
+# Fix failing test
+pre_check() {
+	export USER=void
+}
 
 post_install() {
 	vlicense LICENSE

From 48bb5d0cd3560f1a5e5ad68889711cec3f7ff527 Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Tue, 9 Feb 2021 21:38:02 -0500
Subject: [PATCH 1344/3482] chezmoi: update to 1.8.11.

Closes: #28614 [via git-merge-pr]
---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 75bbd44feb1c..5c6d47e5abc4 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=1.8.10
+version=1.8.11
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/${pkgname}/archive/v${version}.tar.gz"
-checksum=46f94b65abd0dcb6e3c4d8f28d18f9435297065ffff12140fd60c61ed2ece90f
+checksum=23515591028202aaf7af908e38972f156ee08022f535bc74aaa9244b82da2fa1
 
 post_install() {
 	vlicense LICENSE

From 4f9f2d029ce4f8f947d7519b6a255cf95bd15029 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 10 Feb 2021 10:39:57 +0100
Subject: [PATCH 1345/3482] rofi-emoji: update to 2.1.2.

Closes: #28621 [via git-merge-pr]
---
 srcpkgs/rofi-emoji/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rofi-emoji/template b/srcpkgs/rofi-emoji/template
index ac61db2c45c5..622d009e38a0 100644
--- a/srcpkgs/rofi-emoji/template
+++ b/srcpkgs/rofi-emoji/template
@@ -1,6 +1,6 @@
 # Template file for 'rofi-emoji'
 pkgname=rofi-emoji
-version=2.1.0
+version=2.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Wilson Birney <wpb@360scada.com>"
 license="MIT"
 homepage="https://github.com/Mange/rofi-emoji"
 distfiles="https://github.com/Mange/rofi-emoji/archive/v${version}.tar.gz"
-checksum=cfb3da4aa715644c75949ce0e8ca28fecc4d663387935e5c0677267612a6fd58
+checksum=b1702d205e9a9609083ec99868a3c346717e49fdbf059d2b8223dd8c6f56d502
 
 pre_configure() {
 	sed -n '81,83p' README.md > LICENSE

From 1f1a859f49e9d940d149e9d70bb4cb4abf12c54d Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 10 Feb 2021 10:50:39 +0100
Subject: [PATCH 1346/3482] rvault: update to 0.3.

Closes: #28622 [via git-merge-pr]
---
 srcpkgs/rvault/patches/musl.patch | 10 ----------
 srcpkgs/rvault/template           |  8 ++++----
 2 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/rvault/patches/musl.patch

diff --git a/srcpkgs/rvault/patches/musl.patch b/srcpkgs/rvault/patches/musl.patch
deleted file mode 100644
index 13c9c63e377c..000000000000
--- a/srcpkgs/rvault/patches/musl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/crypto/crypto.h.orig	2020-04-14 16:00:33.022021781 +0200
-+++ src/crypto/crypto.h	2020-04-14 16:00:50.765211461 +0200
-@@ -8,6 +8,7 @@
- #ifndef	_CRYPTO_H_
- #define	_CRYPTO_H_
- 
-+#include <sys/types.h>
- #include <stdint.h>
- #include <stdbool.h>
- 
diff --git a/srcpkgs/rvault/template b/srcpkgs/rvault/template
index 8198657c82c5..90404a44d99d 100644
--- a/srcpkgs/rvault/template
+++ b/srcpkgs/rvault/template
@@ -1,9 +1,9 @@
 # Template file for 'rvault'
 pkgname=rvault
-version=0.2
-revision=2
-build_style=gnu-makefile
+version=0.3
+revision=1
 build_wrksrc=src
+build_style=gnu-makefile
 make_use_env=yes
 make_build_args="USE_SQLITE=1 USE_MBEDTLS=1 USE_OPENSSL=0 USE_SODIUM=0"
 make_install_args="BINDIR=/usr/bin MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/rmind/rvault"
 distfiles="https://github.com/rmind/rvault/archive/v${version}.tar.gz"
-checksum=0927017cab3d0f29cb9e6cd537405aa3c1bf302d1285cb7c16da656ba73aa1be
+checksum=e7480aaf7bb2feb5c7bc0d2a0c6998583d2ad41417ec4aadbf9ccb001f76d7a1
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 2225f7e10a8d8d465a5aa671ea37f45c35b08e8e Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 10 Feb 2021 12:33:06 +0100
Subject: [PATCH 1347/3482] xterm: update to 365

Closes: #28624 [via git-merge-pr]
---
 srcpkgs/xterm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index cce4d9f49bf1..70f3b03bdb9e 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -1,6 +1,6 @@
 # Template file for 'xterm'
 pkgname=xterm
-version=363
+version=365
 revision=1
 build_style=gnu-configure
 configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc
@@ -20,7 +20,7 @@ license="MIT, X11"
 homepage="http://invisible-island.net/xterm/"
 changelog="http://invisible-island.net/xterm/xterm.log.html"
 distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
-checksum=d81a3639e26552b6765bdcf28be1ecdb8acabf907955708e830ad6397ea10b48
+checksum=d627d2b005803b4ebcdf04f2d89e3e1d2878235d2ecdfa73d904bb1772a74f90
 
 post_install() {
 	for f in {u,}xterm.desktop; do

From 05458f8d7317991df4ec4c438d0d49b204c42c65 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Mon, 8 Feb 2021 21:01:44 +0000
Subject: [PATCH 1348/3482] gnome-passwordsafe: update to 5.0.

Closes: #28597 [via git-merge-pr]
---
 srcpkgs/gnome-passwordsafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template
index 7c34bd4a0a28..557d99219750 100644
--- a/srcpkgs/gnome-passwordsafe/template
+++ b/srcpkgs/gnome-passwordsafe/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-passwordsafe'
 pkgname=gnome-passwordsafe
-version=4.1
+version=5.0
 revision=1
 wrksrc="PasswordSafe-${version}"
 build_style=meson
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/PasswordSafe"
 distfiles="https://gitlab.gnome.org/World/PasswordSafe/-/archive/${version}/PasswordSafe-${version}.tar.bz2"
-checksum=597e5d3d722e81b0ef28cc30d9b70f9a88b42165680ab811499524f68260fa21
+checksum=ac80d9b49eba965870cfc57e989aa8ceeb82b95ac8b706342267d8039a94b983

From 83358205c9a8c78f1df9f684a2af25991a5cc22a Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Wed, 10 Feb 2021 12:26:01 +0000
Subject: [PATCH 1349/3482] python3-chromecast: update to 8.1.0.

---
 srcpkgs/python3-chromecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-chromecast/template b/srcpkgs/python3-chromecast/template
index 8e274036181b..14e67519a212 100644
--- a/srcpkgs/python3-chromecast/template
+++ b/srcpkgs/python3-chromecast/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-chromecast'
 pkgname=python3-chromecast
-version=8.0.0
+version=8.1.0
 revision=1
 wrksrc="pychromecast-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Ulf <void@uw.anonaddy.com>"
 license="MIT"
 homepage="https://github.com/home-assistant-libs/pychromecast"
 distfiles="https://github.com/home-assistant-libs/pychromecast/archive/${version}.tar.gz"
-checksum=b3bbb0e96ece7dbdb301434865c33360c38ccd013c32e5c2fa629e471e6891c5
+checksum=f11d73cffa84b25417192c30e6ea46df470b65055e229c568f677372c4ded1de
 
 post_install() {
 	vlicense LICENSE

From beb33734eead9afab4bea43f4105cfd19c1e67d5 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Wed, 10 Feb 2021 09:02:54 +0100
Subject: [PATCH 1350/3482] flowblade: update to 2.8.

---
 srcpkgs/flowblade/patches/usr-merge.patch | 13 -------------
 srcpkgs/flowblade/template                |  6 +++---
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/flowblade/patches/usr-merge.patch

diff --git a/srcpkgs/flowblade/patches/usr-merge.patch b/srcpkgs/flowblade/patches/usr-merge.patch
deleted file mode 100644
index 595d5574fa9e..000000000000
--- a/srcpkgs/flowblade/patches/usr-merge.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git flowblade-trunk/flowblade flowblade-trunk/flowblade
-index faeba629..9acad76e 100755
---- flowblade-trunk/flowblade
-+++ flowblade-trunk/flowblade
-@@ -34,7 +34,7 @@ print ("Launch script dir:", launch_dir)
- 
- # Update sys.path to include modules.
- # When running on distro.
--if launch_dir == "/usr/bin":
-+if os.path.realpath(launch_dir) == "/usr/bin":
-     print ("Running from installation...")
-     modules_path = "/usr/share/flowblade/Flowblade"
-     if not os.path.isdir(modules_path):
diff --git a/srcpkgs/flowblade/template b/srcpkgs/flowblade/template
index 1bcf9e8ced2b..74a7820aee8d 100644
--- a/srcpkgs/flowblade/template
+++ b/srcpkgs/flowblade/template
@@ -1,10 +1,10 @@
 # Template file for 'flowblade'
 pkgname=flowblade
-version=2.6.3
+version=2.8
 revision=1
 build_wrksrc=flowblade-trunk
 build_style=python3-module
-make_install_args="--install-lib=${DESTDIR}/usr/share/pyshared"
+make_install_args="--install-lib=${DESTDIR}/usr/share/flowblade"
 hostmakedepends="python3-setuptools"
 # https://github.com/jliljebl/flowblade/blob/master/flowblade-trunk/docs/DEPENDENCIES.md
 depends="frei0r-plugins gmic mlt-python3 python3-Pillow python3-dbus gtk+3
@@ -14,4 +14,4 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://jliljebl.github.io/flowblade/"
 distfiles="https://github.com/jliljebl/flowblade/archive/v${version}.tar.gz"
-checksum=e36d9f3c341e87bc5e6810f7d16304f3c4cb4161557e5da455f74eda59f52e1b
+checksum=0a06d31ed148087b49dadcce775b395cd89586e05d306834d02f219c450b8125

From 332fa5f9198274bb49b627af624e0963b238ab8d Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 16:57:00 +0100
Subject: [PATCH 1351/3482] diffstat: update to 1.64.

---
 srcpkgs/diffstat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/diffstat/template b/srcpkgs/diffstat/template
index 1b83218eeae8..f30b6c58ae30 100644
--- a/srcpkgs/diffstat/template
+++ b/srcpkgs/diffstat/template
@@ -1,14 +1,14 @@
 # Template file for 'diffstat'
 pkgname=diffstat
-version=1.63
-revision=2
+version=1.64
+revision=1
 build_style=gnu-configure
 short_desc="Display a histogram of diff output"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://invisible-island.net/diffstat/diffstat.html"
 distfiles="https://invisible-mirror.net/archives/diffstat/diffstat-${version}.tgz"
-checksum=7eddd53401b99b90bac3f7ebf23dd583d7d99c6106e67a4f1161b7a20110dc6f
+checksum=b8aee38d9d2e1d05926e6b55810a9d2c2dd407f24d6a267387563a4436e3f7fc
 
 post_install() {
 	vlicense COPYING

From f88a7ad2bf0cc553ae428e66c59962ae7b69b73c Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 17:31:02 +0100
Subject: [PATCH 1352/3482] lldpd: update to 1.0.8.

---
 srcpkgs/lldpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index ab623014425a..78e59947166f 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,6 +1,6 @@
 # Template file for 'lldpd'
 pkgname=lldpd
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 configure_args="--with-privsep-chroot=/var/empty"
@@ -11,7 +11,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="ISC"
 homepage="https://vincentbernat.github.io/lldpd/index.html"
 distfiles="https://media.luffy.cx/files/lldpd/${pkgname}-${version}.tar.gz"
-checksum=1df79179d489c841b49265f2ab5ff05f284a647e95862d2f3c02b3fb079a87e1
+checksum=98d200e76e30f6262c4a4493148c1840827898329146a57a34f8f0f928ca3def
 
 system_groups="_lldpd"
 system_accounts="_lldpd"

From 762a9ffde8b2d19e6096bac7dc867710141df012 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Wed, 10 Feb 2021 13:02:02 -0300
Subject: [PATCH 1353/3482] rust-analyzer: update to 2021.02.08.

---
 srcpkgs/rust-analyzer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index 716c1040d22d..ff19c777d36d 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-analyzer'
 pkgname=rust-analyzer
-version=2021.02.01
+version=2021.02.08
 revision=1
 _ver=${version//./-}
 wrksrc="${pkgname}-${_ver}"
@@ -11,7 +11,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="Apache-2.0, MIT"
 homepage="https://rust-analyzer.github.io/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${_ver}.tar.gz"
-checksum=8e977cff0d64bed30c5f1f7945889e3fa76e6e55bfed882d1b4a5d2ffd9efc2c
+checksum=f69633a368ecadba107ac38e041de29e37c1237ba742fe4a58c05dca69143cf5
 
 export RUST_ANALYZER_REV=${_ver}
 

From edb7c0fa630c1f8e0208864d5807bb8cc9107265 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 9 Feb 2021 23:42:48 -0800
Subject: [PATCH 1354/3482] acmetool: fix project homepage

---
 srcpkgs/acmetool/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/acmetool/template b/srcpkgs/acmetool/template
index e9e3993b7fc7..99da6d6c780e 100644
--- a/srcpkgs/acmetool/template
+++ b/srcpkgs/acmetool/template
@@ -1,7 +1,7 @@
 # Template file for 'acmetool'
 pkgname=acmetool
 version=0.2.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/hlandau/acme
 go_package="github.com/hlandau/acme/cmd/acmetool"
@@ -9,8 +9,8 @@ hostmakedepends="git"
 makedepends="libcap-devel"
 short_desc="Tool to acquire certificates from ACME servers (such as Let's Encrypt)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="RILTS-based"
-homepage="https://hlandau.github.io/acme/"
+license="MIT"
+homepage="https://hlandau.github.io/acmetool/"
 distfiles="https://github.com/hlandau/acme/archive/v${version}.tar.gz
  https://raw.githubusercontent.com/hlandau/rilts/master/licences/COPYING.MIT>COPYING"
 checksum="54acffe7381696ecdc829f65810897075d17c5600c077f431eda5e5244189a74

From 334438d306881d256d899e95c410ac1001e7eb1d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 10 Feb 2021 10:34:35 +0100
Subject: [PATCH 1355/3482] unbound: update to 1.13.1.

---
 srcpkgs/unbound/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 3972828eae8b..69ee650fbf3c 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,6 +1,6 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.0
+version=1.13.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://unbound.net/"
 distfiles="https://unbound.net/downloads/${pkgname}-${version}.tar.gz"
-checksum=a954043a95b0326ca4037e50dace1f3a207a0a19e9a4a22f4c6718fc623db2a1
+checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
 system_accounts="_unbound"
 
 post_install() {

From e53107bd813d944144c12d1f9b1994df895cd20d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 10 Feb 2021 18:00:01 +0100
Subject: [PATCH 1356/3482] linux5.10: update to 5.10.15.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index d0998f35eb69..395f2e230649 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.14
+version=5.10.15
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=fa27b79f198b5be969e497ed5461860df48e0591c85e60699fc8be26837a1d2a
+checksum=d85287bcf1d51c4d0a32380ac0a5b2b487b321058a6923617f1613fbd10e6e01
 python_version=3
 patch_args="-Np1"
 

From b0a7aced0adb04f8097473683b2f3e531697386a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 10 Feb 2021 19:47:11 +0200
Subject: [PATCH 1357/3482] notcurses: update to 2.2.1.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0b7259fe3b4a..88ac59ef455b 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.2.0
+version=2.2.1
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=5002106938ce9f371790162f2d8acc7d43d76b3a565eb1c3e7f1c205c3d1b664
+checksum=e32fcf7344d2ff8afa81ea5c6a065eb476ff27e2b9edf0eeea714b028d2faebd
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From 0d335646395048e287e475592f07937f2d8faa54 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 9 Feb 2021 21:59:03 +0100
Subject: [PATCH 1358/3482] rclone: fix builtin version string

Also:
- enable tests
- use official site for distfiles
---
 srcpkgs/rclone/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 93295ccbd5cc..3c793deb6d10 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,17 +1,17 @@
 # Template file for 'rclone'
 pkgname=rclone
 version=1.54.0
-revision=1
+revision=2
 wrksrc="rclone-v${version}"
 build_style=go
 go_import_path=github.com/rclone/rclone
-go_ldflags="-extldflags=-fuse-ld=bfd"
+go_ldflags="-extldflags=-fuse-ld=bfd -X github.com/rclone/rclone/fs.Version=v${version}"
 short_desc="Rsync for cloud storage"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://rclone.org/"
 changelog="https://raw.githubusercontent.com/rclone/rclone/master/docs/content/changelog.md"
-distfiles="https://github.com/rclone/rclone/releases/download/v${version}/rclone-v${version}.tar.gz"
+distfiles="https://downloads.rclone.org/v${version}/rclone-v${version}.tar.gz"
 checksum=95f952dc059b842bd40338458b77657f7b5a1680c4ca837a3adcf83b63c8fda1
 
 pre_build() {
@@ -23,6 +23,10 @@ pre_build() {
 	fi
 }
 
+do_check() {
+	RCLONE_CONFIG="/notfound" go test ./...
+}
+
 post_install() {
 	vlicense COPYING
 	vman rclone.1

From b1dd80506fc3565196a911906f55393030f282f6 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Wed, 10 Feb 2021 18:17:21 +0530
Subject: [PATCH 1359/3482] winetricks: update to 20210206.

---
 srcpkgs/winetricks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/winetricks/template b/srcpkgs/winetricks/template
index c6610df85c25..f74e856d5d25 100644
--- a/srcpkgs/winetricks/template
+++ b/srcpkgs/winetricks/template
@@ -1,6 +1,6 @@
 # Template file for 'winetricks'
 pkgname=winetricks
-version=20201206
+version=20210206
 revision=1
 build_style=gnu-makefile
 depends="cabextract unzip xmessage" # actually it depends on wine
@@ -9,7 +9,7 @@ maintainer="mater11234 <mater11234@riseup.net>"
 license="LGPL-3.0-or-later"
 homepage="http://wiki.winehq.org/winetricks"
 distfiles="https://github.com/Winetricks/winetricks/archive/$version.tar.gz"
-checksum=2eb5c09e30be942383e242694e654aa294ed2a396e68c68b5eaa17427bd8242b
+checksum=705421798b28696f577104ebdf03b068b9343ab096754150f47a6ec06fa8ae65
 
 do_check() {
 	# Needs python3-bashate

From 39629c348eb9495ccd792bcd628bdd8fd29cf843 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 8 Feb 2021 18:35:43 -0600
Subject: [PATCH 1360/3482] protontricks: update to 1.4.4.

---
 srcpkgs/protontricks/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 306a6c7e2d67..16e9838fa7cb 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,7 +1,7 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.4.3
-revision=2
+version=1.4.4
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-vdf winetricks"
@@ -10,4 +10,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ef65f18a2934d56d510ee03ea9031623db72ab9a22c760a97d5176bdb89e7922
+checksum=0f7d2f8138eee4df336823ec2d2c5d935a04718aafa88cccf244684f88428c65

From 2aaa8da3dc4c0f66e4c0b96a9093ba507ea9ec90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 14:16:02 -0300
Subject: [PATCH 1361/3482] subversion: update to 1.14.1.

Fixes CVE-2020-17525.
---
 srcpkgs/subversion/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index b6ef87417d10..e10c80ec8b18 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -3,8 +3,8 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/subversion-kwallet-auth".
 #
 pkgname=subversion
-version=1.14.0
-revision=3
+version=1.14.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-javahl --disable-static --config-cache
  --with-gnome-keyring --with-editor=vi --disable-mod-activation
@@ -21,7 +21,7 @@ license="Apache-2.0, BSD-3-Clause"
 homepage="http://subversion.apache.org/"
 changelog="https://subversion.apache.org/docs/release-notes/${version%.*}.html"
 distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2"
-checksum=6ba8e218f9f97a83a799e58a3c6da1221d034b18d9d8cbbcb6ec52ab11722102
+checksum=2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9
 
 pre_configure() {
 	# Based on native build values

From b4cfe73e0a8b1880d08ecbbc08148ed87ca4f05d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 14:16:25 -0300
Subject: [PATCH 1362/3482] subversion-kwallet-auth: update to 1.14.1.

---
 srcpkgs/subversion-kwallet-auth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template
index 4b868b57e052..12210f250d51 100644
--- a/srcpkgs/subversion-kwallet-auth/template
+++ b/srcpkgs/subversion-kwallet-auth/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/subversion".
 #
 pkgname=subversion-kwallet-auth
-version=1.14.0
+version=1.14.1
 revision=1
 wrksrc="subversion-${version}"
 build_style=gnu-configure
@@ -22,7 +22,7 @@ license="Apache-2.0, BSD-3-Clause"
 homepage="http://subversion.apache.org/"
 changelog="https://subversion.apache.org/docs/release-notes/${version%.*}.html"
 distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2"
-checksum=6ba8e218f9f97a83a799e58a3c6da1221d034b18d9d8cbbcb6ec52ab11722102
+checksum=2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9
 lib32disabled=yes
 
 pre_configure() {

From 7f77ed3550edd9a648c0516e43aafccf2084cb54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 4 Feb 2021 23:00:59 +0100
Subject: [PATCH 1363/3482] perl: fix provides version

For purpose of version sorting, xbps interprets every number following
an underscore as revision, see mkcomponent in dewey.c.
Rewrite version with dot, so perl's float semantic is retained.
---
 srcpkgs/perl/files/update-perl-provides.pl |  2 ++
 srcpkgs/perl/template                      | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/perl/files/update-perl-provides.pl b/srcpkgs/perl/files/update-perl-provides.pl
index 614e476c6832..cc3acb398da5 100644
--- a/srcpkgs/perl/files/update-perl-provides.pl
+++ b/srcpkgs/perl/files/update-perl-provides.pl
@@ -166,6 +166,8 @@ sub pkgspec
     #print STDOUT "2 dist $dist\n";
     $ver =~ tr/././s; # only one period at a time
     $ver =~ s/\A[.]|[.]\z//g; # shouldn't start or stop with a period
+    $ver =~ s/(\d)_(\d)/$1.$2/g; # retain 1.12 < 1.12_01 < 1.13 order in xbps ...
+    $ver =~ s/^([0-9.]+);/'$1';/; # ... then turn broken numeric literal into string
     $ver = eval $ver;
     my $rev = "_1";
     my $res = "perl-$dist-$ver" . $rev;
diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index b1e985c3f257..29da654b2f30 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -1,7 +1,7 @@
 # Template file for 'perl'
 pkgname=perl
 version=5.32.1
-revision=1
+revision=2
 _perl_cross_version=1.3.5
 build_style=gnu-configure
 hostmakedepends="less"
@@ -32,11 +32,11 @@ provides="perl-Archive-Tar-2.36_1
  perl-Compress-Raw-Zlib-2.093_1
  perl-Config-Perl-V-0.32_1
  perl-DB_File-1.853_1
- perl-Data-Dumper-2.174_01_1
+ perl-Data-Dumper-2.174.01_1
  perl-Devel-PPPort-3.57_1
  perl-Devel-SelfStubber-1.06_1
- perl-Digest-1.17_01_1
- perl-Digest-MD5-2.55_01_1
+ perl-Digest-1.17.01_1
+ perl-Digest-MD5-2.55.01_1
  perl-Digest-SHA-6.02_1
  perl-Dumpvalue-1.21_1
  perl-Encode-3.06_1
@@ -66,19 +66,19 @@ provides="perl-Archive-Tar-2.36_1
  perl-IPC-SysV-2.07_1
  perl-JSON-PP-4.04_1
  perl-Locale-Maketext-1.29_1
- perl-Locale-Maketext-Simple-0.21_01_1
+ perl-Locale-Maketext-Simple-0.21.01_1
  perl-MIME-Base64-3.15_1
  perl-Math-BigInt-1.999818_1
  perl-Math-BigInt-FastCalc-0.5009_1
  perl-Math-BigRat-0.2614_1
- perl-Math-Complex-1.5901_1
- perl-Memoize-1.03_01_1
+ perl-Math-Complex-1.59.01_1
+ perl-Memoize-1.03.01_1
  perl-Module-CoreList-5.20210123_1
  perl-Module-Load-0.34_1
  perl-Module-Load-Conditional-0.70_1
  perl-Module-Loaded-0.08_1
  perl-Module-Metadata-1.000037_1
- perl-NEXT-0.67_01_1
+ perl-NEXT-0.67.01_1
  perl-Net-Ping-2.72_1
  perl-Params-Check-0.38_1
  perl-PathTools-3.78_1
@@ -89,7 +89,7 @@ provides="perl-Archive-Tar-2.36_1
  perl-Pod-Perldoc-3.2801_1
  perl-Pod-Simple-3.40_1
  perl-Pod-Usage-1.69_1
- perl-Safe-2.41_01_1
+ perl-Safe-2.41.01_1
  perl-Scalar-List-Utils-1.55_1
  perl-Search-Dict-1.07_1
  perl-SelfLoader-1.26_1
@@ -117,7 +117,7 @@ provides="perl-Archive-Tar-2.36_1
  perl-Unicode-Collate-1.27_1
  perl-Unicode-Normalize-1.27_1
  perl-Win32-0.53_1
- perl-Win32API-File-0.1203_01_1
+ perl-Win32API-File-0.1203.01_1
  perl-XSLoader-0.30_1
  perl-autodie-2.32_1
  perl-autouse-1.11_1

From f24905319d5b7c7daa43e9174d33941830ad1e74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:36:09 +0100
Subject: [PATCH 1364/3482] Remove package: mysql

---
 common/shlibs                                 |   4 +-
 srcpkgs/libmysqlclient                        |   1 -
 srcpkgs/libmysqlclient-devel                  |   1 -
 srcpkgs/mysql-client                          |   1 -
 srcpkgs/mysql/INSTALL                         |   9 --
 srcpkgs/mysql/files/my.cnf                    | 145 ------------------
 srcpkgs/mysql/files/mysqld/log/run            |   2 -
 srcpkgs/mysql/files/mysqld/run                |   4 -
 .../mysql/patches/gcc7-compare-pointer.patch  |  12 --
 srcpkgs/mysql/patches/musl.patch              |  13 --
 srcpkgs/mysql/template                        | 131 ----------------
 srcpkgs/mysql/update                          |   2 -
 12 files changed, 2 insertions(+), 323 deletions(-)
 delete mode 120000 srcpkgs/libmysqlclient
 delete mode 120000 srcpkgs/libmysqlclient-devel
 delete mode 120000 srcpkgs/mysql-client
 delete mode 100644 srcpkgs/mysql/INSTALL
 delete mode 100644 srcpkgs/mysql/files/my.cnf
 delete mode 100755 srcpkgs/mysql/files/mysqld/log/run
 delete mode 100755 srcpkgs/mysql/files/mysqld/run
 delete mode 100644 srcpkgs/mysql/patches/gcc7-compare-pointer.patch
 delete mode 100644 srcpkgs/mysql/patches/musl.patch
 delete mode 100644 srcpkgs/mysql/template
 delete mode 100644 srcpkgs/mysql/update

diff --git a/common/shlibs b/common/shlibs
index ebaf844a55c4..149e9bb59f85 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -558,8 +558,8 @@ libecpg.so.6 postgresql-libs-8.4.2_1
 libpgtypes.so.3 postgresql-libs-8.4.2_1
 libpq.so.5 postgresql-libs-8.4.2_1
 libmypaint-1.5.so.1 libmypaint-1.5.1_1
-libmysqlclient_r.so.18 libmysqlclient-5.5.27_1
-libmysqlclient.so.18 libmysqlclient-5.5.27_1
+libmysqlclient_r.so.18 libmariadbclient-10.1.47_1
+libmysqlclient.so.18 libmariadbclient-10.1.47_1
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
diff --git a/srcpkgs/libmysqlclient b/srcpkgs/libmysqlclient
deleted file mode 120000
index 0d46ca321428..000000000000
--- a/srcpkgs/libmysqlclient
+++ /dev/null
@@ -1 +0,0 @@
-mysql
\ No newline at end of file
diff --git a/srcpkgs/libmysqlclient-devel b/srcpkgs/libmysqlclient-devel
deleted file mode 120000
index 0d46ca321428..000000000000
--- a/srcpkgs/libmysqlclient-devel
+++ /dev/null
@@ -1 +0,0 @@
-mysql
\ No newline at end of file
diff --git a/srcpkgs/mysql-client b/srcpkgs/mysql-client
deleted file mode 120000
index 0d46ca321428..000000000000
--- a/srcpkgs/mysql-client
+++ /dev/null
@@ -1 +0,0 @@
-mysql
\ No newline at end of file
diff --git a/srcpkgs/mysql/INSTALL b/srcpkgs/mysql/INSTALL
deleted file mode 100644
index 4ce513cca4ae..000000000000
--- a/srcpkgs/mysql/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --keep-my-cnf --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mysql/files/my.cnf b/srcpkgs/mysql/files/my.cnf
deleted file mode 100644
index 3870208583f3..000000000000
--- a/srcpkgs/mysql/files/my.cnf
+++ /dev/null
@@ -1,145 +0,0 @@
-# MySQL config file for medium systems.
-#
-# This is for a system with little memory (32M - 64M) where MySQL plays
-# an important part, or systems up to 128M where MySQL is used together with
-# other programs (such as a web server)
-#
-# MySQL programs look for option files in a set of
-# locations which depend on the deployment platform.
-# You can copy this option file to one of those
-# locations. For information about these locations, see:
-# http://dev.mysql.com/doc/mysql/en/option-files.html
-#
-# In this file, you can use all long options that a program supports.
-# If you want to know which options a program supports, run the program
-# with the "--help" option.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password	= your_password
-port		= 3306
-socket		= /run/mysqld/mysqld.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-port		= 3306
-socket		= /run/mysqld/mysqld.sock
-datadir		= /var/lib/mysql
-skip-external-locking
-key_buffer_size = 16M
-max_allowed_packet = 1M
-table_open_cache = 64
-sort_buffer_size = 512K
-net_buffer_length = 8K
-read_buffer_size = 256K
-read_rnd_buffer_size = 512K
-myisam_sort_buffer_size = 8M
-
-# Don't listen on a TCP/IP port at all. This can be a security enhancement,
-# if all processes that need to connect to mysqld run on the same host.
-# All interaction with mysqld must be made via Unix sockets or named pipes.
-# Note that using this option without enabling named pipes on Windows
-# (via the "enable-named-pipe" option) will render mysqld useless!
-# 
-skip-networking
-
-# Replication Master Server (default)
-# binary logging is required for replication
-log-bin=mysql-bin
-
-# binary logging format - mixed recommended
-binlog_format=mixed
-
-# required unique id between 1 and 2^32 - 1
-# defaults to 1 if master-host is not set
-# but will not function as a master if omitted
-server-id	= 1
-
-# Replication Slave (comment out master section to use this)
-#
-# To configure this host as a replication slave, you can choose between
-# two methods :
-#
-# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
-#    the syntax is:
-#
-#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
-#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
-#
-#    where you replace <host>, <user>, <password> by quoted strings and
-#    <port> by the master's port number (3306 by default).
-#
-#    Example:
-#
-#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
-#    MASTER_USER='joe', MASTER_PASSWORD='secret';
-#
-# OR
-#
-# 2) Set the variables below. However, in case you choose this method, then
-#    start replication for the first time (even unsuccessfully, for example
-#    if you mistyped the password in master-password and the slave fails to
-#    connect), the slave will create a master.info file, and any later
-#    change in this file to the variables' values below will be ignored and
-#    overridden by the content of the master.info file, unless you shutdown
-#    the slave server, delete master.info and restart the slaver server.
-#    For that reason, you may want to leave the lines below untouched
-#    (commented) and instead use CHANGE MASTER TO (see above)
-#
-# required unique id between 2 and 2^32 - 1
-# (and different from the master)
-# defaults to 2 if master-host is set
-# but will not function as a slave if omitted
-#server-id       = 2
-#
-# The replication master for this slave - required
-#master-host     =   <hostname>
-#
-# The username the slave will use for authentication when connecting
-# to the master - required
-#master-user     =   <username>
-#
-# The password the slave will authenticate with when connecting to
-# the master - required
-#master-password =   <password>
-#
-# The port the master is listening on.
-# optional - defaults to 3306
-#master-port     =  <port>
-#
-# binary logging - not required for slaves, but recommended
-#log-bin=mysql-bin
-
-# Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = /var/lib/mysql
-#innodb_data_file_path = ibdata1:10M:autoextend
-#innodb_log_group_home_dir = /var/lib/mysql
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 16M
-#innodb_additional_mem_pool_size = 2M
-# Set .._log_file_size to 25 % of buffer pool size
-#innodb_log_file_size = 5M
-#innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-#innodb_lock_wait_timeout = 50
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[myisamchk]
-key_buffer_size = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/srcpkgs/mysql/files/mysqld/log/run b/srcpkgs/mysql/files/mysqld/log/run
deleted file mode 100755
index b36c4dafa403..000000000000
--- a/srcpkgs/mysql/files/mysqld/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.notice
diff --git a/srcpkgs/mysql/files/mysqld/run b/srcpkgs/mysql/files/mysqld/run
deleted file mode 100755
index bc16a07883ed..000000000000
--- a/srcpkgs/mysql/files/mysqld/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ ! -d /run/mysqld ] && mkdir -p /run/mysqld
-chown mysql:mysql /run/mysqld
-exec chpst -u mysql:mysql mysqld --user=mysql 2>&1
diff --git a/srcpkgs/mysql/patches/gcc7-compare-pointer.patch b/srcpkgs/mysql/patches/gcc7-compare-pointer.patch
deleted file mode 100644
index 0b01a6ea719e..000000000000
--- a/srcpkgs/mysql/patches/gcc7-compare-pointer.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- sql-common/client_authentication.cc	2016-03-03 16:35:33.000000000 +0100
-+++ sql-common/client_authentication.cc	2017-05-09 16:14:10.298254686 +0200
-@@ -83,8 +83,7 @@
-   FILE *pub_key_file= NULL;
- 
-   if (mysql->options.extension != NULL &&
--      mysql->options.extension->server_public_key_path != NULL &&
--      mysql->options.extension->server_public_key_path != '\0')
-+      mysql->options.extension->server_public_key_path != NULL)
-   {
-     pub_key_file= fopen(mysql->options.extension->server_public_key_path,
-                         "r");
diff --git a/srcpkgs/mysql/patches/musl.patch b/srcpkgs/mysql/patches/musl.patch
deleted file mode 100644
index f22b7c903831..000000000000
--- a/srcpkgs/mysql/patches/musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-musl only support NPTL, so that remove that old stuff.
-
---- mysys/stacktrace.c.orig	2015-05-08 18:43:01.661343605 +0200
-+++ mysys/stacktrace.c	2015-05-08 18:43:13.669331612 +0200
-@@ -355,7 +355,7 @@ void my_print_stacktrace(uchar* stack_bo
- #endif  /* __alpha__ */
- 
-   /* We are 1 frame above signal frame with NPTL and 2 frames above with LT */
--  sigreturn_frame_count = thd_lib_detected == THD_LIB_LT ? 2 : 1;
-+  sigreturn_frame_count = 2;
- 
-   while (fp < (uchar**) stack_bottom)
-   {
diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template
deleted file mode 100644
index 9cf9de53b7f4..000000000000
--- a/srcpkgs/mysql/template
+++ /dev/null
@@ -1,131 +0,0 @@
-# Template file for 'mysql'
-pkgname=mysql
-version=5.6.43
-revision=4
-build_style=cmake
-configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_SSL=system -DWITH_LIBWRAP=OFF
- -DWITH_EXTRA_CHARSETS=complex -DWITH_EMBEDDED_SERVER=ON
- -DWITH_INNOBASE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1
- -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DSTACK_DIRECTION=1 -DHAVE_LLVM_LIBCPP_EXITCODE=0"
-hostmakedepends="perl bison ncurses-devel"
-makedepends="zlib-devel libressl-devel readline-devel"
-depends="mysql-client"
-conf_files="/etc/mysql/my.cnf"
-short_desc="World's most popular open source database"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only"
-homepage="https://www.mysql.com/products/community/"
-distfiles="http://dev.mysql.com/get/Downloads/MySQL-${version%.*}/mysql-${version}.tar.gz"
-checksum=1c95800bf0e1b7a19a37d37fbc5023af85c6bc0b41532433b3a886263a1673ef
-system_accounts="mysql"
-mysql_homedir="/var/lib/mysql"
-lib32disabled=yes
-
-CFLAGS="-D__STDC_ISO_10646__"
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DHAVE_LLVM_LIBCPP_EXITCODE=1"
-	configure_args+=" -DHAVE_LLVM_LIBCPP_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
-pre_configure() {
-	# libressl major detection.
-	sed -i '/OPENSSL_MAJOR_VERSION/s/1/2/' cmake/ssl.cmake
-	sed -i 's/sys\/poll\.h/poll.h/' include/my_net.h
-
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= cmake .
-		make comp_err comp_sql gen_lex_hash gen_lex_token
-		mkdir -p bin.host/{extra,scripts,sql}
-		cp extra/comp_err bin.host/extra
-		cp scripts/comp_sql bin.host/scripts
-		cp sql/gen_lex_hash bin.host/sql
-		cp sql/gen_lex_token bin.host/sql
-		make clean
-		# Remove the rules for the host binaries to not
-		# have them overwritten with target binaries
-		rm CMakeCache.txt
-		vsed -i ${wrksrc}/scripts/CMakeLists.txt \
-			-e "/ADD_EXECUTABLE(comp_sql/d"
-		vsed -i ${wrksrc}/sql/CMakeLists.txt \
-			-e "/ADD_EXECUTABLE(gen_lex_hash/d" \
-			-e "/ADD_EXECUTABLE(gen_lex_token/d" \
-			-e "/ADD_DEPENDENCIES(gen_lex_token/d"
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p ${wrksrc}/build
-		cp -a ${wrksrc}/bin.host/* ${wrksrc}/build
-		mkdir -p ${wrksrc}/build/libmysqld
-		cp ${wrksrc}/bin.host/sql/gen_lex_token ${wrksrc}/build/libmysqld
-		export PATH=${PATH}:${wrksrc}/build/extra:${wrksrc}/build/scripts:${wrksrc}/build/sql
-	fi
-}
-
-post_install() {
-	# Remove unneeded stuff.
-	rm -rf ${DESTDIR}/usr/{sql-bench,mysql-test,data}
-	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
-
-	# Configuration file.
-	vinstall ${FILESDIR}/my.cnf 640 etc/mysql
-
-	# runit service
-	vsv mysqld
-}
-
-libmysqlclient_package() {
-	short_desc+=" - client library"
-	pkg_install() {
-		vmove "usr/lib/libmysqlclient*.so.*"
-	}
-}
-
-libmysqlclient-devel_package() {
-	depends="libmysqlclient>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/mysql_config
-		vmove usr/share/man/man1/mysql_config.1
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
-
-mysql-client_package() {
-	depends="perl"
-	short_desc+=" - database client binaries"
-	pkg_install() {
-		for f in innochecksum innotop myisam_ftdump mysql mysql_client_test \
-			mysql_client_test_embedded mysqldumpslow mysqlbinlog \
-			mysql_find_rows mysql_fix_extensions mysql_waitpid mysqlaccess \
-			mysqladmin mysqlanalyze mysqlbug mysqlcheck mysqldump \
-			mysqlimport mysqloptimize mysqlrepair mysqlreport mysqlshow \
-			mysqlslap mysqltest_embedded mysqlmanager mysqltest \
-			mysqlhotcopy mysql_upgrade mysql_zap; do
-			if [ -f ${DESTDIR}/usr/bin/${f} ]; then
-				vmove usr/bin/${f}
-			elif [ -f ${DESTDIR}/usr/sbin/${f} ]; then
-				vmove usr/sbin/${f}
-			fi
-			if [ -f ${DESTDIR}/usr/share/man/man1/${f}.1 ]; then
-				vmove usr/share/man/man1/${f}.1
-			elif [ -f ${DESTDIR}/usr/share/man/man8/${f}.8 ]; then
-				vmove usr/share/man/man8/${f}.8
-			fi
-		done
-	}
-}
diff --git a/srcpkgs/mysql/update b/srcpkgs/mysql/update
deleted file mode 100644
index da80797cf4a5..000000000000
--- a/srcpkgs/mysql/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site='http://dev.mysql.com/downloads/mysql/'
-pattern='MySQL Community Server \K[\d.]+'

From 9cbd51f02fd44ff74e64aa9213771ca63bd37433 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:37:41 +0100
Subject: [PATCH 1365/3482] ampache: depend on mariadb instead of mysql

---
 srcpkgs/ampache/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ampache/template b/srcpkgs/ampache/template
index f7f50a256aaa..b54f63865063 100644
--- a/srcpkgs/ampache/template
+++ b/srcpkgs/ampache/template
@@ -4,7 +4,7 @@ version=4.2.3
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
-depends="php mysql"
+depends="php mariadb"
 short_desc="Web-based tool for managing your audio/video files"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="AGPL-3.0-or-later"

From 462773c8dd4821fd3643c9e0e7dc1c1c060c7a49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:39:12 +0100
Subject: [PATCH 1366/3482] collectd: build against mariadbclient instead of
 mysql

---
 srcpkgs/collectd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 993f60e0b55b..531f2e3a72f9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -13,7 +13,7 @@ conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
 makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
- libgcrypt-devel libmysqlclient-devel libltdl-devel libvirt-devel
+ libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)
  $(vopt_if prometheus 'protobuf-c-devel libmicrohttpd-devel')"
 short_desc="Daemon which collects system performance statistics periodically"

From 5ab2311037d5da26a6ab07f259dd495ace1658ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:40:01 +0100
Subject: [PATCH 1367/3482] apr-util: build against mariadbclient instead of
 mysql

---
 srcpkgs/apr-util/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index e78d1ee27141..db439b515e45 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -11,7 +11,7 @@ configure_args="
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
 makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
- gdbm-devel libldap-devel libmysqlclient-devel unixodbc-devel
+ gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 89dd8d85237c194ebd2cf4909ed51b1e0d88e882 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:42:14 +0100
Subject: [PATCH 1368/3482] cyrus-sasl: build against mariadbclient instead of
 mysql

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 5ee15f8355bb..48221b0789f2 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
 hostmakedepends="automake libtool groff pkg-config"
 makedepends="libsasl-devel libressl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
- libmysqlclient-devel"
+ libmariadbclient-devel"
 depends="libsasl>=${version}"
 short_desc="Cyrus SASL - auth daemon and administration tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7251d107ff3e9bd13d60b73434e2f060c4f86ae9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:43:03 +0100
Subject: [PATCH 1369/3482] dovecot: build against mariadbclient instead of
 mysql

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index b3e60a746142..815ef8f25467 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -11,7 +11,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
 makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
- mit-krb5-devel libmysqlclient-devel postgresql-libs-devel sqlite-devel
+ mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"
 short_desc="IMAP and POP3 server written with security primarily in mind"

From a2209614d86ae6e7029d1343dc93f244ed27163c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:43:46 +0100
Subject: [PATCH 1370/3482] icinga2: build against mariadbclient instead of
 mysql

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 5d6579992876..20fe23ad04dd 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=3
+revision=4
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmysqlclient-devel libedit-devel
+makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 819d68f3e59cd89ce1002b2e9a1347f7f0d01e87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:44:41 +0100
Subject: [PATCH 1371/3482] kexi: build against mariadbclient instead of mysql

---
 srcpkgs/kexi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kexi/template b/srcpkgs/kexi/template
index e6818b5ce0f6..28d4a358ac65 100644
--- a/srcpkgs/kexi/template
+++ b/srcpkgs/kexi/template
@@ -1,11 +1,11 @@
 # Template file for 'kexi'
 pkgname=kexi
 version=3.2.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kdoctools doxygen pkg-config"
 makedepends="ktexteditor-devel kdb-devel kreport-devel qt5-webkit-devel
- breeze-icons postgresql-libs-devel libmysqlclient-devel marble5-devel"
+ breeze-icons postgresql-libs-devel libmariadbclient-devel marble5-devel"
 depends="breeze-icons"
 short_desc="Visual database applications creator"
 maintainer="John <me@johnnynator.dev>"

From 26934369e7d6fc12603491b33682cc747f5fac29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:45:21 +0100
Subject: [PATCH 1372/3482] kmail: depend on mariadb instead of mysql

---
 srcpkgs/kmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index 34a961b535b1..2a58ccc08f84 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -8,7 +8,7 @@ hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
-depends="kdepim-runtime kmail-account-wizard mysql akonadi-import-wizard
+depends="kdepim-runtime kmail-account-wizard mariadb akonadi-import-wizard
  pim-data-exporter"
 short_desc="KDE Mail Client"
 maintainer="John <me@johnnynator.dev>"

From 5ce2ef4e75672e1a1973505d57bb2d7d19ea709c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:46:04 +0100
Subject: [PATCH 1373/3482] kodi-rpi: build against mariadbclient instead of
 mysql

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index 3d1cc29102dd..d69ef928f5bd 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -20,12 +20,12 @@ archs="armv6l* armv7l*"
 
 hostmakedepends="
  automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmysqlclient-devel
+ gettext-devel libltdl-devel python-devel libmariadbclient-devel
  SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
 makedepends="
  libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmysqlclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
+ libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
  faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel

From 348df288e29a4cc9ee198d16dc730ccd3b2e4c9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:47:15 +0100
Subject: [PATCH 1374/3482] kodi: build against mariadbclient instead of mysql

---
 srcpkgs/kodi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index e40e41eb06e5..f82aa3325753 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ hostmakedepends="
 makedepends="
  eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
- libmysqlclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
+ libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
  jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
@@ -45,7 +45,7 @@ depends+=" glxinfo hicolor-icon-theme desktop-file-utils xdpyinfo"
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*)
-		hostmakedepends+=" libmysqlclient-devel SDL2_image-devel lzo-devel"
+		hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
 		makedepends+=" python-devel ffmpeg-devel"
 		configure_args+=" -DENABLE_VAAPI=OFF"
 		;;

From 620d4dd02857ba207640c96b6e14935163093457 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:48:51 +0100
Subject: [PATCH 1375/3482] libgda: build against mariadbclient instead of
 mysql

---
 srcpkgs/libgda/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index f6af39ac9150..d5f301edcaac 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
@@ -10,7 +10,7 @@ hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recod
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
  libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
- json-glib-devel readline-devel libmysqlclient-devel"
+ json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"
 short_desc="Database and data abstraction layer"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cc1410326f51c51cc3e45604c1b518e88003b4dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:50:22 +0100
Subject: [PATCH 1376/3482] lua54-luadbi: build against mariadbclient instead
 of mysql

---
 srcpkgs/lua54-luadbi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index 36c0f8925018..b1c4bb6070bc 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
- postgresql-libs-devel libmysqlclient-devel"
+ postgresql-libs-devel libmariadbclient-devel"
 _desc="Lua database interface library"
 short_desc="${_desc} (5.4.x)"
 maintainer="John Regan <john@jrjrtech.com>"

From abb2ba2479f3fd3f16ca111860dd461e28a6a47d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:51:42 +0100
Subject: [PATCH 1377/3482] mysql++: build against mariadbclient instead of
 mysql

---
 srcpkgs/mysql++/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index ddd35bf816df..4f0a3619ad02 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
@@ -17,7 +17,7 @@ if [ -n "$CROSS_BUILD" ]; then
 fi
 
 mysql++-devel_package() {
-	depends="mysql++>=${version}_${revision} libmysqlclient-devel"
+	depends="mysql++>=${version}_${revision} libmariadbclient-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmkdir usr/include/mysql++

From cfc010dc6ed7b8b936c23132cb7082acad5a0c91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:52:57 +0100
Subject: [PATCH 1378/3482] opensmtpd-extras: build against mariadbclient
 instead of mysql

---
 srcpkgs/opensmtpd-extras/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index c20c3842830f..164eaf6dfc52 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,14 +1,14 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=1
+revision=2
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
 makedepends="libressl-devel libevent-devel postgresql-libs-devel
- libmysqlclient-devel sqlite-devel"
+ libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 4ddaf44aa3fd1ba4b1d65e54a432247c42315f07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:53:42 +0100
Subject: [PATCH 1379/3482] perl-DBD-mysql: build against mariadbclient instead
 of mysql

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index d49129716c62..a647f5bd13ce 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=5
+revision=6
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmysqlclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 08515f262a46ba3330d6c6dc3bce3611d5a2f1de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:54:06 +0100
Subject: [PATCH 1380/3482] php: build against mariadbclient instead of mysql

---
 srcpkgs/php/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 5dcb53d2c6eb..3b0789d35605 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,10 +1,10 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=1
+revision=2
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
- gmp-devel libcurl-devel libjpeg-turbo-devel libmysqlclient-devel
+ gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
  libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
  postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
  libffi-devel oniguruma-devel gd-devel"

From e67da838704e2e1a5917313a5e94f3a32bebfd0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:54:29 +0100
Subject: [PATCH 1381/3482] postfix: build against mariadbclient instead of
 mysql

---
 srcpkgs/postfix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 5722fe15adb7..6ea99b0c26c1 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,9 +1,9 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=1
+revision=2
 hostmakedepends="perl m4"
-makedepends="icu-devel libldap-devel libmysqlclient-devel pcre-devel
+makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="High-performance mail transport agent"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"

From 48649eff3800ec9f22a604b1332542b39d05e0ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:55:11 +0100
Subject: [PATCH 1382/3482] qt5: build against mariadbclient instead of mysql

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index ea494f4b129b..90d9c9be83ff 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -9,7 +9,7 @@ hostmakedepends="cmake clang flex perl glib-devel pkg-config
 makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
- libinput-devel libmng-devel libmysqlclient-devel libproxy-devel
+ libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel libressl-devel

From 6c9fc69a4bdf096bf93dc2ca7043e06b09d8bd18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:56:01 +0100
Subject: [PATCH 1383/3482] rsyslog: build against mariadbclient instead of
 mysql

---
 srcpkgs/rsyslog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 07caecb9fefb..3b1b62e164b8 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
@@ -11,7 +11,7 @@ configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-testbench"
 hostmakedepends="pkg-config postgresql-libs-devel"
 makedepends="gnutls-devel libcurl-devel libestr-devel libfastjson-devel
- liblogging-devel libmysqlclient-devel mit-krb5-devel postgresql-libs-devel"
+ liblogging-devel libmariadbclient-devel mit-krb5-devel postgresql-libs-devel"
 short_desc="Enhanced multi-threaded syslog daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, Apache-2.0"

From 6847a767e82920fdec580a0da125eb45001f1b68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:56:39 +0100
Subject: [PATCH 1384/3482] slurm-wlm: build against mariadbclient instead of
 mysql

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index d5b5880370d8..4d19c3ff5270 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -9,7 +9,7 @@ configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
 makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
- ncurses-devel readline-devel libmysqlclient-devel json-c-devel libhwloc-devel
+ ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 827a9714fad1b52cd874fb27a87b0cd72532805b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:57:06 +0100
Subject: [PATCH 1385/3482] zabbix: build against mariadbclient instead of
 mysql

---
 srcpkgs/zabbix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index cbc496342156..a284bc590d8c 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -8,8 +8,8 @@ configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --enable-proxy"
 hostmakedepends="automake libtool pkg-config which"
 makedepends="gnutls-devel libcurl-devel libxml2-devel libevent-devel
- libmysqlclient-devel net-snmp-devel pcre-devel"
-depends="fping mysql"
+ libmariadbclient-devel net-snmp-devel pcre-devel"
+depends="fping mariadb"
 short_desc="IT Infrastructure components availability and performance monitoring"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 6df11d8a9393ac6d879dc338c57dadfe8899f1ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:57:48 +0100
Subject: [PATCH 1386/3482] kea: update mysql buildoption to use mariadb

---
 srcpkgs/kea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 78ec7c0f9561..0a9c0b03ea23 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -10,7 +10,7 @@ hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
  $(vopt_if botan botan-devel libressl-devel)
- $(vopt_if mysql libmysqlclient-devel)
+ $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"
 checkdepends="procps-ng" #needs pgrep

From 402390185bfe9911ca188ac417008822a25c2dd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:59:05 +0100
Subject: [PATCH 1387/3482] monitoring-plugins: build against mariadbclient
 instead of mysql

---
 srcpkgs/monitoring-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index fef6c01ec22c..403fb939bda1 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,11 +1,11 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
-makedepends="libldap-devel libmysqlclient-devel postgresql-libs-devel
+makedepends="libldap-devel libmariadbclient-devel postgresql-libs-devel
  zlib-devel"
 depends="iputils procps-ng"
 #checkdepends="perl"

From 71c6edec4e93f815fc5747edcbe23b6e3ae35446 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:59:41 +0100
Subject: [PATCH 1388/3482] python3-mysqlclient: build against mariadbclient
 instead of mysql

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 12b06f20d658..efbda51472bf 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmysqlclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From db66ba7e4503aee58b87a159ccdb2ebb9f9d961d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 22:00:07 +0100
Subject: [PATCH 1389/3482] redland: build against mariadbclient instead of
 mysql

---
 srcpkgs/redland/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index f5c6ce862a67..44c897bd53e5 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
 hostmakedepends="pkg-config perl postgresql-libs-devel"
-makedepends="libltdl-devel db-devel rasqal-devel libmysqlclient-devel
+makedepends="libltdl-devel db-devel rasqal-devel libmariadbclient-devel
  postgresql-libs-devel sqlite-devel unixodbc-devel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="${_desc} - Utilities"

From 1de372a61e950f6604c277562f28812e1ab43b32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 22:00:33 +0100
Subject: [PATCH 1390/3482] thc-hydra: build against mariadbclient instead of
 mysql

---
 srcpkgs/thc-hydra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 36ca7e046e26..19a37248d13c 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
- postgresql-libs-devel libmysqlclient-devel libssh-devel"
+ postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 7803b652ed10f9d6b2c37553e847b3b669137f0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 22:26:24 +0100
Subject: [PATCH 1391/3482] mariadb: add mysql dummy packages

---
 srcpkgs/libmysqlclient       |  1 +
 srcpkgs/libmysqlclient-devel |  1 +
 srcpkgs/mariadb/template     | 28 ++++++++++++++++++++++++++--
 srcpkgs/mysql                |  1 +
 srcpkgs/mysql-client         |  1 +
 5 files changed, 30 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/libmysqlclient
 create mode 120000 srcpkgs/libmysqlclient-devel
 create mode 120000 srcpkgs/mysql
 create mode 120000 srcpkgs/mysql-client

diff --git a/srcpkgs/libmysqlclient b/srcpkgs/libmysqlclient
new file mode 120000
index 000000000000..45f92cdb7908
--- /dev/null
+++ b/srcpkgs/libmysqlclient
@@ -0,0 +1 @@
+mariadb
\ No newline at end of file
diff --git a/srcpkgs/libmysqlclient-devel b/srcpkgs/libmysqlclient-devel
new file mode 120000
index 000000000000..45f92cdb7908
--- /dev/null
+++ b/srcpkgs/libmysqlclient-devel
@@ -0,0 +1 @@
+mariadb
\ No newline at end of file
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 66d9038a2bc9..865627d21830 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.47
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -95,7 +95,7 @@ libmariadbclient_package() {
 	}
 }
 libmariadbclient-devel_package() {
-	depends="libmariadbclient>=${version}_${revision}"
+	depends="libmariadbclient>=${version}_${revision} libatomic-devel"
 	provides="libmysqlclient-devel-${version}_${revision}"
 	replaces="libmysqlclient-devel>=0"
 	short_desc+=" - client development files"
@@ -140,3 +140,27 @@ mytop_package() {
 		vmove usr/bin/mytop
 	}
 }
+
+libmysqlclient_package() {
+	build_style=meta
+	depends="libmariadbclient"
+	short_desc="MySQL - (transitional dummy package)"
+}
+
+libmysqlclient-devel_package() {
+	build_style=meta
+	depends="libmariadbclient-devel"
+	short_desc="MySQL - (transitional dummy package)"
+}
+
+mysql-client_package() {
+	build_style=meta
+	depends="mariadb"
+	short_desc="MySQL - (transitional dummy package)"
+}
+
+mysql_package() {
+	build_style=meta
+	depends="mariadb"
+	short_desc="MySQL - (transitional dummy package)"
+}
diff --git a/srcpkgs/mysql b/srcpkgs/mysql
new file mode 120000
index 000000000000..45f92cdb7908
--- /dev/null
+++ b/srcpkgs/mysql
@@ -0,0 +1 @@
+mariadb
\ No newline at end of file
diff --git a/srcpkgs/mysql-client b/srcpkgs/mysql-client
new file mode 120000
index 000000000000..45f92cdb7908
--- /dev/null
+++ b/srcpkgs/mysql-client
@@ -0,0 +1 @@
+mariadb
\ No newline at end of file

From e73b11762b9159e86b705e13b457ad019f145e53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 22:45:21 +0100
Subject: [PATCH 1392/3482] maridb: split mytop into it's own package

this is done to ensure, that there is no cyclic dep betwenn
mariadb and perl-DBD-mysql
---
 srcpkgs/mariadb/template |  8 +-------
 srcpkgs/mytop            |  1 -
 srcpkgs/mytop/template   | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 8 deletions(-)
 delete mode 120000 srcpkgs/mytop
 create mode 100644 srcpkgs/mytop/template

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 865627d21830..60c37cf5ef23 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -78,6 +78,7 @@ post_install() {
 	# Remove unneeded stuff.
 	rm -rf ${DESTDIR}/usr/{sql-bench,mysql-test,data}
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
+	rm -f ${DESTDIR}/usr/bin/mytop
 
 	# Configuration file.
 	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
@@ -133,13 +134,6 @@ mariadb-client_package() {
 		done
 	}
 }
-mytop_package() {
-	depends="${sourcepkg}>=${version}_${revision} perl-Term-ReadKey perl-DBD-mysql"
-	short_desc="Top-like query monitor for MariaDB"
-	pkg_install() {
-		vmove usr/bin/mytop
-	}
-}
 
 libmysqlclient_package() {
 	build_style=meta
diff --git a/srcpkgs/mytop b/srcpkgs/mytop
deleted file mode 120000
index 45f92cdb7908..000000000000
--- a/srcpkgs/mytop
+++ /dev/null
@@ -1 +0,0 @@
-mariadb
\ No newline at end of file
diff --git a/srcpkgs/mytop/template b/srcpkgs/mytop/template
new file mode 100644
index 000000000000..ee3cb21aeff9
--- /dev/null
+++ b/srcpkgs/mytop/template
@@ -0,0 +1,17 @@
+# Template file for 'mytop'
+pkgname=mytop
+version=10.1.47
+revision=3
+create_wrksrc=yes
+depends="mariadb perl-Term-ReadKey perl-DBD-mysql"
+short_desc="Top-like query monitor for MariaDB"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-2.0-or-later"
+homepage="https://mariadb.org/"
+distfiles="https://raw.githubusercontent.com/MariaDB/server/mariadb-${version}/scripts/mytop.sh"
+checksum=69c200bd7a03a454f2e314eb94396686e78d59aa8d089d8a0defef9287ec8950
+skip_extraction="mytop.sh"
+
+do_install() {
+	vbin ${XBPS_SRCDISTDIR}/${pkgname}-${version}/mytop.sh mytop
+}

From fcf198e57b18cf3483b8a705e6b125f2bdd3e7da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 21:33:22 +0100
Subject: [PATCH 1393/3482] mariadb: update to 10.1.48.

---
 srcpkgs/mariadb/INSTALL.msg |  3 +++
 srcpkgs/mariadb/template    | 14 +++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/mariadb/INSTALL.msg

diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
new file mode 100644
index 000000000000..32f7ba8b8b54
--- /dev/null
+++ b/srcpkgs/mariadb/INSTALL.msg
@@ -0,0 +1,3 @@
+If you come from a System that used the MySQL package,
+than restart your mysql service and upgrade your database
+wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 60c37cf5ef23..b55a0cd36a3e 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.47
-revision=3
+version=10.1.48
+revision=1
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -27,7 +27,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://mariadb.org/"
 distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=a4267487dbddf1dc1faed6e2a322c50a3e80d5d271cb487e8bdad6840e003227
+checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
@@ -66,12 +66,8 @@ pre_build() {
 		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
 	fi
 	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	case "$XBPS_TARGET_MACHINE" in
-	aarch64*) # Work around GCC bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81228
-		sed -i build/storage/mroonga/vendor/groonga/lib/CMakeFiles/libgroonga.dir/flags.make \
-			-e "s; -O3;;g"
-		;;
-	esac
+	# It seems that there is no dependency listed in cmake on them, but they are still needed
+	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
 }
 
 post_install() {

From e49ac481a8e05f6d0fb2bac08d9435d9f0252de2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 19:52:11 +0100
Subject: [PATCH 1394/3482] mytop: update to 10.1.48.

---
 srcpkgs/mytop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mytop/template b/srcpkgs/mytop/template
index ee3cb21aeff9..1137a834b511 100644
--- a/srcpkgs/mytop/template
+++ b/srcpkgs/mytop/template
@@ -1,7 +1,7 @@
 # Template file for 'mytop'
 pkgname=mytop
-version=10.1.47
-revision=3
+version=10.1.48
+revision=1
 create_wrksrc=yes
 depends="mariadb perl-Term-ReadKey perl-DBD-mysql"
 short_desc="Top-like query monitor for MariaDB"
@@ -9,7 +9,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://mariadb.org/"
 distfiles="https://raw.githubusercontent.com/MariaDB/server/mariadb-${version}/scripts/mytop.sh"
-checksum=69c200bd7a03a454f2e314eb94396686e78d59aa8d089d8a0defef9287ec8950
+checksum=e639a6113740fe10c3f3a609feb08a71344e0ed6f6a8364bc4f4f751746f6ee3
 skip_extraction="mytop.sh"
 
 do_install() {

From 5a85f481fc863f23303424daabd98c2bd82c3c19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 10 Feb 2021 23:51:02 +0100
Subject: [PATCH 1395/3482] mariadb: disable unittests when cross compiling

---
 srcpkgs/mariadb/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3e..5d65d2cd204f 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -36,6 +36,10 @@ system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
 CFLAGS="-w -fcommon"
 
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -DWITH_UNIT_TESTS=OFF"
+fi
+
 pre_configure() {
 	# We need some host binaries before starting cross compilation.
 	if [ "$CROSS_BUILD" ]; then

From dd594c260de088cea2c99699dd25c5e883bbd6dc Mon Sep 17 00:00:00 2001
From: martindamianfernanez <martin.damian.fernandez@gmail.com>
Date: Wed, 10 Feb 2021 01:43:51 -0300
Subject: [PATCH 1396/3482] squid: update to 4.14

Closes: #28616 [via git-merge-pr]
---
 srcpkgs/squid/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 4c41803df26f..319ac86c9aad 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
-version=4.12
-revision=2
+version=4.14
+revision=1
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin
@@ -65,7 +65,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.squid-cache.org/"
 #changelog="http://www.squid-cache.org/Versions/v3/3.5/changesets/"
 distfiles="http://www.squid-cache.org/Versions/v4/squid-${version}.tar.xz"
-checksum=f42a03c8b3dc020722c88bf1a87da8cb0c087b2f66b41d8256c77ee1b527e317
+checksum=f1097daa6434897c159bc100978b51347c0339041610845d0afa128151729ffc
 system_accounts="squid"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -73,6 +73,10 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	LDFLAGS+=" -latomic"
 fi
 
+do_check() {
+	: # squid-conf-tests requires a squid user in the system
+}
+
 post_install() {
 	chmod u+s \
 		${DESTDIR}/usr/libexec/squid/basic_ncsa_auth \

From 3688091a31d92903187c1e31ad110a3e3e2429cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 15:13:09 -0300
Subject: [PATCH 1397/3482] thunderbird: update to 78.7.1.

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index dc3e3a03dc24..7c2a6c3b4f32 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.7.0
+version=78.7.1
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=77b6da5cab9107cc1650f95be8593f6344bfe04d7e4395a28fde64a4fc301c08
+checksum=0ccc5a54fb2548489c9579f677cb4ff3c191b1d1fcf33bef6b1cf6eb704e385a
 
 lib32disabled=yes
 

From 7a9e7261d508578fe2cf78f9aeb392d541f8dd3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 15:13:32 -0300
Subject: [PATCH 1398/3482] thunderbird-i18n: update to 78.7.1.

---
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3439e2ece221..882f3eda8951 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.7.0
+version=78.7.1
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="dc139cb06a57b5fd523ca5a5841dbc46e058a88eee9c20d6bd5dfdd814fded42
- bc6483761476acb595e7d06453059b3efd3974a2cfdbc7cb7eafda2b581d0010
- 7df83d410595290a7c8d17e65429de7f7441068192b2e81aa00e34514a0a9d59
- 1abf91853869dc9dd45f7f52d4efe4450404398a4646105749f94e674c69c4c8
- 7c85abe833857a3d2d17f162ed0b5abf9098e78baa1f224fb65594986c61c47f
- 0dd8a465ce974fec5c0be168ecff82cfd2de207c4ec40673fe67b57409735fcc
- 2dfa481d8df8cf51e408c6198ff895e40f55b1a24d781f3a4f16f71b464069d8
- 8654a0e1417138bd5a09621cfd74d68415886fa3714bed1fd0aa7edff8650938
- 5cd2c6de1618d6a8be2a298731013da0bd8fca7601fd68f224c97e6820699ea6
- e8a20ca1d4048db62c26399b29ba4107ee96c112c6f47cf87721dbd46df61d06
- e6f835f1c5cdbe7f0c428b6f9b5b25eb8452b35300107dd17561f6acff5e665d
- c8c4c8411fc3f4b9e555baf3dc6bbac60d51d218f095151ed9e29baf749d36d1
- 3096dec5b02c82515764cdb9fda713dee85651b66a5bbff57ef32dcc812bcda3
- bb28056a70c0112bc67acf2d8cc2f0719336ad4223d409cbc1d19b0a721d18e4
- 1ec412d72bd8bd35b9fc417ecce15193955e78d93258ac1521b24fde5730221b
- c6ca0dec779a05b52343e44df445e379c45532ca83681205be596d17d37ec7ac
- f2a207215fff83daac000d90fd15d01475e92e2b21e74fada9796e61961b2f97
- 7fc6cc0140288d1cbb0fe3fc6946803320249a68cd240290c0e5a6db38fa570c
- c805abef39a262c61fdc394d41401b17f74b4c756abb67eb42ed5977cc66a5fe
- da6903f1d3c8c4cc3e9d999533b3ef1717a472bd990819a12b8562f029b0435e
- 4343d8dbc1c0f7c44ff293fef3e08014090a0bc60b3a0cab4b43922c3713a383
- efa4bdf912c581b84370cbc0b8da6ea452fbf5b77ad3a3a6e8aacd3dbd9edbaa
- 032010b9fb64344207a18e6500d6a416f76e89b5abad3c9c6c7b0d5ba42af2c5
- cad754a63527e81f8bca3497cd26747ed0199a9be8e5325b813d6a89a6c4ac2e
- 8a19a42f0637c00a0d0d47f1dae2732330f7561c231d02504ca831e915405cb6
- cec085d5c74781feab3a3e7e2d798529acb3daf83b457e643fdba67d140b6792
- 5d880d49e484c812c33f1e29f0eaefb5f8464115566c989421efe9adfd658293
- aebb685b45988439be1a24ed85fe0644bf7ec101a7dd5862c20466db284a42b5
- 9982d440c315995e4942e188413de7634706265947c19eb8c2fe9a21fcf2fc5d
- 8cead19b18afaf2a3846eab8b87e6b438a4fe0eac0520ffd288613a2e3f0b436
- 36aa8cd7bf8001b6fe4f2e309fccb96c8b509c98c76d04b433de6e7933c24109
- 7da7495366920a00b69083f3f0e3ae42c656f1125d812dfd491e3729de3efac1
- c36c1275fdcf8218364653858c62c31b6d6b35f32305a992000c96686e7b93a9
- c05086da1d19050d5af120f9b42c7cc7137500f86f8f0fa30091419e640262c9
- 5621d942d8aac2c1c434cacfbad4bb906408c822b94b29569d3ee824aca520db
- 74dec8ab24e01863a94a49e4870fa64a0dc7c499879da424fed14d5b5c5ceb66
- 327eea1f4db3f315e2e02011232d00738ced6bb70da0a654afa2bb650f43bd03
- 6ff122c21e17fdc2b5b9123a8238c279b9fe19290ea5a1492792f97be012de77
- 6099fa7ff2717057100a0214c75bdd06a754005dc66ae71c7c308dd57aa01b35
- 22525b2ac8292c2e66a3e5609a82ad4d6defaaa16acae85223ce54bab9ecbafa
- 49614bb2693f9ab0899fb411e41b90ef2abac8791a942c181b3b547ca1f9a6ef
- b074a72df48573d9bbfa9d48fcd034acc012312b527baf6fc515a2a2a00c6c39
- d715b12462732993d062366ba5742a8c5b8e7f191fc65acf6a70421f088b2ed0
- 4d2916db09c2ff79a795cb82a7f5e9445c57bfb9b29ba9adc7d258318f0dc621
- 3c760fd67702920bafe47e1747862a1baebcc8ec9fde2e4b8f2a919222e5aeb9
- fdddfd5236a43273c031c1ce84b78a9aba5b8a4edffca7ab4ca90ef56ac78797
- fd96e238020144f026391c4b602faa39b2bc52d8de499447a5daa0aef5307e88
- 2c391159d9006f0fd2b273c18c2892e910d82dfd31708b64746b27d3b755c458
- 5a9dbbd62a2d70629b1c06a211b026a59e78ab6bb72ec17aa4b043190e1e8b7e
- 6a983d0d8ac5bd808183d9ee8fce79e970eb84d59b24973a8890413435c6fd45
- 9487cfa39c8cdcd0f7d65ab87256eced5337f67dddd1800cb477219b3b13b845
- 5d751de257ca6f33d3f2dd8c11e794d5726eab35f8c7c686e09bb274aa3b5915
- 78a04fe243243ceaba73125582e06eda9f1c868724cc7eef10528a9c2eb507ac
- cc54c95770f1769d268026acd96d84a9828080ba07c0bb43b20c115bc829d23a
- e3620e77f10074832d5df21474f9bbc7814949b9bb4f941dd420ffe1bb447eda"
+checksum="04143b6e7aabec458a0445f916f6c869381b6c5fbed071f25e3e97bab6dd3101
+ ee270f5076fdcb35583c46728968d8a6a5aa8fc555e58a6ff241089c34f133e2
+ 193e6060e13a9fdadb5e104e4b375736fd8d0b5b2a43cad4518a60f8acca897c
+ d86a4bd374d27dfdc06410715dd4a3c00d080770471541e441f0fc6ce5270342
+ 0bf0111a0c2c6b218c4d2a205c2d674c6e60e0a3f383d01c84a58f5212ddb3a8
+ daef9af9d65a8b6690466cb524cdd6480aa7d996f6b33f2536576ed77af74ec8
+ 62afd441c3dc5137cf0a5e2e02014106c52b87f9d1fa54a07b5dc6a6d12a2277
+ 7940e58e6a40ee96cb0c600b3b669e14fa837010bb4b9bc06a4945022acce8b5
+ 0e802dbb234b78c74f0875a401ee4dfa35d93751e313bc19752d8efd5beabeda
+ ec268edbd0abd367b116cb76f107b9c60ed0561556cbfab5ae53d05b1070de32
+ 3e086ff89c29b21fdd483ccb9c0c2975c997a28faa9633fba78739509697c15a
+ 8cbf94bc2001134ea37c7d481c053a8b716fdfe4cace44d325a63093b7bc159f
+ cb54077d2d74a14a528abb328d34e32c3ffc7187edea79db9781549f59eb8a5a
+ aa31f2b8745105a868c553108ee2af77dd7eba4a22418a8b4720eea2d5e964db
+ 0ca6c87bffa699bbc5db3f6ce62579802fbe307480e8eade8b165642135cc24b
+ 3ba2bd7c7661d6c886a5a5e06e40a1e7c88905f01a842ddc593235a219235391
+ cd4939f4de55afffebce1f08cf229084331ab78b7d256b940e9cd1c7ea493159
+ 0c8a76f606181a92e85b2abdf4fd5ae02825fc72fddddbaa6d8554f181754192
+ 831aa733055c8cdbb5e5af49a87f677f1c556cdde07c42bad0224567bbfe2735
+ 8142b9262ea81be9b69dd70de1d14a7f5c12ab59424851e05fcdaa7b2fee3ce8
+ 2a4f5a97a3c7764be33fe4ec6edd50c65434902e99d1023c417b1c98952c6320
+ 916b5b48fb69e114e2a3a3c88071632433b290a918613e350b278ec811faf8f8
+ f82b2d14d08a9b19ae4752f54ca2ecd3d935482bd6d186baa12e879f750ef5ee
+ 7993eabae7ceb7d6dfaa49a102fa085328f7e83214b52d647eacf37fd2b65303
+ ada6b0361ab85083d1a9b7815d173539435078b990ced9984fb93a4ed93a4433
+ 250513b97849d17d4b76e76bb25c666215ace6b5627bd4d8ad70e6243287c9a3
+ 011b08c20ace6b82cf6cd53ca611330fbb5d143e3c4c57383170760b73ff4b80
+ 5a3e5f7c6c19763f7507205a66a92d95742834636a10d617c833752d788710ab
+ 90b76ceabbe07db0e50f97b548b8956b393741e731dd62a8d6cfe3756f7a63ce
+ 5d2787d666a7a572b297382af6c3650470c5d953b824ffe0c160e9ce9627e46a
+ 1a631e93e656ae26a884c72e157421c54f2e54adc9e8bfde55df752fb48948f6
+ 793ea99f4554496327b817f12ab507b64dc2415adbc904c92e4b6febf41297e5
+ 64435ed0bbdcf2e9be1a54fac34ac554bac7cfb156e20982c4f52926e1c10638
+ afd74f3e005b5fb4aa7773147f92b4421b6f7d4252baf2ebb3958af1cdca0ee5
+ 520842facadcf1cba1f985200b219e429c173d5353627ad3edfea7f35e3b9707
+ 7ff21142cb01ac7176971fb305d8d8ee6c05599ab346d9b983ae9a29ffa3a366
+ cb8c6a334ba75ad3af4bb2739ca851f751e07ce66699dd99cbb907bf0fa0a7a7
+ 0024eb0c44a8bb4658bbb03f3a9f43c14a90656b1f21eb315ef8b234886f3b2e
+ 82491932f939ffd115b961d7e3be64b7b30bb3caa2976b92bfe5430b1585dc97
+ dd5bb9532fdb405ec7a35d24e11cae772ceb8f20834d16880f24eced36487311
+ d32e1ba53de5c3e934bb788f05c6a951d7a4a1116435f3366dd0ac89db407d62
+ bd03a68e0c621aa731c0980269e0b3c6334ce4a25d8ea4781a0dc264158facb0
+ f73cca5f6bf22bbdd7783ad53e622c7ee0d92af0e8c26ef30979e9577f52495e
+ 107477bbd6d9e3078c8ee24f822a2c54eb59d48accca8764644e96790654f8ba
+ 5182c82f019aa373be8737c5feb050f00cb7357bdbac20d258b623a2dec8a705
+ 2aa7a2f40c5f7da8b7e29395880da5ba1fd1de8d1970e95731bb31de4ed8510f
+ 1320066d12f06152a9d124a8f4bd0c9d519a7c747c9e266d1de82f01257906e0
+ e2433692853051e6600eba44a85db0604ace74c3f29b847d9397bd06a7d5fdfc
+ e7a8a35dc5aececfc94e0a0f8ba61b9269346e9d7834c7ed67fc866155b752f5
+ 4a98ae85b396417d6f46b804de189a4a9ed42bc3385d851477c0a2a041494a39
+ b79be8b5dec9d79bdc304e6330a8930479386ebe1e8f8f01ca035f4d56a96af1
+ f79438440e880a093ba0c8e079c71bc4ca258e51d754d2dc2edf36c3f8301142
+ 05c6f6cd1393ee364aa9cf3b7425808ce3fc8b9dccc9c65a6951a52526c6f9d9
+ 6adc3850e7a1b8ee8c3a32562d0a61195fe70207b577226cca1847a5147aab92
+ 8308d6e40f50c7b2bb3894dd3251104b9a16c22bdc52440a48e99e9265a1d2e9"

From dd52acf65370839813fe76de50872e91bdb334ff Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Wed, 10 Feb 2021 15:43:19 -0700
Subject: [PATCH 1399/3482] gstreamer1: add checkdepends

---
 srcpkgs/gstreamer1/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index 629caa92e521..58a66eaf06b2 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -12,6 +12,7 @@ hostmakedepends="gettext pkg-config flex python3 docbook-xsl glib-devel
  libcap-progs"
 makedepends="libxml2-devel libglib-devel gtk+3-devel libcap-devel libunwind-devel
  bash-completion"
+checkdepends="gsl-devel gmp-devel valgrind-devel"
 short_desc="Core GStreamer libraries and elements (1.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"

From e73157e72e930d98dd256985d0f1bbc810d3830d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 11 Feb 2021 02:24:37 +0100
Subject: [PATCH 1400/3482] python3-pykeepass: fix on big endian

---
 srcpkgs/python3-pykeepass/patches/be.patch | 28 ++++++++++++++++++++++
 srcpkgs/python3-pykeepass/template         |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python3-pykeepass/patches/be.patch

diff --git a/srcpkgs/python3-pykeepass/patches/be.patch b/srcpkgs/python3-pykeepass/patches/be.patch
new file mode 100644
index 000000000000..5b6f819ad846
--- /dev/null
+++ b/srcpkgs/python3-pykeepass/patches/be.patch
@@ -0,0 +1,28 @@
+From fcabf9640d0426d01411681d7d1b74db6f3292e0 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Thu, 11 Feb 2021 02:14:36 +0100
+Subject: [PATCH] fix big endian support
+
+---
+ pykeepass/kdbx_parsing/pytwofish.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git pykeepass/kdbx_parsing/pytwofish.py pykeepass/kdbx_parsing/pytwofish.py
+index 7cea419..4749d72 100644
+--- pykeepass/kdbx_parsing/pytwofish.py
++++ pykeepass/kdbx_parsing/pytwofish.py
+@@ -140,8 +140,9 @@ import struct
+ import sys
+ 
+ WORD_BIGENDIAN = 0
+-if sys.byteorder == 'big':
+-    WORD_BIGENDIAN = 1
++# this actually breaks the implementation
++#if sys.byteorder == 'big':
++#    WORD_BIGENDIAN = 1
+ 
+ def rotr32(x, n):
+     return (x >> n) | ((x << (32 - n)) & 0xFFFFFFFF)
+-- 
+2.30.0
+
diff --git a/srcpkgs/python3-pykeepass/template b/srcpkgs/python3-pykeepass/template
index 9b706828ab59..dc3fe59fa411 100644
--- a/srcpkgs/python3-pykeepass/template
+++ b/srcpkgs/python3-pykeepass/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pykeepass'
 pkgname=python3-pykeepass
 version=3.2.1
-revision=1
+revision=2
 wrksrc="pykeepass-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 639e91f02816aa6d8ee3d9fe7b62b760edaffb90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 5 Feb 2021 22:31:53 +0700
Subject: [PATCH 1401/3482] wxWidgets-gtk3: remove cross reference

---
 srcpkgs/wxWidgets-gtk3/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wxWidgets-gtk3/template b/srcpkgs/wxWidgets-gtk3/template
index 7847442b4054..fe6dc777392b 100644
--- a/srcpkgs/wxWidgets-gtk3/template
+++ b/srcpkgs/wxWidgets-gtk3/template
@@ -1,7 +1,7 @@
 # Template file for 'wxWidgets-gtk3'
 pkgname=wxWidgets-gtk3
 version=3.0.5.1
-revision=4
+revision=5
 wrksrc="wxWidgets-${version}"
 build_style=gnu-configure
 configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl
@@ -28,17 +28,17 @@ post_install() {
 
 		sed -i -e "s/${XBPS_CROSS_TRIPLET}-//g" \
 			-e "s/-${XBPS_CROSS_TRIPLET}//g" \
+			-e "s,$XBPS_CROSS_BASE,,g" \
 			${DESTDIR}/usr/lib/wx/config/${_config}
 	fi
 	rm -f ${DESTDIR}/usr/bin/wx-config
 	ln -sf ../lib/wx/config/${_config} ${DESTDIR}/usr/bin/wx-config-gtk3
 	#   - ignore --host option; breaks configure scripts when
 	#     cross compiling (isn’t necessary in our case anyway)
-	vsed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
-		-e '/^bindir="\/usr/s,/usr,${exec_prefix},' \
+	sed -i -e 's,^bindir=.*,bindir=${exec_prefix}/bin,' \
 		-e 's/is_cross().*/is_cross() { false; }/g' \
 		-e '/--\*=\*)/i --host=\*) continue;;' \
-		-e "s/lib${XBPS_WORDSIZE}/lib/g" \
+		-e "s,/usr/lib,\${exec_prefix}/lib,g" \
 		$DESTDIR/usr/lib/wx/config/${_config}
 }
 

From c70b8a5d44fd381b05ca49f19ad0ef851af7d8f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 5 Feb 2021 22:23:17 +0700
Subject: [PATCH 1402/3482] wxWidgets: remove cross reference

---
 srcpkgs/wxWidgets/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template
index d02563fa6bde..c7e8f9f3a381 100644
--- a/srcpkgs/wxWidgets/template
+++ b/srcpkgs/wxWidgets/template
@@ -1,7 +1,7 @@
 # Template file for 'wxWidgets'
 pkgname=wxWidgets
 version=3.0.5.1
-revision=4
+revision=5
 configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack
  --with-libnotify --enable-mediactrl --with-gtk=2 --disable-webview"
 build_style=gnu-configure
@@ -41,14 +41,14 @@ post_install() {
 
 		sed -i -e "s/${XBPS_CROSS_TRIPLET}-//g" \
 			-e "s/-${XBPS_CROSS_TRIPLET}//g" \
+			-e "s,$XBPS_CROSS_BASE,,g" \
 			${DESTDIR}/usr/lib/wx/config/${_config}
 
 	fi
-	vsed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
-		-e '/^bindir="\/usr/s,/usr,${exec_prefix},' \
+	sed -i -e 's,^bindir=.*,bindir=${exec_prefix}/bin,' \
 		-e 's/is_cross()  { .* }/is_cross() { false; }/g' \
 		-e '/--\*=\*)/i --host=\*) continue;;' \
-		-e "s/lib${XBPS_WORDSIZE}/lib/g" \
+		-e "s,/usr/lib,\${exec_prefix}/lib,g" \
 		${DESTDIR}/usr/lib/wx/config/${_config}
 	ln -sf ../lib/wx/config/${_config} ${PKGDESTDIR}/usr/bin/wx-config-3.0
 	ln -sf wx-config-3.0 ${DESTDIR}/usr/bin/wx-config

From d8e206e5380dd66a3e1aacb814d502aae7dbf8fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 5 Feb 2021 22:56:27 +0700
Subject: [PATCH 1403/3482] CubicSDR: build with gtk3

---
 srcpkgs/CubicSDR/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template
index 2f8c589d9aef..ebeb68a305f0 100644
--- a/srcpkgs/CubicSDR/template
+++ b/srcpkgs/CubicSDR/template
@@ -1,11 +1,11 @@
 # Template file for 'CubicSDR'
 pkgname=CubicSDR
 version=0.2.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)
  $(vopt_bool pulseaudio USE_AUDIO_PULSE) $(vopt_bool jack USE_AUDIO_JACK)"
-makedepends="SoapySDR-devel wxWidgets-devel glu-devel liquid-dsp-devel hamlib-devel
+makedepends="SoapySDR-devel wxWidgets-gtk3-devel glu-devel liquid-dsp-devel hamlib-devel
  $(vopt_if alsa alsa-lib-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if jack jack-devel)"
 short_desc="Cross-Platform Software-Defined Radio (SDR) Application"
@@ -18,6 +18,12 @@ checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
 build_options="alsa pulseaudio jack"
 build_options_default="alsa pulseaudio"
 
+if [ "$CROSS_BUILD" ]; then
+	export WX_CONFIG=$XBPS_WRAPPERDIR/wx-config-gtk3
+else
+	export WX_CONFIG=wx-config-gtk3
+fi
+
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	configure_args+=" -DOTHER_LIBRARIES=atomic"

From 4e652be4410508cd02c65896bcd1b1e53801b84b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Feb 2021 18:50:56 +0700
Subject: [PATCH 1404/3482] build-helper/qmake: sync with qmake build-style

- create pseudo target for cross compile in order to not include host
  specific headers
- look for modules inside target
- ignore rpath
---
 common/build-helper/qmake.sh | 49 +++++++++++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 9 deletions(-)

diff --git a/common/build-helper/qmake.sh b/common/build-helper/qmake.sh
index 62581557aece..9603cf5baae9 100644
--- a/common/build-helper/qmake.sh
+++ b/common/build-helper/qmake.sh
@@ -5,6 +5,37 @@
 # respectively.
 
 if [ "$CROSS_BUILD" ]; then
+	mkdir -p "${XBPS_WRAPPERDIR}/target-spec/linux-g++"
+	cat > "${XBPS_WRAPPERDIR}/target-spec/linux-g++/qmake.conf" <<_EOF
+MAKEFILE_GENERATOR      = UNIX
+CONFIG                 += incremental no_qt_rpath
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(/usr/lib/qt5/mkspecs/common/linux.conf)
+include(/usr/lib/qt5/mkspecs/common/gcc-base-unix.conf)
+include(/usr/lib/qt5/mkspecs/common/g++-unix.conf)
+
+QMAKE_TARGET_CONFIG     = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qconfig.pri
+QMAKE_TARGET_MODULE     = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qmodule.pri
+QMAKEMODULES            = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/modules
+QMAKE_CC                = ${CC}
+QMAKE_CXX               = ${CXX}
+QMAKE_LINK              = ${CXX}
+QMAKE_LINK_C            = ${CC}
+QMAKE_LINK_SHLIB        = ${CXX}
+
+QMAKE_AR                = ${XBPS_CROSS_TRIPLET}-gcc-ar cqs
+QMAKE_OBJCOPY           = ${OBJCOPY}
+QMAKE_NM                = ${NM} -P
+QMAKE_STRIP             = ${STRIP}
+
+QMAKE_CFLAGS            = ${CFLAGS}
+QMAKE_CXXFLAGS          = ${CXXFLAGS}
+QMAKE_LFLAGS            = ${LDFLAGS}
+load(qt_config)
+_EOF
+	echo "#include \"${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/linux-g++/qplatformdefs.h\"" > "${XBPS_WRAPPERDIR}/target-spec/linux-g++/qplatformdefs.h"
+
 	cat > "${XBPS_WRAPPERDIR}/qt.conf" <<_EOF
 [Paths]
 Sysroot=${XBPS_CROSS_BASE}
@@ -28,7 +59,7 @@ HostData=/usr/lib/qt5
 HostBinaries=/usr/lib/qt5/bin
 HostLibraries=/usr/lib
 Spec=linux-g++
-TargetSpec=linux-g++
+TargetSpec=$XBPS_WRAPPERDIR/target-spec/linux-g++
 _EOF
 
 	# create the qmake-wrapper here because it only
@@ -36,13 +67,13 @@ _EOF
 	# and not to interfere with e.g. the qmake build-style
         cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
 #!/bin/sh
-exec /usr/lib/qt5/bin/qmake "\$@" \
-	QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
-	QMAKE_CFLAGS+="${CFLAGS}" QMAKE_CXXFLAGS+="${CXXFLAGS}" \
-	QMAKE_LFLAGS+="${LDFLAGS}" \
-	-qtconf "${XBPS_WRAPPERDIR}/qt.conf"
+exec /usr/lib/qt5/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf"
+_EOF
+else
+        cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/qt5/bin/qmake "\$@" CONFIG+=no_qt_rpath
 _EOF
-
-	chmod 755 ${XBPS_WRAPPERDIR}/qmake
-	cp -p ${XBPS_WRAPPERDIR}/qmake{,-qt5}
 fi
+chmod 755 ${XBPS_WRAPPERDIR}/qmake
+cp -p ${XBPS_WRAPPERDIR}/qmake{,-qt5}

From ed54ddc87e6012cf6702ce66656422726d6d6d48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Feb 2021 18:53:26 +0700
Subject: [PATCH 1405/3482] qjackctl: remove rpath

---
 srcpkgs/qjackctl/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template
index f47da62e887f..e4a482e63cc6 100644
--- a/srcpkgs/qjackctl/template
+++ b/srcpkgs/qjackctl/template
@@ -1,11 +1,12 @@
 # Template file for 'qjackctl'
 pkgname=qjackctl
 version=0.9.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
-configure_args="$(vopt_enable jack_session jack-session)"
-hostmakedepends="pkg-config"
+configure_args="$(vopt_enable jack_session jack-session)
+ ac_cv_path_ac_cv_qmake=${XBPS_WRAPPERDIR}/qmake"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="alsa-lib-devel qt5-devel jack-devel qt5-x11extras-devel"
 depends="desktop-file-utils hicolor-icon-theme jack"
 short_desc="JACK Audio Connection Kit - Qt GUI Interface"
@@ -18,8 +19,3 @@ checksum=5196c5c01b7948c1a8ca37cd3198a7f0fe095a99a34a67086abd3466855b4abd
 build_options="jack_session"
 build_options_default="jack_session"
 desc_option_jack_session="Enable support for the deprecated Jack Session API"
-
-if [ "${CROSS_BUILD}" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel qt5-x11extras-devel"
-	configure_args+=" ac_cv_path_ac_cv_qmake=${XBPS_WRAPPERDIR}/qmake"
-fi

From 4ca3b080a299e1641ffb99121ec7d058c4565709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Feb 2021 18:56:29 +0700
Subject: [PATCH 1406/3482] djview: remove rpath

---
 srcpkgs/djview/patches/sane-qmake-query.patch | 26 +++++++++++++++++++
 srcpkgs/djview/template                       |  8 ++----
 2 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/djview/patches/sane-qmake-query.patch

diff --git a/srcpkgs/djview/patches/sane-qmake-query.patch b/srcpkgs/djview/patches/sane-qmake-query.patch
new file mode 100644
index 000000000000..09df531f62d4
--- /dev/null
+++ b/srcpkgs/djview/patches/sane-qmake-query.patch
@@ -0,0 +1,26 @@
+Index: config/acinclude.m4
+===================================================================
+--- config/acinclude.m4.orig
++++ config/acinclude.m4
+@@ -302,19 +302,8 @@ Please define variable QMAKE and possibl
+ Defining QTDIR can help although it is deprecated.])
+   fi
+   mkdir conftest.d
+-  cat > conftest.d/conftest.pro <<\EOF
+-changequote(<<, >>)dnl
+-message(QMAKE_UIC="$$QMAKE_UIC")dnl qt4 only
+-message(QMAKE_MOC="$$QMAKE_MOC")dnl qt4 only
+-message(QT_VERSION="$$[QT_VERSION]")
+-message(QT_INSTALL_PREFIX="$$[QT_INSTALL_PREFIX]")
+-message(QT_INSTALL_DATA="$$[QT_INSTALL_DATA]")
+-message(QT_INSTALL_HEADERS="$$[QT_INSTALL_HEADERS]")
+-message(QT_INSTALL_BINS="$$[QT_INSTALL_BINS]")
+-changequote([, ])dnl
+-EOF
+-  if ( cd conftest.d && $QMAKE > conftest.out 2>&1 ) ; then
+-    sed -e 's/^.*: *//' < conftest.d/conftest.out > conftest.d/conftest.sh
++  if ( cd conftest.d && $QMAKE -query > conftest.out 2>/dev/null ) ; then
++    sed -e 's/:/=/' < conftest.d/conftest.out > conftest.d/conftest.sh
+     . conftest.d/conftest.sh
+     rm -rf conftest.d
+   else
diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template
index 136bcced9fbc..a6af3f0188d1 100644
--- a/srcpkgs/djview/template
+++ b/srcpkgs/djview/template
@@ -1,11 +1,11 @@
 # Template file for 'djview'
 pkgname=djview
 version=4.12
-revision=1
+revision=2
 wrksrc="djview4-${version}"
 build_style=gnu-configure
 build_helper=qmake
-configure_args="QMAKE=qmake-qt5"
+configure_args="QMAKE=qmake-qt5 ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
 hostmakedepends="automake pkg-config qt5-host-tools qt5-qmake libtool"
 makedepends="qt5-devel djvulibre-devel libxkbcommon-devel libSM-devel libXt-devel"
 short_desc="Portable DjVu viewer and browser plugin"
@@ -15,10 +15,6 @@ homepage="http://djvu.sourceforge.net/djview4.html"
 distfiles="${SOURCEFORGE_SITE}/djvu/${pkgname}-${version}.tar.gz"
 checksum=5673c6a8b7e195b91a1720b24091915b8145de34879db1158bc936b100eaf3e3
 
-if [ "${CROSS_BUILD}" ]; then
-	configure_args+=" ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
-fi
-
 post_extract() {
 	vsed -i -e '/Exec/s/djview4/djview/' \
 		-e '/StartupWMClass/s/Djview4/DjView/' \

From 51896b4ad4769cc1d0dc42f5e7b15f4ff6ece24b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 23:02:12 -0300
Subject: [PATCH 1407/3482] mpv: add --enable-cplugins so it can't be
 accidentally disabled.

At least mpv-mpris depends on this flag, since the mpv symbols it uses
are provided by /usr/bin/mpv, not by libmpv.
---
 srcpkgs/mpv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index 4a14dd2ca40b..f43662480cb3 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -5,7 +5,7 @@ revision=1
 build_style=waf3
 configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
  --enable-cdda --enable-dvbin --enable-dvdnav --enable-libarchive
- --enable-libmpv-shared $(vopt_enable alsa) $(vopt_enable caca)
+ --enable-libmpv-shared --enable-cplugins $(vopt_enable alsa) $(vopt_enable caca)
  $(vopt_enable jack) $(vopt_enable lcms lcms2) $(vopt_enable lua)
  $(vopt_enable openal) $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2)
  $(vopt_enable vapoursynth) $(vopt_enable vdpau) $(vopt_enable vulkan)

From c26a75635468cb20c6d6fafc7bb66095e9f58975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 23:04:52 -0300
Subject: [PATCH 1408/3482] mpv-mpris: vdoc README.md

It contains instructions for enabling the plugin.
---
 srcpkgs/mpv-mpris/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mpv-mpris/template b/srcpkgs/mpv-mpris/template
index 774c21c5965f..784b45db60c1 100644
--- a/srcpkgs/mpv-mpris/template
+++ b/srcpkgs/mpv-mpris/template
@@ -1,7 +1,7 @@
 # Template file for 'mpv-mpris'
 pkgname=mpv-mpris
 version=0.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_target=mpris.so
 hostmakedepends="pkg-config"
@@ -16,6 +16,7 @@ checksum=673aff031e7cc741edea68d7b4b0103d7b031d4a55755abb9e1be5dd4ec4e969
 
 do_install() {
 	vlicense LICENSE
+	vdoc README.md
 	vmkdir usr/lib/${pkgname}
 	vinstall mpris.so 0644 usr/lib/${pkgname}
 }

From dc708dfc8bc8641db7f17bf46e0bf650cfb09449 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 23:05:13 +0100
Subject: [PATCH 1409/3482] kexec-tools: update to 2.0.21.

---
 srcpkgs/kexec-tools/patches/i686.patch | 69 --------------------------
 srcpkgs/kexec-tools/template           |  4 +-
 2 files changed, 2 insertions(+), 71 deletions(-)
 delete mode 100644 srcpkgs/kexec-tools/patches/i686.patch

diff --git a/srcpkgs/kexec-tools/patches/i686.patch b/srcpkgs/kexec-tools/patches/i686.patch
deleted file mode 100644
index 5f96349eb886..000000000000
--- a/srcpkgs/kexec-tools/patches/i686.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 2c9f26ed20a791a7df0182ba82e93abb52f5a615 Mon Sep 17 00:00:00 2001
-From: Chris Packham <chris.packham@alliedtelesis.co.nz>
-Date: Mon, 18 Nov 2019 12:52:15 +1300
-Subject: kexec: build multiboot2 for i386
-
-This addresses the following compilation issues when building for i386.
-
- kexec/arch/i386/kexec-x86.c:39:22: error: 'multiboot2_x86_probe' undeclared here (not in a function); did you mean 'multiboot_x86_probe'?
-   { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load,
-                       ^~~~~~~~~~~~~~~~~~~~
-                       multiboot_x86_probe
- kexec/arch/i386/kexec-x86.c:39:44: error: 'multiboot2_x86_load' undeclared here (not in a function); did you mean 'multiboot_x86_load'?
-   { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load,
-                                             ^~~~~~~~~~~~~~~~~~~
-                                             multiboot_x86_load
- kexec/arch/i386/kexec-x86.c:40:4: error: 'multiboot2_x86_usage' undeclared here (not in a function); did you mean 'multiboot_x86_usage'?
-     multiboot2_x86_usage },
-     ^~~~~~~~~~~~~~~~~~~~
-     multiboot_x86_usage
- make: *** [Makefile:114: kexec/arch/i386/kexec-x86.o] Error 1
- make: *** Waiting for unfinished jobs....
-
-Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
-Signed-off-by: Simon Horman <horms@verge.net.au>
----
- https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/patch/?id=2c9f26ed20a791a7df0182ba82e93abb52f5a615
- kexec/arch/i386/Makefile    | 2 +-
- kexec/arch/i386/kexec-x86.h | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git kexec/arch/i386/Makefile kexec/arch/i386/Makefile
-index 105cefd..f486103 100644
---- kexec/arch/i386/Makefile
-+++ kexec/arch/i386/Makefile
-@@ -7,6 +7,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-x86.c
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-rel-x86.c
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-bzImage.c
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-multiboot-x86.c
-+i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c
- i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c
-@@ -14,7 +15,6 @@ i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c
- 
- dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS)			\
- 	kexec/arch/i386/crashdump-x86.h					\
--	kexec/arch/i386/kexec-mb2-x86.c					\
- 	kexec/arch/i386/kexec-x86.h					\
- 	kexec/arch/i386/x86-linux-setup.h				\
- 	kexec/arch/i386/include/arch/options.h
-diff --git kexec/arch/i386/kexec-x86.h kexec/arch/i386/kexec-x86.h
-index 1b58c3b..0f941df 100644
---- kexec/arch/i386/kexec-x86.h
-+++ kexec/arch/i386/kexec-x86.h
-@@ -60,6 +60,11 @@ int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len,
- 	struct kexec_info *info);
- void multiboot_x86_usage(void);
- 
-+int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
-+			struct kexec_info *info);
-+void multiboot2_x86_usage(void);
-+int multiboot2_x86_probe(const char *buf, off_t buf_len);
-+
- int elf_x86_probe(const char *buf, off_t len);
- int elf_x86_load(int argc, char **argv, const char *buf, off_t len,
- 	struct kexec_info *info);
--- 
-cgit 1.2.3-1.el7
-
diff --git a/srcpkgs/kexec-tools/template b/srcpkgs/kexec-tools/template
index 64f8df9ae63f..761e5c60a9fe 100644
--- a/srcpkgs/kexec-tools/template
+++ b/srcpkgs/kexec-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kexec-tools'
 pkgname=kexec-tools
-version=2.0.20
+version=2.0.21
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://kernel.org/pub/linux/utils/kernel/kexec/"
 distfiles="${KERNEL_SITE}/utils/kernel/kexec/${pkgname}-${version}.tar.xz"
-checksum=dad8077f0315445d1f6335579fc4ade222facf82a67124974c7be5303ba4f8c8
+checksum=e113142dee891638ad96e0f72cf9277b244477619470b30c41999d312e8e8702
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 CFLAGS="-fcommon"

From ee71adeaa4be0842ef17e99d0d5febed268792f3 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 5 Feb 2021 16:35:28 +0100
Subject: [PATCH 1410/3482] dlayer: update to 0.2.4.

---
 srcpkgs/dlayer/template | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 9b33ddc76579..e754ee8e6765 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,22 +1,16 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.1.0
+version=0.2.4
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
-hostmakedepends="git dep"
+hostmakedepends="git"
 short_desc="Dlayer is a docker layer analyzer"
 maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=f449e141792b721bf107886ae367daa2e453a3d955f529a1ce68f80d26aa6446
-
-pre_build() {
-	cd $GOSRCPATH
-	dep ensure
-	cd $wrksrc
-}
+checksum=3a31c0839ae92164fe77e1047c18b564c9eda9ffa4d17c87562abd50ff5ac147
 
 post_install() {
 	vlicense LICENSE

From 00dfb637c60528fa905232f0cfa9a7aa7d9252cb Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@ae-design.ws>
Date: Thu, 7 Jan 2021 09:03:10 +0100
Subject: [PATCH 1411/3482] nuspell: update to 4.2.0.

---
 common/shlibs            | 2 +-
 srcpkgs/nuspell/template | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 149e9bb59f85..c9d19402628a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3669,7 +3669,7 @@ libheif.so.1 libheif-1.4.0_1
 libuninameslist.so.1 libuninameslist-20190701_1
 libgambit.so.4 gambit-4.9.3_1
 liblog4cpp.so.5 log4cpp-1.1.3_1
-libnuspell.so.3 libnuspell-3.0.0_1
+libnuspell.so.4 libnuspell-4.2.0_1
 liblog4c.so.3 log4c-1.2.4_1
 libqb.so.100 libqb-2.0.0_1
 libusbguard.so.1 usbguard-1.0.0_1
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index d0042ab5629c..dd6f06a99117 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,18 +1,17 @@
 # Template file for 'nuspell'
 pkgname=nuspell
-version=3.1.2
+version=4.2.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-hostmakedepends="ruby-ronn"
-makedepends="boost-devel icu-devel"
+makedepends="icu-devel"
 checkdepends="catch2"
 short_desc="C++ spell checking library"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://nuspell.github.io/"
 distfiles="https://github.com/nuspell/nuspell/archive/v${version}.tar.gz"
-checksum=f59f8a27e97047f30659182f244daca8e05e052710c0ea5d845c2cb00f6c6eca
+checksum=01804d490bec517748ee49fa2f1249f4c99380c26335e32082cdaa02b5b2b4dc
 
 libnuspell_package() {
 	pkg_install() {
@@ -21,7 +20,7 @@ libnuspell_package() {
 }
 
 libnuspell-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 1d79784495195cff12559a53ff387f32e12a6dc8 Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@ae-design.ws>
Date: Thu, 7 Jan 2021 09:33:05 +0100
Subject: [PATCH 1412/3482] enchant2: update to 2.2.15

Also necessary for the nuspell soname bump.

Picks up comment from:
https://github.com/void-linux/void-packages/pull/27323
---
 srcpkgs/enchant2/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index de5b44fb8884..d3f9c9d1ad8f 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,20 +1,21 @@
 # Template file for 'enchant2'
 pkgname=enchant2
-version=2.2.13
+version=2.2.15
 revision=1
 wrksrc="enchant-${version}"
 build_style=gnu-configure
-make_build_args="pkgdatadir=/usr/share/enchant-2"
-make_install_args="$make_build_args"
+# tests need --enable-relocatable
+configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel icu-devel boost-devel"
+ libnuspell-devel"
+checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://abiword.github.io/enchant/"
 distfiles="https://github.com/AbiWord/enchant/releases/download/v${version}/enchant-${version}.tar.gz"
-checksum=eab9f90d79039133660029616e2a684644bd524be5dc43340d4cfc3fb3c68a20
+checksum=3b0f2215578115f28e2a6aa549b35128600394304bd79d6f28b0d3b3d6f46c03
 
 enchant2-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 517c1ab592d163957ed6c0167f11ff894d803444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 11 Feb 2021 00:29:01 -0300
Subject: [PATCH 1413/3482] lowdown: update to 0.8.1.

---
 srcpkgs/lowdown/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 3451c957cb1d..7baa4bf2de34 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.0
+version=0.8.1
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=39db499ad2d584ab0dd5be99ad2dfc5e584e0c710d449411bdb7f0ea2550fc2d
+checksum=e69b71b06bc26e538ba43b55134b931a7580b9bc8466b5f92408bbcd8354f394
 
 post_install() {
 	vlicense LICENSE.md

From 201b99a8bdff36ab75187c807447eab423ef7dfa Mon Sep 17 00:00:00 2001
From: Adrian Herath <adrianisuru@gmail.com>
Date: Mon, 8 Feb 2021 22:44:05 -0600
Subject: [PATCH 1414/3482] nvimpager: update to 0.9.

By ericonr:
- use lowdown instead of pandoc

Closes: #28603 [via git-merge-pr]
---
 srcpkgs/nvimpager/template | 44 ++++++++++++++------------------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/srcpkgs/nvimpager/template b/srcpkgs/nvimpager/template
index 5f3050e84a9b..7ca7054d857f 100644
--- a/srcpkgs/nvimpager/template
+++ b/srcpkgs/nvimpager/template
@@ -1,7 +1,7 @@
 # Template file for 'nvimpager'
 pkgname=nvimpager
-version=0.7
-revision=2
+version=0.9
+revision=1
 # In pre_build, date is the date of the last commit in the nvimpager repo.
 # It should be changed when updating to a new version.
 create_wrksrc=true
@@ -9,42 +9,30 @@ build_wrksrc="${pkgname}-${version}"
 build_style=gnu-makefile
 make_build_target="nvimpager.configured"
 make_build_args="PREFIX=/usr"
-hostmakedepends="neovim $(vopt_if man pandoc)"
-depends="neovim>=0.3.0 bash"
+hostmakedepends="neovim lowdown"
+depends="neovim>=0.4.0 bash"
 short_desc="Wrapper to use neovim as a pager to view manpages, diffs, etc"
 maintainer="Adrian Herath <adrianisuru@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/lucc/nvimpager"
-distfiles="${homepage}/archive/v${version}.tar.gz
- https://www.vim.org/scripts/download_script.php?src_id=14498>AnsiEsc.vba.gz"
-checksum="cb4eee0ef2569412b0528eacd7efd6af960bebc11d8749258d8ba83c975ebf4b
- a80d8c95a2e497e190831f1b580205653c595c6f51b48d4cb89fb33eaea5ed03"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum="ae2d99d59bd43d96e12a07ffa32c3f120636163308c2b6c1da43052bc8bce1a0"
 
-build_options="man"
-desc_option_man="Use pandoc for manpages"
+post_patch() {
+	# replace pandoc with lowdown
+	vsed -e \
+		"s/pandoc .*/lowdown -Tman -m 'date: 2020-12-13' -m 'source: Version v${version}' -s -o nvimpager.1 $</" \
+		-i makefile
 
-case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
-esac
+	# remove YAML borders, not supported by lowdown
+	vsed -e '/^---/d' -e '/^\.\.\./d' -i nvimpager.md
+}
 
 pre_build() {
-	cat <<< \
-"---
-footer: Version v${version}
-date: 2020-09-25
-..." \
-	> metadata.yml
-
-	mv ../AnsiEsc.vba ./
-
-	if [ -z "$build_option_man" ]; then
-		vsed -i 's,pandoc --.*,touch $@,' makefile
-	fi
+	# avoid running the rule to generate this file
+	touch metadata.yaml
 }
 
 post_install() {
 	vlicense LICENSE
-	if [ -z "$build_option_man" ]; then
-		rm -rf ${DESTDIR}/usr/share/man
-	fi
 }

From 73673d5d0b89eee57ccaf531c46c322bc7390d9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 15:10:08 -0300
Subject: [PATCH 1415/3482] openvswitch: update to 2.14.2.

Fixes CVE-2020-35498.
---
 srcpkgs/openvswitch/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index 0231037bb4fb..65f816ea9a2d 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,6 +1,6 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
-version=2.14.0
+version=2.14.2
 revision=1
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
@@ -14,11 +14,18 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="Apache-2.0"
 homepage="http://openvswitch.org/"
 distfiles="http://openvswitch.org/releases/${pkgname}-${version}.tar.gz"
-checksum=4171e52a8c0ffe160c1daa6687219d902a2a6969b296d223d8dac980ab99a260
+checksum=65f420f954e250d895fb2db22a132e1cb560bc5e2b9051e834511348108e597a
 python_version=3
 _completiondir="/usr/share/bash-completion/completions"
 make_install_args+=" completiondir=${_completiondir}"
 
+do_check() {
+	if [ "$XBPS_CHECK_PKGS" = full ]; then
+		# test can hang in containers
+		make check ${makejobs}
+	fi
+}
+
 post_install() {
 	for cmd in ovs-appctl ovs-vsctl; do
 		chmod 0644 ${DESTDIR}${_completiondir}/$cmd-bashcomp.bash

From afecc8daae857c0713e94b0a76c720bf2d681a8c Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 19:52:59 +0100
Subject: [PATCH 1416/3482] util-linux-libs: update to 2.36.1.

---
 srcpkgs/util-linux-libs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/util-linux-libs/template b/srcpkgs/util-linux-libs/template
index 53d166ba1e28..4be19d8ccf57 100644
--- a/srcpkgs/util-linux-libs/template
+++ b/srcpkgs/util-linux-libs/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux-libs'
 # Keep this package sync with util-linux
 pkgname=util-linux-libs
-version=2.36
+version=2.36.1
 revision=1
 wrksrc="util-linux-$version"
 build_style=meta
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.${version#*.*.}}/util-linux-${version}.tar.xz"
-checksum=9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1
+checksum=09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed
 
 pre_configure() {
 	local _cfgdir="$XBPS_COMMONDIR/environment/configure"

From 8308fb1417608244f39da2f6affd6c0e7e43f647 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 19:53:08 +0100
Subject: [PATCH 1417/3482] util-linux: update to 2.36.1.

---
 srcpkgs/util-linux/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 2d1f0759537a..c0687d70b466 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux'
 # Keep this package sync with util-linux-libs
 pkgname=util-linux
-version=2.36
+version=2.36.1
 revision=1
 hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
 makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
-checksum=9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1
+checksum=09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed
 
 # Create uuidd system account for uuidd.
 system_accounts="_uuidd"

From 1384e928f725746b2bc4a3e9811f9a2bd48a9f0b Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Mon, 8 Feb 2021 14:17:24 +0100
Subject: [PATCH 1418/3482] xbps-src: create $XBPS_MASTERDIR/tmp in
 chroot_prepare

Missing $XBPS_MASTERDIR/tmp caused ca-certificates and glibc-locales to
fail in the reconfigure step of binary-bootstrap, since a call to mktemp
(which I couldn't locate in source though) assumed /tmp in the chroot
would be present already.

This issue was reproducible reliably for me on NixOS by doing something
like:

    rm -rf masterdir
    ./xbps-src binary-bootstrap

The workaround I found was:

    mkdir -p masterdir/tmp      # or alternatively ./xbps-src clean
                                # which also (re-)creates masterdir/tmp
    ./xbps-src binary-bootstrap

This workaround is now mirrored in chroot_prepare by ensuring that tmp
always exists.
---
 common/xbps-src/shutils/chroot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 2fc17f2ab54d..c7ada3151618 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -119,7 +119,7 @@ chroot_prepare() {
         msg_warn "No local timezone configuration file created.\n"
     fi
 
-    for f in dev sys proc host boot; do
+    for f in dev sys tmp proc host boot; do
         [ ! -d $XBPS_MASTERDIR/$f ] && mkdir -p $XBPS_MASTERDIR/$f
     done
 

From aa1d34d57be2f20468a7a7e1e7809fdb55c0cb36 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 7 Feb 2021 12:51:52 +0100
Subject: [PATCH 1419/3482] pick: update to 4.0.0.

By ericonr:
- remove -fcommon

Closes: #28564 [via git-merge-pr]
---
 srcpkgs/pick/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pick/template b/srcpkgs/pick/template
index fb6a4eacfe2f..bccf20825e74 100644
--- a/srcpkgs/pick/template
+++ b/srcpkgs/pick/template
@@ -1,6 +1,6 @@
 # Template file for 'pick'
 pkgname=pick
-version=3.0.1
+version=4.0.0
 revision=1
 build_style=configure
 make_check_target=test
@@ -12,9 +12,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://github.com/calleerlandsson/pick/"
 distfiles="https://github.com/calleerlandsson/pick/archive/v${version}.tar.gz"
-checksum=32afb40581af84b884fb0786f7c8a9169cecbc2122a00b4835f8610a0e94c00d
-
-CFLAGS="-fcommon"
+checksum=c62b1372b8c21d64c6da5a687abf3b56ee314fae5b67c1f08b5550ea5f87fdac
 
 pre_configure() {
 	export PREFIX=/usr MANDIR=/usr/share/man

From 69c67cf7043fe7a88cd4b0d6ee51ca9aafd1a750 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Mon, 1 Feb 2021 10:37:49 +0000
Subject: [PATCH 1420/3482] yaz: update to 5.30.3.

By ericonr:
- add changelog
- use LIBS instead of LDFLAGS

Closes: #28378 [via git-merge-pr]
---
 srcpkgs/yaz/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 85f207fa4b60..50e3929b5862 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
-version=5.29.0
-revision=2
+version=5.30.3
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
@@ -12,13 +12,14 @@ short_desc="Toolkit supporting development of Z39.50/SRW/SRU clients and servers
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.indexdata.com/resources/software/yaz/"
+changelog="https://software.indexdata.com/yaz/doc/NEWS"
 distfiles="http://ftp.indexdata.dk/pub/yaz/yaz-${version}.tar.gz"
-checksum=311bcb386d6327dfa22e0e442aea26d1be7c633eb664b9f70d982f072a130112
+checksum=f0497fd8420574efab4e5738ea3b70787a6e8042f585156baa30bdc1911ba552
 
-case "$XBPS_TARGET_LIBC" in
-	musl) makedepends+=" libexecinfo-devel"
-		LDFLAGS+=" -lexecinfo" ;;
-esac
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" libexecinfo-devel"
+	export LIBS="-lexecinfo"
+fi
 
 post_install() {
 	vlicense LICENSE

From 42d75969811c78eb1df9fcdd5f831c0d2aedcde4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 21:47:18 -0300
Subject: [PATCH 1421/3482] xbps-src: add -K option to getopt string.

Was forgotten when the actual option was added.
---
 xbps-src | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xbps-src b/xbps-src
index 009a145c1d6f..06970629cc42 100755
--- a/xbps-src
+++ b/xbps-src
@@ -354,7 +354,7 @@ readonly XBPS_SRC_VERSION="113"
 export XBPS_MACHINE=$(xbps-uhelper -C /dev/null arch)
 
 XBPS_OPTIONS=
-XBPS_OPTSTRING="1a:c:CEfgGhH:iIj:Lm:No:p:qQr:tV"
+XBPS_OPTSTRING="1a:c:CEfgGhH:iIj:Lm:No:p:qQKr:tV"
 
 # Preprocess arguments in order to allow options before and after XBPS_TARGET.
 eval set -- $(getopt "$XBPS_OPTSTRING" "$@");

From 2a748e7e6d9727a7e921d6b9a163e0eb17be98b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 21:47:59 -0300
Subject: [PATCH 1422/3482] xbps-src/libexec: add make_check option.

Allows a template to define in which circumstances its do_check phase
should run, without requiring custom do_check definitions in each
template (also makes it easier to change how build styles do things
without checking as many templates).

Add to Manual and CONTRIBUTING as well.
---
 CONTRIBUTING.md                             |  6 +++++-
 Manual.md                                   | 12 +++++++++++-
 common/xbps-src/libexec/xbps-src-docheck.sh | 11 +++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cd3d6aad5dd7..d6a7299f64b7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -87,11 +87,15 @@ When you make changes to your pull request, please *do not close and reopen your
 
 #### Continuous Integration
 
-Pull requests are automatically submitted for Continuous Integration (CI) testing to ensure packages build on various combinations of libc and architecture.
+Pull requests are automatically submitted for Continuous Integration (CI) testing to ensure packages build and pass their tests (on native builds) on various combinations of C library and architecture.
 Packages that take longer than 120 minutes or need more than 14G of storage to complete their build (for example, Firefox or the Linux kernel) will fail CI and should include `[ci skip]` in the PR title or body (the comment field when the PR is being opened) to avoid wasting CI builder time.
 Use your best judgment on build times based on your local building experience. If you skip CI when submitting a PR, please build and cross-build for a variety of architectures locally, with both glibc and musl, and note your local results in PR comments.
 Make sure to cover 64-bit and 32-bit architectures.
 
+If you notice a failure in CI that didn't happen locally, that is likely because you didn't run tests locally.
+Use `./xbps-src -Q pkg <package>` to do so.
+Some tests won't work in the CI environment or at all, and their templates should encode this information using the `make_check` variable.
+
 Continuous Integration will also check if the templates you have changed
 comply with the our guidelines. At the moment not all packages comply with the rules, so if you update a package, it may report errors about places you haven't touched. Please feel free to fix those errors too.
 
diff --git a/Manual.md b/Manual.md
index ed73ec338fa5..acd23a32b426 100644
--- a/Manual.md
+++ b/Manual.md
@@ -166,7 +166,12 @@ can be used to perform other operations before configuring the package.
 
 - `build` This phase compiles/prepares the `source files` via `make` or any other compatible method.
 
-- `check` This optional phase checks the result of the `build` phase for example by running `make -k check`.
+- `check` This optional phase checks the result of the `build` phase by running the testsuite provided by the package.
+If the default `do_check` function provided by the build style doesn't do anything, the template should set
+`make_check_target` and/or `make_check_args` appropriately or define its own `do_check` function. If tests take too long
+or can't run in all environments, they should be run only if `XBPS_CHECK_PKGS` is `full`, which means they should either
+be under a `[ "$XBPS_CHECK_PKGS" = full ]` conditional (especially useful with custom `do_check`) or `make_check=extended`
+should be set in the template.
 
 - `install` This phase installs the `package files` into the package destdir `<masterdir>/destdir/<pkgname>-<version>`,
 via `make install` or any other compatible method.
@@ -589,6 +594,11 @@ patches to the package sources during `do_patch()`. Patches are stored in
 - `disable_parallel_build` If set the package won't be built in parallel
 and `XBPS_MAKEJOBS` has no effect.
 
+- `make_check` Sets the cases in which the `check` phase is run. Can be `yes` (the default) to run if
+`XBPS_CHECK_PKGS` is set, `extended` to run if `XBPS_CHECK_PKGS` is `full` and `no` to never run.
+This option should usually be accompanied by a comment explaining why it was set, especially when
+set to `no`.
+
 - `keep_libtool_archives` If enabled the `GNU Libtool` archives won't be removed. By default those
 files are always removed automatically.
 
diff --git a/common/xbps-src/libexec/xbps-src-docheck.sh b/common/xbps-src/libexec/xbps-src-docheck.sh
index 6be6c9d6eadb..1cb9f6ab13aa 100755
--- a/common/xbps-src/libexec/xbps-src-docheck.sh
+++ b/common/xbps-src/libexec/xbps-src-docheck.sh
@@ -32,6 +32,17 @@ if [ -z "$XBPS_CHECK_PKGS" ]; then
     exit 0
 fi
 
+if [ "$make_check" = no ]; then
+    msg_normal "${pkgname}-${version}_${revision}: skipping check (make_check=no) ...\n"
+    exit 0
+fi
+
+if [ "$make_check" = extended -a "$XBPS_CHECK_PKGS" != full ]; then
+    msg_normal \
+        "${pkgname}-${version}_${revision}: skipping check (make_check=extended and XBPS_CHECK_PKGS is not 'full') ...\n"
+    exit 0
+fi
+
 for f in $XBPS_COMMONDIR/environment/check/*.sh; do
     source_file "$f"
 done

From dfa05620b7cd60bf6987ef08edc87f275cd6bb7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 11 Feb 2021 03:02:05 -0300
Subject: [PATCH 1423/3482] iwd: use make_check and fix checkdepends.

---
 srcpkgs/iwd/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index 176fb47aba06..d3a413da37ba 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -8,7 +8,7 @@ configure_args="--disable-systemd-service --enable-pie
 hostmakedepends="python3-docutils pkg-config"
 makedepends="readline-devel dbus-devel ell-devel"
 depends="dbus ell>=0.36"
-checkdepends="python3"
+checkdepends="python3 $depends"
 short_desc="Internet Wireless Daemon by Intel that aims to replace wpa_supplicant"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="LGPL-2.1-or-later"
@@ -19,12 +19,11 @@ checksum=db854f569cfa94dc32120d8cf2e7d483a16679f238e1a4794837d0e455ea7aa9
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"
+# tests depend on kernel features
+make_check=extended
 
 do_check() {
-	if [ "$XBPS_CHECK_PKGS" = full]; then
-		# tests depend on kernel features
-		dbus-run-session make check
-	fi
+	dbus-run-session make check
 }
 
 post_install() {

From ae31cfbc3de561ce1b2b960ebcc9a91223f35fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 11 Feb 2021 03:11:18 -0300
Subject: [PATCH 1424/3482] srcpkgs/: move packages checking XBPS_CHECK_PKGS to
 use make_check.

---
 srcpkgs/R/template             |  7 +++----
 srcpkgs/efl/template           |  7 +++----
 srcpkgs/ell/template           |  7 +++----
 srcpkgs/elogind/template       |  9 ++-------
 srcpkgs/ghdl/template          |  4 +---
 srcpkgs/igt-gpu-tools/template |  2 ++
 srcpkgs/nautilus/template      | 11 +++--------
 srcpkgs/openvswitch/template   |  9 ++-------
 srcpkgs/squid/template         |  6 ++----
 srcpkgs/wine/template          |  7 +++----
 10 files changed, 24 insertions(+), 45 deletions(-)

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 1ac1b9667a2f..e40cefabcd48 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -26,6 +26,7 @@ distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz"
 checksum=09983a8a78d5fb6bc45d27b1c55f9ba5265f78fa54a55c13ae691f87c5bb9e0d
 nocross=yes
 shlib_provides="libR.so"
+make_check=extended
 
 build_options="openblas"
 
@@ -42,10 +43,8 @@ pre_configure() {
 	export R_PDFVIEWER=/usr/bin/xdg-open
 }
 
-do_check() {
-	if [ "${XBPS_CHECK_PKGS}" = full ]; then
-		( TEST_MC_CORES=${XBPS_MAKEJOBS} make check )
-	fi
+pre_check() {
+	export TEST_MC_CORES=${XBPS_MAKEJOBS}
 }
 
 post_install() {
diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index efb3019a969a..da39b6a38bbc 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -55,6 +55,7 @@ homepage="https://enlightenment.org"
 changelog="https://git.enlightenment.org/core/efl.git/plain/NEWS"
 distfiles="https://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.xz"
 checksum=351ca0211ca000234527a503585f039f985607ec9439e34b49d8b8bbf35a7e6b
+make_check=extended
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dbuild-tests=true"
@@ -107,10 +108,8 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 do_check() {
-	if [ "$XBPS_CHECK_PKGS" = full ]; then
-		# FIXME: tests fail in weird places
-		xvfb-run dbus-run-session ninja -C build test
-	fi
+	# FIXME: tests fail in weird places
+	xvfb-run dbus-run-session ninja -C build test
 }
 
 post_install() {
diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template
index a221184180ef..19634a337aa0 100644
--- a/srcpkgs/ell/template
+++ b/srcpkgs/ell/template
@@ -13,12 +13,11 @@ license="GPL-2.0-only"
 homepage="https://01.org/ell"
 distfiles="${KERNEL_SITE}/libs/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=2f99e743a235b1c834b19112e4e0283d02da93b863899381466cde47bf159cf6
+# tests depend on kernel features
+make_check=extended
 
 do_check() {
-	if [ "$XBPS_CHECK_PKGS" = full]; then
-		# tests depend on kernel features
-		dbus-run-session make check
-	fi
+	dbus-run-session make check
 }
 
 ell-devel_package() {
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 228a35ad87f4..d4bfe499bc55 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -19,6 +19,8 @@ homepage="https://github.com/elogind/elogind"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
 checksum=dd2fcf22a89a078cad22e633d2f14a4cc9f4a9c8bae25c0e39fc4aec3e273bc9
 conf_files="/etc/elogind/*.conf"
+# tests fail differently due to containerization and kernel features
+make_check=extended
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Dutmp=false"
@@ -38,13 +40,6 @@ pre_check() {
 	echo 'dummy-file' > /etc/os-release
 }
 
-do_check() {
-	if [ "$XBPS_CHECK_PKGS" = full ]; then
-		# tests fail differently due to containerization and kernel features
-		make check
-	fi
-}
-
 post_check() {
 	rm -f /etc/machine-id /etc/os-release
 }
diff --git a/srcpkgs/ghdl/template b/srcpkgs/ghdl/template
index 4229ca3d5634..1a1540e8fc5b 100644
--- a/srcpkgs/ghdl/template
+++ b/srcpkgs/ghdl/template
@@ -19,6 +19,7 @@ distfiles="https://github.com/ghdl/ghdl/archive/v${version}.tar.gz"
 checksum=3008616201cc3b0b596872e4ad59d8bc36e6ee3ff798bdce066828fbdad041e4
 nocross=yes
 patch_args="-Np1"
+make_check=extended
 
 build_options="llvm mcode"
 build_options_default="llvm"
@@ -107,9 +108,6 @@ do_check() {
 	# this indicates a bug in the testsuite
 	: && return 0
 
-	# the testsuite is big and long even when it runs
-	[ "$XBPS_CHECK_PKGS" != full ] && return 0
-
 	# need a temporary installation for testsuite run so that ghdl1 is found
 	for variant in ${build_options_default}; do
 		cd ${wrksrc}/build_${variant}
diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template
index 46f941f50a8a..2588c2ddff5c 100644
--- a/srcpkgs/igt-gpu-tools/template
+++ b/srcpkgs/igt-gpu-tools/template
@@ -15,6 +15,8 @@ license="MIT"
 homepage="https://gitlab.freedesktop.org/drm/igt-gpu-tools"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
 checksum=40454d8f0484ea2477862007398a08eef78a6c252c4defce1c934548593fdd11
+# tests don't behave in containers
+make_check=extended
 
 lib32disabled=yes
 archs="i686* x86_64*"
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 67fac293ac27..e6d843249a60 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -18,6 +18,9 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Nautilus"
 distfiles="${GNOME_SITE}/${pkgname}/${version::4}/${pkgname}-${version}.tar.xz"
 checksum=d09ceb54c274e50084c8757a73cd247fee5bde02a0b0d13733b0006d1a4196a6
+# tests timeout:
+# 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
+make_check=extended
 
 if [ "$CROSS_BUILD" ]; then
 	# tests try to use tracker-sandbox from the wrong path, because of some confusion with libdir:
@@ -28,14 +31,6 @@ fi
 build_options="gir"
 build_options_default="gir"
 
-do_check() {
-	if [ "$XBPS_CHECK_PKGS" = full ]; then
-		# tests timeout:
-		# 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
-		ninja -C builddir test
-	fi
-}
-
 libnautilus_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {
diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index 65f816ea9a2d..e158dd8b0a5a 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -18,13 +18,8 @@ checksum=65f420f954e250d895fb2db22a132e1cb560bc5e2b9051e834511348108e597a
 python_version=3
 _completiondir="/usr/share/bash-completion/completions"
 make_install_args+=" completiondir=${_completiondir}"
-
-do_check() {
-	if [ "$XBPS_CHECK_PKGS" = full ]; then
-		# test can hang in containers
-		make check ${makejobs}
-	fi
-}
+# test can hang in containers
+make_check=extended
 
 post_install() {
 	for cmd in ovs-appctl ovs-vsctl; do
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 319ac86c9aad..24a9833cc44d 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -67,16 +67,14 @@ homepage="http://www.squid-cache.org/"
 distfiles="http://www.squid-cache.org/Versions/v4/squid-${version}.tar.xz"
 checksum=f1097daa6434897c159bc100978b51347c0339041610845d0afa128151729ffc
 system_accounts="squid"
+# squid-conf-tests requires a squid user in the system
+make_check=no
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	LDFLAGS+=" -latomic"
 fi
 
-do_check() {
-	: # squid-conf-tests requires a squid user in the system
-}
-
 post_install() {
 	chmod u+s \
 		${DESTDIR}/usr/libexec/squid/basic_ncsa_auth \
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index b80e73bbdc9d..fff56aa12028 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -48,6 +48,7 @@ makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls wine-common>=${version}_${revision} libwine>=${version}_${revision}"
+make_check=extended
 
 case $XBPS_TARGET_MACHINE in
 	x86_64*) configure_args+=" --enable-win64 --libdir=/usr/lib"
@@ -85,10 +86,8 @@ pre_build() {
 }
 
 do_check() {
-	if [ "$XBPS_CHECK_PKGS" = full ]; then
-		msg_warn "This testsuite might hang indefinitely\n"
-		make check
-	fi
+	msg_warn "This testsuite might hang indefinitely\n"
+	make check
 }
 
 post_install() {

From 141d55a99b46c3a7c2ba91309b5e59f3f1f83a64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 11:19:42 +0100
Subject: [PATCH 1425/3482] calligra-plan: update to 3.3.0.

---
 srcpkgs/calligra-plan/patches/QPainterPath.patch | 10 ----------
 srcpkgs/calligra-plan/template                   |  4 ++--
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 srcpkgs/calligra-plan/patches/QPainterPath.patch

diff --git a/srcpkgs/calligra-plan/patches/QPainterPath.patch b/srcpkgs/calligra-plan/patches/QPainterPath.patch
deleted file mode 100644
index 519e5223fc7d..000000000000
--- a/srcpkgs/calligra-plan/patches/QPainterPath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libs/ui/kptganttitemdelegate.cpp	2019-12-12 12:48:13.000000000 +0100
-+++ src/libs/ui/kptganttitemdelegate.cpp	2020-09-01 17:42:12.663608718 +0200
-@@ -28,6 +28,7 @@
- #include <QModelIndex>
- #include <QApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLocale>
- 
- #include <KLocalizedString>
diff --git a/srcpkgs/calligra-plan/template b/srcpkgs/calligra-plan/template
index 336244110416..75d1fb8de582 100644
--- a/srcpkgs/calligra-plan/template
+++ b/srcpkgs/calligra-plan/template
@@ -1,6 +1,6 @@
 # Template file for 'calligra-plan'
 pkgname=calligra-plan
-version=3.2.2
+version=3.3.0
 revision=1
 wrksrc="${pkgname/-/}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://www.calligra.org/plan/"
 distfiles="${KDE_SITE}/calligra/${version}/calligraplan-${version}.tar.xz"
-checksum=e10c6f4a6fbf40da422d98d5138201f7db52236181c25641402e4ae4b0add336
+checksum=9a97414f2207941a70d93ff096617365d35379cc93a09cfc19ee532d2905a9d8
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 perl

From 40d298c1cca763e7cd7cf19e4ef641a3110d396b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 11:31:57 +0100
Subject: [PATCH 1426/3482] kdiagram: update to 2.8.0.

---
 srcpkgs/kdiagram/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kdiagram/template b/srcpkgs/kdiagram/template
index ef8f6c1a86f2..933a8af53940 100644
--- a/srcpkgs/kdiagram/template
+++ b/srcpkgs/kdiagram/template
@@ -1,6 +1,6 @@
 # Template file for 'kdiagram'
 pkgname=kdiagram
-version=2.7.0
+version=2.8.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.kde.org/"
 distfiles="${KDE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=63a2eabfa1554ceb1d686d5f17ed6308139b6d9155aaf224e0309585b070fbdd
+checksum=579dad3bd1ea44b5a20c0f133ebf47622e38960f9c7c8b3a316be30a369f431f
 
 kdiagram-devel_package() {
 	short_desc+=" - development"
@@ -19,6 +19,7 @@ kdiagram-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/*.so
+		vmove usr/lib/qt5/mkspecs
+		vmove "usr/lib/*.so"
 	}
 }

From 28d606630e157a656866773023143eb0d7a1ecdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 11 Feb 2021 13:34:06 +0100
Subject: [PATCH 1427/3482] linux4.4: update to 4.4.257

---
 srcpkgs/linux4.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index 4561b3da0978..b837ced471e3 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.4'
 pkgname=linux4.4
-version=4.4.253
+version=4.4.257
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz"
-checksum=661e98b9448cbac948c705fd44cd7d30200422ee1cb02950d142aa99a1b3985a
+checksum=3e067c5625b6a1201325c45c9b9e75f87e768cfbb9426f5f173dee73dc234b5a
 python_version=2 #unverified
 
 nocross=yes

From b38ff94056261c02814c3490e6701d945e6803ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 11 Feb 2021 13:54:33 +0100
Subject: [PATCH 1428/3482] linux4.9: update to 4.9.257

---
 srcpkgs/linux4.9/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 9b875c7daa0e..8b613c09ee85 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.9'
 pkgname=linux4.9
-version=4.9.253
+version=4.9.257
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=9a5b51a8350201bd38e3ff13909323a6571b4572a7b3caed76e462b07619bc18
+checksum=95e780fffc81de8217a31a3e6e212b69643f5344e9ba0dabaa6e426126f6d64f
 python_version=2 #unverified
 patch_args="-Np1"
 

From e459ed46227a319e7c2bc254c40fc1d3c02e7ef4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 11 Feb 2021 13:56:33 +0100
Subject: [PATCH 1429/3482] mariadb: actually fix the my_safe_print_str error
 properly

this is not cross-related
---
 .../mariadb/patches/fix-test-stacktrace.patch | 21 +++++++++++++++++++
 srcpkgs/mariadb/template                      |  4 ----
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/mariadb/patches/fix-test-stacktrace.patch

diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
new file mode 100644
index 000000000000..54a068bf06ee
--- /dev/null
+++ b/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
@@ -0,0 +1,21 @@
+https://jira.mariadb.org/browse/MDEV-24131
+
+diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
+index 8fa0db15b36..67eb099028e 100644
+--- unittest/mysys/stacktrace-t.c
++++ unittest/mysys/stacktrace-t.c
+@@ -22,6 +22,14 @@
+ 
+ char b_bss[10];
+ 
++#ifndef HAVE_STACKTRACE
++int  my_safe_print_str(const char* val, size_t max_len)
++{
++  printf("%*s\n", (int) max_len, val);
++  return 0;
++}
++#endif
++
+ void test_my_safe_print_str()
+ {
+   char b_stack[10];
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 5d65d2cd204f..b55a0cd36a3e 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -36,10 +36,6 @@ system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
 CFLAGS="-w -fcommon"
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DWITH_UNIT_TESTS=OFF"
-fi
-
 pre_configure() {
 	# We need some host binaries before starting cross compilation.
 	if [ "$CROSS_BUILD" ]; then

From 30c5bac99bc870fea64828fd271502fb3d1b3b10 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 11 Feb 2021 14:31:46 +0100
Subject: [PATCH 1430/3482] mariadb: fix on ppcle

---
 srcpkgs/mariadb/patches/ppcle.patch | 57 +++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 srcpkgs/mariadb/patches/ppcle.patch

diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
new file mode 100644
index 000000000000..f6f69044fed4
--- /dev/null
+++ b/srcpkgs/mariadb/patches/ppcle.patch
@@ -0,0 +1,57 @@
+From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Thu, 11 Feb 2021 14:24:44 +0100
+Subject: [PATCH] fix build on ppcle
+
+---
+ storage/innobase/ut/ut0crc32.cc | 4 ++--
+ storage/xtradb/ut/ut0crc32.cc   | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
+index 4d2d311..897c23e 100644
+--- storage/innobase/ut/ut0crc32.cc
++++ storage/innobase/ut/ut0crc32.cc
+@@ -194,7 +194,7 @@ ut_crc32_power8(
+ 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
+ 		 ulint		 		 len)		 /*!< in: data length */
+ {
+-#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
++#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
+   return crc32_vpmsum(0, buf, len);
+ #else
+ 		 ut_error;
+@@ -319,7 +319,7 @@ ut_crc32_init()
+ 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
+ #endif /* defined(__GNUC__) && defined(__x86_64__) */
+ 
+-#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
++#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
+         && !defined(WORDS_BIGENDIAN)
+ 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
+ 		 ut_crc32_power8_enabled = true;
+diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
+index 4ace913..e3526e4 100644
+--- storage/xtradb/ut/ut0crc32.cc
++++ storage/xtradb/ut/ut0crc32.cc
+@@ -194,7 +194,7 @@ ut_crc32_power8(
+ 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
+ 		 ulint		 		 len)		 /*!< in: data length */
+ {
+-#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
++#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
+   return crc32_vpmsum(0, buf, len);
+ #else
+ 		 ut_error;
+@@ -319,7 +319,7 @@ ut_crc32_init()
+ 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
+ #endif /* defined(__GNUC__) && defined(__x86_64__) */
+ 
+-#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
++#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
+         && !defined(WORDS_BIGENDIAN)
+ 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
+ 		 ut_crc32_power8_enabled = true;
+-- 
+2.30.0
+

From f1fcc4cb92a60572a8e81ab7333b03e2b629697e Mon Sep 17 00:00:00 2001
From: Quentin Rameau <quinq@fifth.space>
Date: Thu, 11 Feb 2021 10:57:51 +0100
Subject: [PATCH 1431/3482] util-linux-libs: Fix nofollow option for helpers

This is a temporary patch until upstream makes a new release, as this
blocks mount usage for users.
---
 srcpkgs/util-linux-libs/template              |  2 +-
 ...se-symfollow-for-helpers-on-user-mou.patch | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/util-linux/patches/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch

diff --git a/srcpkgs/util-linux-libs/template b/srcpkgs/util-linux-libs/template
index 4be19d8ccf57..ebca35ccb745 100644
--- a/srcpkgs/util-linux-libs/template
+++ b/srcpkgs/util-linux-libs/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux
 pkgname=util-linux-libs
 version=2.36.1
-revision=1
+revision=2
 wrksrc="util-linux-$version"
 build_style=meta
 hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
diff --git a/srcpkgs/util-linux/patches/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch b/srcpkgs/util-linux/patches/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch
new file mode 100644
index 000000000000..d0c0ca4047de
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch
@@ -0,0 +1,40 @@
+From 52f730e47869ce630fafb24fd46f755dc7ffc691 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 19 Nov 2020 09:49:16 +0100
+Subject: [PATCH] libmount: don't use "symfollow" for helpers on user mounts
+
+Addresses: https://github.com/karelzak/util-linux/issues/1193
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ libmount/src/context_mount.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
+index 8c394c1ff..dd1786176 100644
+--- libmount/src/context_mount.c
++++ libmount/src/context_mount.c
+@@ -415,6 +415,9 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr)
+ 		 * string, because there is nothing like MS_EXEC (we only have
+ 		 * MS_NOEXEC in mount flags and we don't care about the original
+ 		 * mount string in libmount for VFS options).
++		 *
++		 * This use-case makes sense for MS_SECURE flags only (see
++		 * mnt_optstr_get_flags() and mnt_context_merge_mflags()).
+ 		 */
+ 		if (!(cxt->mountflags & MS_NOEXEC))
+ 			mnt_optstr_append_option(optstr, "exec", NULL);
+@@ -422,11 +425,8 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr)
+ 			mnt_optstr_append_option(optstr, "suid", NULL);
+ 		if (!(cxt->mountflags & MS_NODEV))
+ 			mnt_optstr_append_option(optstr, "dev", NULL);
+-		if (!(cxt->mountflags & MS_NOSYMFOLLOW))
+-			mnt_optstr_append_option(optstr, "symfollow", NULL);
+ 	}
+ 
+-
+ 	if (cxt->flags & MNT_FL_SAVED_USER)
+ 		rc = mnt_optstr_set_option(optstr, "user", cxt->orig_user);
+ 	if (rc)
+-- 
+2.30.1
+

From 0961351b5226020b44bc8f1426310112c9151055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 11 Feb 2021 10:53:30 -0300
Subject: [PATCH 1432/3482] util-linux: revbump to match util-linux-libs
 revision.

ABI won't break between revisions (we even depend on it not breaking
between versions), and makes it necessary to revbump one package for
changes that only affect the other. This should be fixed, but depending
on util-linux-libs-${version} results in xbps-src not finding the
dependency.
---
 srcpkgs/util-linux/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index c0687d70b466..fddaff9c8c43 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,10 +2,11 @@
 # Keep this package sync with util-linux-libs
 pkgname=util-linux
 version=2.36.1
-revision=1
+revision=2
 hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
 makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
  eudev-libudev-devel"
+# FIXME: don't be so strict on the dependency
 depends="util-linux-libs-${version}_${revision}"
 short_desc="Miscellaneous linux utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 974bcfc6dd6883e294ca100f9808e04fb2f64b27 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 11 Feb 2021 08:04:35 -0600
Subject: [PATCH 1433/3482] python3-yara: update to 4.0.4.

---
 srcpkgs/python3-yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-yara/template b/srcpkgs/python3-yara/template
index 3543276a9dd2..5ed2b7c791f2 100644
--- a/srcpkgs/python3-yara/template
+++ b/srcpkgs/python3-yara/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-yara'
 pkgname=python3-yara
-version=4.0.3
+version=4.0.4
 revision=1
 wrksrc="yara-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="http://virustotal.github.io/yara/"
 distfiles="https://github.com/VirusTotal/yara-python/archive/v${version}.tar.gz"
-checksum=92e8e29d1d74e4889bf7bb5fe5b0092a48cb207c558393ec4cbe5f8f2fcadaab
+checksum=5fa5eb71311e306aa389931d2b7dac6cc71979a4c5c3d62e368717630aafa063

From 26565943ece8c7d7e4ca635de66e583c86a2072f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 11 Feb 2021 08:07:14 -0600
Subject: [PATCH 1434/3482] aide: update to 0.17.3.

---
 srcpkgs/aide/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aide/template b/srcpkgs/aide/template
index cb3115cb1387..37fa9a44d2b3 100644
--- a/srcpkgs/aide/template
+++ b/srcpkgs/aide/template
@@ -1,6 +1,6 @@
 # Template file for 'aide'
 pkgname=aide
-version=0.17.2
+version=0.17.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-mhash --with-posix-acl --with-prelink --with-xattr
@@ -15,7 +15,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://aide.github.io/"
 distfiles="https://github.com/aide/aide/releases/download/v${version}/aide-${version}.tar.gz"
-checksum=3cff624b1717dc19c106d4b898c37eee106bf2fae029880f005820294917bafa
+checksum=a2eb1883cafaad056fbe43ee1e8ae09fd36caa30a0bc8edfea5d47bd67c464f8
 
 post_configure() {
 	vsed -i config.h -e 's/cross/ino_t/g'

From 665b62f834d28e924bdcd805cc3dc224deca9a08 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Feb 2021 10:35:05 -0500
Subject: [PATCH 1435/3482] New package: python3-setuptools-rust-0.11.6

---
 .../patches/preserve_rustflags.patch          | 27 +++++++++++++++++++
 srcpkgs/python3-setuptools-rust/template      | 23 ++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 srcpkgs/python3-setuptools-rust/patches/preserve_rustflags.patch
 create mode 100644 srcpkgs/python3-setuptools-rust/template

diff --git a/srcpkgs/python3-setuptools-rust/patches/preserve_rustflags.patch b/srcpkgs/python3-setuptools-rust/patches/preserve_rustflags.patch
new file mode 100644
index 000000000000..00be144d52cb
--- /dev/null
+++ b/srcpkgs/python3-setuptools-rust/patches/preserve_rustflags.patch
@@ -0,0 +1,27 @@
+From cbd30fda8c6f7cc0d304728413f2cbf488da096b Mon Sep 17 00:00:00 2001
+From: "Andrew J. Hesford" <ajh@sideband.org>
+Date: Mon, 8 Feb 2021 12:58:58 -0500
+Subject: [PATCH] Augment, rather than replace, existing RUSTFLAGS when
+ building
+
+Some complex environments, like Void's cross-compilation environment,
+use RUSTFLAGS to control the behavior of rust compilation. Rather than
+overwriting RUSTFLAGS with custom flags, augment any existing RUSTFLAGS
+to preserve these environments.
+---
+ setuptools_rust/build.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git setuptools_rust/build.py setuptools_rust/build.py
+index 40d8e42..60eddfa 100644
+--- setuptools_rust/build.py
++++ setuptools_rust/build.py
+@@ -186,7 +186,7 @@ def build_extension(self, ext):
+             rustflags += " -C target-cpu=native"
+ 
+         if rustflags:
+-            env["RUSTFLAGS"] = rustflags
++            env["RUSTFLAGS"] = (env.get("RUSTFLAGS", "") + " " + rustflags).strip()
+ 
+         # Execute cargo
+         try:
diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template
new file mode 100644
index 000000000000..07ad5d97d1bb
--- /dev/null
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-setuptools-rust'
+pkgname=python3-setuptools-rust
+version=0.11.6
+revision=1
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm python3-toml"
+depends="python3-semanticversion python3-toml python3-setuptools"
+short_desc="Setuptools plugin for Rust support"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="MIT"
+homepage="https://github.com/PyO3/setuptools-rust"
+changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz"
+checksum=a5b5954909cbc5d66b914ee6763f81fa2610916041c7266105a469f504a7c4ca
+
+do_check() {
+	echo "Tests have unpackaged dependencies; skipping"
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 6baf048735f057d34ad96e341607d8d95a65d0bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Feb 2021 11:33:57 -0500
Subject: [PATCH 1436/3482] New package: python3-pytest-subtests-0.4.0

---
 srcpkgs/python3-pytest-subtests/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-pytest-subtests/template

diff --git a/srcpkgs/python3-pytest-subtests/template b/srcpkgs/python3-pytest-subtests/template
new file mode 100644
index 000000000000..078df4a28ef8
--- /dev/null
+++ b/srcpkgs/python3-pytest-subtests/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-subtests'
+pkgname=python3-pytest-subtests
+version=0.4.0
+revision=1
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-pytest"
+checkdepends="$depends"
+short_desc="Subtest fixture for python3-pytest"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="MIT"
+homepage="https://github.com/pytest-dev/pytest-subtests"
+distfiles="${PYPI_SITE}/p/pytest-subtests/pytest-subtests-${version}.tar.gz"
+checksum=8d9e2c1d1dce11f7b7d2c9d09202ebfc7757b7ff0cac9b72ad328edfe7ee037b
+
+post_install() {
+	vlicense LICENSE
+}

From 64faf773cbcf49fefcca01b129cc34aed15dceed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Feb 2021 11:09:36 -0500
Subject: [PATCH 1437/3482] python-cryptography_vectors: update to 3.3.2, split
 package

New package: python3-cryptography_vectors-3.4.4
---
 srcpkgs/python-cryptography_vectors/template  | 17 ++++-------------
 srcpkgs/python-cryptography_vectors/update    |  2 ++
 srcpkgs/python3-cryptography_vectors          |  1 -
 srcpkgs/python3-cryptography_vectors/template | 18 ++++++++++++++++++
 4 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/python-cryptography_vectors/update
 delete mode 120000 srcpkgs/python3-cryptography_vectors
 create mode 100644 srcpkgs/python3-cryptography_vectors/template

diff --git a/srcpkgs/python-cryptography_vectors/template b/srcpkgs/python-cryptography_vectors/template
index 8d705f4c3226..41152144236a 100644
--- a/srcpkgs/python-cryptography_vectors/template
+++ b/srcpkgs/python-cryptography_vectors/template
@@ -1,27 +1,18 @@
 # Template file for 'python-cryptography_vectors'
 pkgname=python-cryptography_vectors
-version=3.3.1
+version=3.3.2
 revision=1
 wrksrc="cryptography_vectors-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 short_desc="Test vectors for python-cryptography"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz"
-checksum=03789c305dda8dccb4b8c9c019963a742469d88365abbc82e8e898ac478f5ca4
+checksum=8c9d5afada647a6c937c6392c975f204b540c31f25fd4acd925ec0e180be0afa
 
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.BSD
 }
-
-python3-cryptography_vectors_package() {
-	short_desc="${short_desc/python/python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-		vlicense LICENSE.BSD
-	}
-}
diff --git a/srcpkgs/python-cryptography_vectors/update b/srcpkgs/python-cryptography_vectors/update
new file mode 100644
index 000000000000..051a14b7a817
--- /dev/null
+++ b/srcpkgs/python-cryptography_vectors/update
@@ -0,0 +1,2 @@
+# cryptography >= 3.4 does not support Python 2
+pattern="cryptography_vectors-\K3\.3\.[0-9.]+(?=.tar.gz)"
diff --git a/srcpkgs/python3-cryptography_vectors b/srcpkgs/python3-cryptography_vectors
deleted file mode 120000
index 321bb702bd9c..000000000000
--- a/srcpkgs/python3-cryptography_vectors
+++ /dev/null
@@ -1 +0,0 @@
-python-cryptography_vectors
\ No newline at end of file
diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
new file mode 100644
index 000000000000..362d89acdf84
--- /dev/null
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-cryptography_vectors'
+pkgname=python3-cryptography_vectors
+version=3.4.4
+revision=1
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Test vectors for python3-cryptography"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause, Apache-2.0"
+homepage="https://github.com/pyca/cryptography"
+distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz"
+checksum=b0b53e3eaac12c8d8a0d373b35b43813406e884fcdac3c30f358c40e9f77093a
+
+post_install() {
+	vlicense LICENSE
+	vlicense LICENSE.BSD
+}

From 76988cd6c9bba25773b83a47bbc0e1589e8c851b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Feb 2021 10:58:28 -0500
Subject: [PATCH 1438/3482] python-cryptography: update to 3.3.2, split package

New package: python3-cryptography-3.4.4
---
 srcpkgs/python-cryptography/template  | 30 ++++++----------------
 srcpkgs/python-cryptography/update    |  2 ++
 srcpkgs/python3-cryptography          |  1 -
 srcpkgs/python3-cryptography/template | 36 +++++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 23 deletions(-)
 create mode 100644 srcpkgs/python-cryptography/update
 delete mode 120000 srcpkgs/python3-cryptography
 create mode 100644 srcpkgs/python3-cryptography/template

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 6579b004e388..2363ec3042de 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,42 +1,28 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
-version=3.3.1
+version=3.3.2
 revision=1
 wrksrc="cryptography-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools libressl-devel
- python-enum34 python-ipaddress python-six python3-six
- python-cffi python3-cffi python-idna python3-idna"
-makedepends="libressl-devel python-devel python3-devel"
+build_style=python2-module
+hostmakedepends="python-setuptools libressl-devel python-enum34
+ python-ipaddress python-six python-cffi python-idna"
+makedepends="libressl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
- python-pytest python-pytz python-iso8601 python3-cryptography_vectors
- python3-hypothesis python3-pretend python3-pytest python3-pytz python3-iso8601
- ${depends}"
+ python-pytest python-pytz python-iso8601 ${depends}"
 short_desc="Python2 library that provides cryptographic recipes and primitives"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6
+checksum=5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed
 
 do_check() {
-	PYTHONPATH="$(cd build-2.7/lib* && pwd)" python2.7 -m pytest tests
-	PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python${py3_ver} -m pytest tests
+	PYTHONPATH="$(cd build/lib* && pwd)" python2.7 -m pytest tests
 }
 
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.BSD
 }
-
-python3-cryptography_package() {
-	depends="python3-cffi python3-six python3-idna"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-		vlicense LICENSE.BSD
-	}
-}
diff --git a/srcpkgs/python-cryptography/update b/srcpkgs/python-cryptography/update
new file mode 100644
index 000000000000..b128c2f3bcf8
--- /dev/null
+++ b/srcpkgs/python-cryptography/update
@@ -0,0 +1,2 @@
+# cryptography >= 3.4 does not support Python 2
+pattern="cryptography-\K3\.3\.[0-9.]+(?=.tar.gz)"
diff --git a/srcpkgs/python3-cryptography b/srcpkgs/python3-cryptography
deleted file mode 120000
index 056dc2d1d9b3..000000000000
--- a/srcpkgs/python3-cryptography
+++ /dev/null
@@ -1 +0,0 @@
-python-cryptography
\ No newline at end of file
diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
new file mode 100644
index 000000000000..dff0d3b211f7
--- /dev/null
+++ b/srcpkgs/python3-cryptography/template
@@ -0,0 +1,36 @@
+# Template file for 'python3-cryptography'
+pkgname=python3-cryptography
+version=3.4.4
+revision=1
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+build_helper="rust"
+hostmakedepends="python3-setuptools-rust python3-cffi cargo"
+makedepends="python3-devel libressl-devel"
+depends="python3-cffi"
+checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
+ python3-cryptography_vectors python3-pretend python3-hypothesis $depends"
+short_desc="Python3 library that provides cryptographic recipes and primitives"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause, Apache-2.0"
+homepage="https://github.com/pyca/cryptography"
+changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
+checksum=ee5e19f0856b6fbbdbab15c2787ca65d203801d2d65d0b8de6218f424206c848
+
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" rust-std"
+	export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib"
+	export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include"
+fi
+
+do_check() {
+	PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest
+}
+
+post_install() {
+	vlicense LICENSE
+	vlicense LICENSE.BSD
+
+	chmod 755 ${DESTDIR}/${py3_sitelib}/cryptography/hazmat/bindings/*.so
+}

From 8af62974213261ff8f558af91e610fff7c92f603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 18:12:33 +0100
Subject: [PATCH 1439/3482] postgresql13: update to 13.2.

---
 srcpkgs/postgresql13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 9aab64225a56..82ee631a17bb 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.1
+version=13.2
 revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
@@ -22,7 +22,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f
+checksum=5fd7fcd08db86f5b2aed28fcfaf9ae0aca8e9428561ac547764c2a2b0f41adfc
 
 conf_files="
  /${_prefix}/etc/default/postgresql

From cb3ce111fe286fd20a5dc428f410b79b85c7ff05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 18:43:59 +0100
Subject: [PATCH 1440/3482] postgresql12: update to 12.6.

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index d12ecc4e5dc5..0fe9056dc2ab 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.5
+version=12.6
 revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
@@ -22,7 +22,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=bd0d25341d9578b5473c9506300022de26370879581f5fddd243a886ce79ff95
+checksum=df7dd98d5ccaf1f693c7e1d0d084e9fed7017ee248bba5be0167c42ad2d70a09
 
 conf_files="
  /${_prefix}/etc/default/postgresql

From 84a5c1ef7cc23fefc5db1db8e01fdbd71e234804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 13 Jan 2021 17:37:28 -0300
Subject: [PATCH 1441/3482] Revert "build-style/meson.sh: drop unneeded AR
 export"

This reverts commit 2163ca2d033f0165990cb66af88ed216e9b17046.

Removing `export AR=gcc-ar` was apparently done based on the assumption
that the linked issue (https://github.com/mesonbuild/meson/issues/1646)
had been solved completely on meson's side.

Instead, their solution, seen in
https://github.com/void-linux/void-packages/pull/2815, had been to force
gcc-ar for linking static libraries; by exporting `AR=ar`, we were
accidentally breaking static libraries when LTO is enabled. This was
noticed by leah while we were trying to build qemu-user-static using the
normal libglib-devel package (built with meson, which for us defaults to
enabling LTO).

Unfortunately, while correct, this change wasn't enough to fix the
static glib build, which had to resort to disabling LTO.
---
 common/build-style/meson.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/common/build-style/meson.sh b/common/build-style/meson.sh
index 6eb2dc530da5..b1eddda36e76 100644
--- a/common/build-style/meson.sh
+++ b/common/build-style/meson.sh
@@ -92,6 +92,14 @@ do_configure() {
 		configure_args+=" --cross-file=${meson_crossfile}"
 	fi
 
+	# binutils ar needs a plugin when LTO is used on static libraries, so we
+	# have to use the gcc-ar wrapper that calls the correct plugin.
+	# As seen in https://github.com/mesonbuild/meson/issues/1646 (and its
+	# solution, https://github.com/mesonbuild/meson/pull/1649), meson fixed
+	# issues with static libraries + LTO by defaulting to gcc-ar themselves.
+	# We also force gcc-ar usage in the crossfile above.
+	export AR="gcc-ar"
+
 	${meson_cmd} \
 		--prefix=/usr \
 		--libdir=/usr/lib${XBPS_TARGET_WORDSIZE} \

From 62ca689e155f5cee7506ed3661e92dfcf97ebca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 13 Jan 2021 11:36:06 -0300
Subject: [PATCH 1442/3482] qemu-user-static: update to 5.2.0.

Move from libglib-static to libglib-devel, which now includes static
versions of each library.

Pick up tricks from qemu for cross compilation.

The patch being applied fixes #23557.

Add comment to qemu about qemu-user-static. It's important to update the
two packages together, since they share the patches folder.
---
 srcpkgs/qemu-user-static/template             | 24 +++++++++++--------
 .../qemu/patches/musl-initialize-msghdr.patch | 15 ++++++++++++
 srcpkgs/qemu/template                         |  3 +++
 3 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/qemu/patches/musl-initialize-msghdr.patch

diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 608dc27d9824..01d4d7acb563 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -1,16 +1,18 @@
 # Template file for 'qemu-user-static'
+# This package should be updated together with qemu
 pkgname=qemu-user-static
-version=5.1.0
+version=5.2.0
 revision=1
 wrksrc="qemu-${version}"
-hostmakedepends="pkg-config automake python3"
-makedepends="dtc-devel libglib-static pixman-devel libuuid-devel"
+build_style=configure
+hostmakedepends="pkg-config automake python3 ninja"
+makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
 short_desc="QEMU User-mode emulators (statically compiled)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=8314b6e5fcc7bf9fa3915d504de6586a69cba30ffa27cbe9ba85d2cb9987fb3a
+checksum=7bd9334c02edaf02f5b0b52beb19fe7f72556c3ca0180e20f0095f0ef2f25f14
 
 _fmts="aarch64 alpha arm armeb cris i386 m68k microblaze mips mipsel mips64 mips64el ppc ppc64 ppc64abi32 ppc64le s390x sh4 sh4eb sparc sparc32plus sparc64 x86_64"
 
@@ -80,19 +82,21 @@ done
 binfmts="${binfmts%?}"
 
 post_extract() {
-	sed -i 's/__u64/unsigned long/' linux-user/host/aarch64/hostdep.h
+	vsed -i 's/__u64/unsigned long/' linux-user/host/aarch64/hostdep.h
 }
 
 do_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		_args="--cross-prefix=${XBPS_CROSS_TRIPLET}-"
+		export LIBTOOL=libtool
+	fi
+	unset CPP
+
 	./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec \
 		--disable-kvm --disable-vnc-png \
 		--disable-virtfs --disable-fdt --disable-seccomp \
 		--enable-linux-user --disable-system \
-		--static
-}
-
-do_build() {
-	make ${makejobs} LDFLAGS="-static -lrt -luuid"
+		--static ${_args}
 }
 
 do_install() {
diff --git a/srcpkgs/qemu/patches/musl-initialize-msghdr.patch b/srcpkgs/qemu/patches/musl-initialize-msghdr.patch
new file mode 100644
index 000000000000..c195f0c0b1f4
--- /dev/null
+++ b/srcpkgs/qemu/patches/musl-initialize-msghdr.patch
@@ -0,0 +1,15 @@
+Source: https://github.com/void-linux/void-packages/issues/23557
+
+diff --git linux-user/syscall.c linux-user/syscall.c
+index 945fc25..8d8b68a 100644
+--- linux-user/syscall.c
++++ linux-user/syscall.c
+@@ -3071,7 +3071,7 @@ static abi_long do_sendrecvmsg_locked(int fd, struct target_msghdr *msgp,
+                                       int flags, int send)
+ {
+     abi_long ret, len;
+-    struct msghdr msg;
++    struct msghdr msg = {0};
+     abi_ulong count;
+     struct iovec *vec;
+     abi_ulong target_vec;
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index e8cb4d4672c5..ae18a557078d 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,4 +1,5 @@
 # Template file for 'qemu'
+# This package should be updated together with qemu-user-static
 pkgname=qemu
 version=5.2.0
 revision=1
@@ -27,6 +28,8 @@ ignore_elf_dirs="/usr/share/qemu"
 nostrip_files="hppa-firmware.img openbios-ppc openbios-sparc32 openbios-sparc64
  palcode-clipper s390-ccw.img s390-netboot.img u-boot.e500 opensbi-riscv32-generic-fw_dynamic.elf
  opensbi-riscv64-generic-fw_dynamic.elf"
+# FIXME
+make_check=extended
 
 build_options="gtk3 opengl sdl2 spice virgl smartcard numa iscsi"
 build_options_default="opengl gtk3 virgl sdl2 numa iscsi"

From 2c6bde11ad4fb27a752b8f9d73f928e28fe4934e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 13 Jan 2021 11:37:04 -0300
Subject: [PATCH 1443/3482] libglib-static: remove package.

No longer necessary, now that glib includes static libraries.
---
 .../patches/gobject_init_on_demand.patch      | 91 -------------------
 .../patches/quark_init_on_demand.patch        | 37 --------
 srcpkgs/libglib-static/template               | 49 ----------
 srcpkgs/removed-packages/template             |  1 +
 4 files changed, 1 insertion(+), 177 deletions(-)
 delete mode 100644 srcpkgs/libglib-static/patches/gobject_init_on_demand.patch
 delete mode 100644 srcpkgs/libglib-static/patches/quark_init_on_demand.patch
 delete mode 100644 srcpkgs/libglib-static/template

diff --git a/srcpkgs/libglib-static/patches/gobject_init_on_demand.patch b/srcpkgs/libglib-static/patches/gobject_init_on_demand.patch
deleted file mode 100644
index bcc3cabfbcde..000000000000
--- a/srcpkgs/libglib-static/patches/gobject_init_on_demand.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Initialize the gobject system on demand, i.e. before it is
-expected to be initialized. Do this only once by checking
-a local static variable gobject_initialized.
-
---- gobject/gtype.c	2016-08-17 17:20:47.000000000 +0200
-+++ gobject/gtype.c	2016-09-01 21:56:31.777406646 +0200
-@@ -209,6 +209,9 @@
- static gboolean				type_node_is_a_L		(TypeNode		*node,
- 									 TypeNode		*iface_node);
- 
-+#if !defined(__GLIBC__)
-+static void gobject_init (void);
-+#endif
- 
- /* --- enumeration --- */
- 
-@@ -2631,7 +2634,10 @@
- 			     GTypeFlags			 flags)
- {
-   TypeNode *node;
--  
-+ 
-+#if !defined(__GLIBC__)
-+  gobject_init();
-+#endif 
-   g_assert_type_system_initialized ();
-   g_return_val_if_fail (type_id > 0, 0);
-   g_return_val_if_fail (type_name != NULL, 0);
-@@ -2749,6 +2755,9 @@
-   TypeNode *pnode, *node;
-   GType type = 0;
-   
-+#if !defined(__GLIBC__)
-+  gobject_init();
-+#endif 
-   g_assert_type_system_initialized ();
-   g_return_val_if_fail (parent_type > 0, 0);
-   g_return_val_if_fail (type_name != NULL, 0);
-@@ -2804,6 +2813,9 @@
-   TypeNode *pnode, *node;
-   GType type;
-   
-+#if !defined(__GLIBC__)
-+  gobject_init();
-+#endif 
-   g_assert_type_system_initialized ();
-   g_return_val_if_fail (parent_type > 0, 0);
-   g_return_val_if_fail (type_name != NULL, 0);
-@@ -3319,6 +3331,9 @@
- {
-   TypeNode *node;
-   
-+#if !defined(__GLIBC__)
-+  gobject_init();
-+#endif 
-   g_assert_type_system_initialized ();
-   
-   node = lookup_type_node_I (type);
-@@ -4343,6 +4358,9 @@
- void
- g_type_init_with_debug_flags (GTypeDebugFlags debug_flags)
- {
-+#if !defined(__GLIBC__)
-+  gobject_init();
-+#endif 
-   g_assert_type_system_initialized ();
- 
-   if (debug_flags)
-@@ -4361,6 +4379,9 @@
- void
- g_type_init (void)
- {
-+#if !defined(__GLIBC__)
-+  gobject_init();
-+#endif 
-   g_assert_type_system_initialized ();
- }
- 
-@@ -4372,6 +4393,12 @@
-   TypeNode *node;
-   GType type;
- 
-+#if !defined(__GLIBC__)
-+  static int gobject_initialized = 0;
-+  if (gobject_initialized)
-+    return;
-+  gobject_initialized = 1;
-+#endif
-   /* Ensure GLib is initialized first, see
-    * https://bugzilla.gnome.org/show_bug.cgi?id=756139
-    */
diff --git a/srcpkgs/libglib-static/patches/quark_init_on_demand.patch b/srcpkgs/libglib-static/patches/quark_init_on_demand.patch
deleted file mode 100644
index 458a2adab434..000000000000
--- a/srcpkgs/libglib-static/patches/quark_init_on_demand.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-musl does not run ctors in the assumed order that glib-2.46 expects.
-Call g_quark_init() where it is expected to have been called.
-
-
---- glib/gquark.c	2016-08-17 17:20:47.000000000 +0200
-+++ glib/gquark.c	2016-08-30 07:49:13.298234757 +0200
-@@ -57,6 +57,9 @@
- void
- g_quark_init (void)
- {
-+  if (quark_ht)
-+    return;
-+
-   g_assert (quark_seq_id == 0);
-   quark_ht = g_hash_table_new (g_str_hash, g_str_equal);
-   quarks = g_new (gchar*, QUARK_BLOCK_SIZE);
-@@ -138,9 +141,12 @@
-     return 0;
- 
-   G_LOCK (quark_global);
-+#if !defined(__GLIBC__)
-+  g_quark_init ();
-+#endif
-   quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
-   G_UNLOCK (quark_global);
-
-   return quark;
- }
- 
-@@ -280,6 +286,7 @@
-   GQuark quark;
-   gchar **quarks_new;
- 
-+  g_quark_init ();
-   if (quark_seq_id % QUARK_BLOCK_SIZE == 0)
-     {
-       quarks_new = g_new (gchar*, quark_seq_id + QUARK_BLOCK_SIZE);
diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
deleted file mode 100644
index 83dc7323082f..000000000000
--- a/srcpkgs/libglib-static/template
+++ /dev/null
@@ -1,49 +0,0 @@
-# Template file for 'libglib-static'
-#
-# This is only used for qemu-user-static until meson figures out building static
-# glib 2.60.0 via meson.
-#
-pkgname=libglib-static
-version=2.58.3
-revision=5
-wrksrc="glib-${version}"
-build_style=gnu-configure
-configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
- --enable-static"
-hostmakedepends="automake gettext libtool pkg-config python3 libxslt docbook-xsl"
-makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-depends="$makedepends"
-short_desc="GNU library of C routines"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://wiki.gnome.org/Projects/GLib"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
-distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
-conflicts="libglib-devel>=0"
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" glib-devel"
-	case "$XBPS_TARGET_MACHINE" in
-		mips*|ppc|ppc-musl)	# It seems mips/ppc autoconf cache is not read?
-			configure_args+=" glib_cv_stack_grows=no glib_cv_rtldglobal_broken=no glib_cv_uscore=no" ;;
-	esac
-fi
-
-post_patch() {
-	# Better to just rm -rf /usr/lib/locale in post_install?
-	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
-		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
-		m4macros/glib-gettext.m4
-	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
-		po/Makefile.in.in
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
-post_install() {
-	rm -r $DESTDIR/usr/bin
-	rm -r $DESTDIR/usr/share
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 27e8669c24ff..14bd76761ff3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -152,6 +152,7 @@ replaces="
  libfcitx-qt<=4.2.9.8_1
  libfcitx-qt-devel<=4.2.9.8_1
  libgksu<=2.0.12_5
+ libglib-static<=2.58.3_5
  libqzeitgeist<=0.8.0_6
  librpcsecgss<=0.19_6
  librpcsecgss-devel<=0.19_6

From 2ec5841a1c157b88a2056d0d90142bf9d36ec217 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 20:59:00 -0700
Subject: [PATCH 1444/3482] wayfire: update to 0.7.0.

---
 srcpkgs/wayfire/patches/fix_switcher.patch | 30 ----------------------
 srcpkgs/wayfire/template                   |  9 ++++---
 2 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/wayfire/patches/fix_switcher.patch

diff --git a/srcpkgs/wayfire/patches/fix_switcher.patch b/srcpkgs/wayfire/patches/fix_switcher.patch
deleted file mode 100644
index a09e43d12e6b..000000000000
--- a/srcpkgs/wayfire/patches/fix_switcher.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- plugins/single_plugins/switcher.cpp	2020-11-18 15:30:44.970379825 +0100
-+++ plugins/single_plugins/switcher.cpp	2020-11-18 15:30:31.068223026 +0100
-@@ -201,7 +201,8 @@ class WayfireSwitcher : public wf::plugi
-             active = true;
- 
-             // grabs shouldn't fail if we could successfully activate plugin
--            assert(grab_interface->grab());
-+            auto grab = grab_interface->grab();
-+            assert(grab);
- 
-             focus_next(dir);
-             arrange();
---- src/view/layer-shell.cpp	2020-11-18 15:30:44.970379825 +0100
-+++ src/view/layer-shell.cpp	2020-11-18 15:30:40.404328323 +0100
-@@ -1,5 +1,6 @@
- #include <algorithm>
- #include <cstring>
-+#include <cstdlib>
- 
- #include "xdg-shell.hpp"
- #include "wayfire/core.hpp"
-@@ -69,7 +70,7 @@ wf::workspace_manager::anchored_edge anc
-         return wf::workspace_manager::ANCHORED_EDGE_RIGHT;
-     }
- 
--    assert(false);
-+    abort();
- }
- 
- struct wf_layer_shell_manager
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 22c5494af072..fb3b85aef2c0 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,7 +1,7 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.6.0
-revision=2
+version=0.7.0
+revision=1
 _utils_commit=f45641beef46babdc8f1b8d18a924e72beaf8ee6
 _touch_commit=b1075c54a280f913edc26b9757262f4f9d6b62b0
 build_style=meson
@@ -13,10 +13,10 @@ short_desc="3D wayland compositor"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz
+distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz
  https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz
  https://github.com/WayfireWM/wf-touch/archive/${_touch_commit}.tar.gz"
-checksum="9c2bf92e6aecc9b800b87e4c086ff7a275393f7315501b8c39196baf9d245b33
+checksum="b1a94ad2843db19e78cbd361ceebaade4507647ad893d5b5117a9fc7724ce41c
  d172f8c21e0bac01e4116cd957fb0159c5cb39ddfdce897beb0d9c753796d5f1
  2b22e03d3a522baeff5798f630ffe5aa95899fd3233b291527503af5fd3e30be"
 
@@ -47,6 +47,7 @@ wayfire-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }

From 76da8a98270ea573491916f4ddec2c53dd7bbdd6 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 20:59:05 -0700
Subject: [PATCH 1445/3482] wf-config: update to 0.7.0.

---
 srcpkgs/wf-config/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index bc6a2c8b870d..5cbf2c847e04 100644
--- a/srcpkgs/wf-config/template
+++ b/srcpkgs/wf-config/template
@@ -1,6 +1,6 @@
 # Template file for 'wf-config'
 pkgname=wf-config
-version=0.6.0
+version=0.7.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Wayfire library for managing configuration files"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wf-config/archive/${version}.tar.gz"
-checksum=73af6d803044d4e5907974ece019ae0d1b4020a057f6c27be0594fb70d86653b
+distfiles="https://github.com/WayfireWM/wf-config/archive/v${version}.tar.gz"
+checksum=a8712d6a10d74b2bdba3dac9e01448945a0470ce8b1cd6d5caa2a8194f889b04
 
 post_install() {
 	vlicense LICENSE

From 6f20a2a1501bfb9e81775b8f74492772fb3e11cb Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 20:59:11 -0700
Subject: [PATCH 1446/3482] wf-shell: update to 0.7.0.

---
 srcpkgs/wf-shell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template
index 47f0a42376b2..9c8accbe6ae5 100644
--- a/srcpkgs/wf-shell/template
+++ b/srcpkgs/wf-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'wf-shell'
 pkgname=wf-shell
-version=0.6.1
+version=0.7.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,7 +13,7 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="MIT"
 homepage="https://wayfire.org"
 distfiles="https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz"
-checksum=da8e5a16dde8f44966d41449452bcc7bc2466d5945324aca714ecc82827c884a
+checksum=7495c690a1c021e0c82ba304513b3e7870cb329f7f0bf88df3bc5f46535d5ec7
 
 post_install() {
 	vlicense LICENSE

From 39c442e791732fe9fb0e70f8bfecca6dd4aed2a8 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 20:59:19 -0700
Subject: [PATCH 1447/3482] wcm: update to 0.7.0.

---
 srcpkgs/wcm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template
index b32e76ccff19..91f4b8205973 100644
--- a/srcpkgs/wcm/template
+++ b/srcpkgs/wcm/template
@@ -1,6 +1,6 @@
 # Template file for 'wcm'
 pkgname=wcm
-version=0.6.0
+version=0.7.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
@@ -10,7 +10,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org/"
 distfiles="https://github.com/WayfireWM/wcm/archive/v${version}.tar.gz"
-checksum=bfead0b617f46306ad3bc15b8e9c7e8f13996de6b5bdd3f2d18f066a9033740f
+checksum=930792b9567183aa4939ce880c294d38b56fcd1b9b64760bb33126067010166f
 
 post_install() {
 	vlicense LICENSE

From e1a2e12d3c6c195d530e796a1ccd016cd02cce00 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 20:59:28 -0700
Subject: [PATCH 1448/3482] wayfire-plugins-extra: update to 0.7.0.

---
 srcpkgs/wayfire-plugins-extra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template
index ff0e06c655cb..60fd9784e783 100644
--- a/srcpkgs/wayfire-plugins-extra/template
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -1,6 +1,6 @@
 # Template file for 'wayfire-plugins-extra'
 pkgname=wayfire-plugins-extra
-version=0.6.0
+version=0.7.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
@@ -10,8 +10,8 @@ short_desc="Additional plugins for Wayfire"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org/"
-distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/${version}.tar.gz"
-checksum=d1ac42c0b2d212a7523f2aeb63285ab8b95ffb6efd564bf27877310eeab1ab0e
+distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/v${version}.tar.gz"
+checksum=e6377e7f2cd6b0a19fe0a256c819f801ee1d963524ed4e4930b702474bc04287
 
 post_install() {
 	vlicense LICENSE

From c1edd45f89d10c067f99379cc1e1ec9f05221da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 11 Feb 2021 17:13:41 +0100
Subject: [PATCH 1449/3482] doctl: update to 1.56.0.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index a7e89e832ac2..926126ac0e25 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.55.0
+version=1.56.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -11,4 +11,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=7141427c5a2c3b3043f076ef7789a1a526cd8b2fa8af94d33372bd775691e141
+checksum=1b566c84cff43c5dd31c13a2491c80decc8722d4119d219c5e09be783f544356

From 4d518fcb76da07173a621baea973d68dedb6b8c7 Mon Sep 17 00:00:00 2001
From: Christopher Brannon <chris@the-brannons.com>
Date: Thu, 11 Feb 2021 03:48:13 -0800
Subject: [PATCH 1450/3482] busybox: install ntpd service for busybox-huge.

Tests were failing due to underspecified checkdepends; added
the missing ones. Some still fail on glibc.

Closes: #28663 [via git-merge-pr]
---
 srcpkgs/busybox/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index 63d7aeb7cebf..57728f1fe1fc 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -1,9 +1,9 @@
 # Template file for 'busybox'
 pkgname=busybox
 version=1.31.1
-revision=5
+revision=6
 hostmakedepends="perl"
-checkdepends="zip"
+checkdepends="tar which zip"
 short_desc="Swiss Army Knife of Embedded Linux"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-only"
@@ -125,6 +125,7 @@ busybox-huge_package() {
 	pkg_install() {
 		vbin busybox-huge/busybox_unstripped busybox
 		vman busybox-huge/docs/busybox.1
+		vsv busybox-ntpd
 		vsv busybox-syslogd
 		vsv busybox-klogd
 	}

From f58973613c52c98dc96265989bce49daca68ed32 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 21:20:30 +0100
Subject: [PATCH 1451/3482] xapian-core: update to 1.4.18.

---
 srcpkgs/xapian-core/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xapian-core/template b/srcpkgs/xapian-core/template
index faa8905b1d90..84b4c966d573 100644
--- a/srcpkgs/xapian-core/template
+++ b/srcpkgs/xapian-core/template
@@ -1,7 +1,7 @@
 # Template file for 'xapian-core'
 pkgname=xapian-core
-version=1.4.17
-revision=2
+version=1.4.18
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 makedepends="zlib-devel libuuid-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.xapian.org/"
 distfiles="https://oligarchy.co.uk/xapian/${version}/${pkgname}-${version}.tar.xz"
-checksum=b5eb8556dea1b0cad4167a66223522e66d670ec1eba16c7fdc844ed6b652572e
+checksum=196ddbb4ad10450100f0991a599e4ed944cbad92e4a6fe813be6dce160244b77
 
 # xapian-config needs the .la
 keep_libtool_archives=yes

From 576e738c4b426a03c0cd940a2c9fab063c35a394 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 21:52:28 +0100
Subject: [PATCH 1452/3482] haproxy: update to 2.3.5.

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 6bd82107a256..0baba697f264 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.3.4
+version=2.3.5
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=60148cdfedd6b19c401dbcd75ccd76a53c20bc76c49032ba32af98a0a5c495ed
+checksum=7924539530bbf555829c7f5886be0b7fcf8d9c8ffe0867b7010beb670abfbe4b
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"

From ed6146d54b6df297ce112e11585573346874317c Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 10 Feb 2021 13:13:05 +0100
Subject: [PATCH 1453/3482] psmisc: update to 23.4

---
 srcpkgs/psmisc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/psmisc/template b/srcpkgs/psmisc/template
index 8fe0bb7858d5..f60dac7e53f0 100644
--- a/srcpkgs/psmisc/template
+++ b/srcpkgs/psmisc/template
@@ -1,6 +1,6 @@
 # Template file for 'psmisc'
 pkgname=psmisc
-version=23.3
+version=23.4
 revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
@@ -9,4 +9,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.com/psmisc/psmisc"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=41750e1a5abf7ed2647b094f58127c73dbce6876f77ba4e0a7e0995ae5c7279a
+checksum=7f0cceeace2050c525f3ebb35f3ba01d618b8d690620580bdb8cd8269a0c1679

From ffed34b13c7e975d54591f03df7f41aee1459b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 11 Feb 2021 20:02:27 +0100
Subject: [PATCH 1454/3482] linux4.14: update to 4.14.221

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 97a9826f9a48..7fa8117415d1 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
-version=4.14.217
+version=4.14.221
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=62a36a25431016d98d0f1cff98be432086c51f86fd79042bd10a867b3a924d11
+checksum=ce2254075ff4846f13380c1cf4bec1e351e5996a7dd109c200e222e49fd2c7e9
 python_version=2 #unverified
 patch_args="-Np1"
 

From efbea28571e29a7a1992795ab01ca0182b810e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:39 +0100
Subject: [PATCH 1455/3482] filelight: update to 20.12.2.

---
 srcpkgs/filelight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 786f00ef2137..ef21de2f96db 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=91c82cc19aa3541885c1dbe8a849d99d79d7a025fba81de2b0401419f050f14c
+checksum=d8108940ab96933e6edec39e16f693d9f37b5d91e4d9d873baf19f9f018d6854

From 024195630fd8bcbe594135ba6986698f7c793300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:40 +0100
Subject: [PATCH 1456/3482] kcachegrind: update to 20.12.2.

---
 srcpkgs/kcachegrind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index dce27d6d0a0e..4c1f3081dfce 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=b1477c26106d142111b050f542b6b91cc8756eafb0cb2c77cd44b5e56bf0066c
+checksum=5c788e531d785126e0186585829b4d4f1f77fbbbe81a60e74f20e1ea3a249045
 python_version=2

From 80974816260689700f37b3573daaff672d7b1a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:40 +0100
Subject: [PATCH 1457/3482] kcron: update to 20.12.2.

---
 srcpkgs/kcron/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 3081e78fdacb..54d60c87a2dc 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=ac850bec99fd0da08b9a3ad7f48c133a4a20aa1b3f1302a799fc75d8155faa07
+checksum=256d70a1bde74691900a2291d6a75d128490a3a4166f4491294504fa0f31aa08

From d4343d9cf2f4c789f2e6124ba32521d9c3cf666c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:41 +0100
Subject: [PATCH 1458/3482] kdialog: update to 20.12.2.

---
 srcpkgs/kdialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index a5f7b0491239..42bfbc8054de 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=c481729a5757d1668da648005b48b711eb4cb6fc7c6e7249343b45ac065bc68e
+checksum=ad8b87d6c92821de027cabb4ac242536ecc0d0b43550dc9f14503c7c3b755eec

From 8a11e626d59cd44569b5800c68fb718194d5eaf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:42 +0100
Subject: [PATCH 1459/3482] keditbookmarks: update to 20.12.2.

---
 srcpkgs/keditbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 54f2e86f796a..ce6b96bef224 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=373563cb447a7894acc7aaf8aa7cb39d5ac1d85325a43ac2ad0d7f2ee8fd81a8
+checksum=a7ad62388d8bf4ebce075abb270d8f7b283cd97a368293b6c895819a7750956a
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 59268543ffd6cfc268c6be9057554d5a2d44df42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:43 +0100
Subject: [PATCH 1460/3482] kfind: update to 20.12.2.

---
 srcpkgs/kfind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index e7adb6e46c08..d18b0b40baa3 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=b74934cba40298969f3cf7fb620fd8437c8e90f367abe559673e08411bc19d66
+checksum=cb329fa0aefc42afe1176e646e506ac566efa7e134ae173e690733cb6f2cd16d

From effac6d6f5a855df84e0eab7108c15e609cc45cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:44 +0100
Subject: [PATCH 1461/3482] kig: update to 20.12.2.

---
 srcpkgs/kig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 432c0423549e..aebe2b3ec2c3 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=3feabd92c5b4975c682e80f0b8038c4447b5f29ad0f2e4b194e70a8126cc445b
+checksum=3fcff749073feb233cb2b25679d42c5776e5578ee43bb03091c27d98a77f9b23

From 5fe0c4e2d4bb026172165cb23b0576a19088ae7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:45 +0100
Subject: [PATCH 1462/3482] kmag: update to 20.12.2.

---
 srcpkgs/kmag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 09b3f2320503..df43caa315af 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=12728dbb62fab21f63156859a08fd5694c668025c6b5ecdae7e48ab97cf09f54
+checksum=dbe79175edcc1d4d20969b6ddb8953e0a51f11be586b7dda68034fc4862d96ef

From e659e12be6cb08cb119328c336d99fce66bb16fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:46 +0100
Subject: [PATCH 1463/3482] kmix: update to 20.12.2.

---
 srcpkgs/kmix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index dd7e40d5417c..c510456a6c80 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=17c5bb01ddb61945439a116fc6615794a97b1e204f245e45b6255b5ec7f832e0
+checksum=b33bfe899bf36729f64a9f3a42b8bf48a49b745afc8af15638dd2f2a7c90718a

From 5601c8db7c4c44afdc65abf9064f0baab8fc96aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:47 +0100
Subject: [PATCH 1464/3482] kolourpaint: update to 20.12.2.

---
 srcpkgs/kolourpaint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 6117d372f67d..1db4466b7816 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=5ee17da9790d931953acedeebc434e11edb2f3e9a8593183913b47985c7e5ca8
+checksum=d699f2e56234eda8787c9ddc20904248cc87c7c4468d9e6254fc659c7202eb8e
 
 post_install() {
 	vlicense COPYING

From 838ae7d56ef6bf081033900dfc4494c34c5b409a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:48 +0100
Subject: [PATCH 1465/3482] kompare: update to 20.12.2.

---
 srcpkgs/kompare/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index cbcf20b85ef8..eb68b4bec250 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=10b32f0556e8094ab6276c66d018310e47be0314c915ad9872f4f7737f43b18d
+checksum=bbf60a63fb1b8ac89191ab18d3eb437e9da2ee8fb460b1fc5b95f3290ad7c5a2

From d7698efedbdf372aeaab01f6120d2faf6e8af429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:49 +0100
Subject: [PATCH 1466/3482] kpat: update to 20.12.2.

---
 srcpkgs/kpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 8b338960fc7f..a7a681fb2eba 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,7 +13,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=a9186b51156307060186b9546947f77f9cfe72c287cd863a01b17309f189a3cd
+checksum=dd7a168ed23410d9306a24fc0b80c037764be39e70a635477f8c2fa506199bbd
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 43ce8909a2895ba1aa456e19b9aa6d088ee79706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:50 +0100
Subject: [PATCH 1467/3482] kruler: update to 20.12.2.

---
 srcpkgs/kruler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 7fc152eb110f..7e5714b7219d 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=78c02e727b0fa8d26fe35dfa1a1c479b01061ee7c78df748bccdae438c4e3fca
+checksum=4a26ebf5739c1f863c408e03e8f6737aff9254ff64bf557ea9431cb295835e75

From 33d63b97fa92775724ae61abfe236a42690af002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:50 +0100
Subject: [PATCH 1468/3482] ksystemlog: update to 20.12.2.

---
 srcpkgs/ksystemlog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 7750d20dabe0..076160e3dbb9 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=80f51e5dc1dcc6a7479ab4c2a10d39e04ef9ffe822f00e766f8c7182b5d16514
+checksum=8751b926e271c1fcce858de7ac535eab59af56eabee6a834c2e5de58e6bcd9bb
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From c4aca04a8611ffa3741add96356dd4dc08b3216d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:51 +0100
Subject: [PATCH 1469/3482] kteatime: update to 20.12.2.

---
 srcpkgs/kteatime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 93fcf6dda0aa..61a49d390693 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=fd9b504cc37c4acf495a31c576048a53f735e8d93024e7230be6a3343c1f2c49
+checksum=2d22abb604e7dc4024c049eac866fa4cce19d09e390cadb130adb2fcd4b637a3

From 951f6f7303cdfe06c96dc42bdbee9b18ddf2c369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:52 +0100
Subject: [PATCH 1470/3482] kturtle: update to 20.12.2.

---
 srcpkgs/kturtle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index bf3d351ed21e..ddf72e8cd12b 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=6b79f2f60517656501f6af0590f8464d37c698b88b7806c661fb4ac89626598a
+checksum=20432e903bc20e832d921019215d1307a561243ef7369ed0a1e95979a46186a8

From df0e1f0c1b6df648b1c463535439e4d078ba9f5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:53 +0100
Subject: [PATCH 1471/3482] kwalletmanager: update to 20.12.2.

---
 srcpkgs/kwalletmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 425f3d74adc6..b785d8a24134 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=72ab9cd2a53b9cc7db144b712ef18d81b23de3ff6b05d92f961b9bff65174f5b
+checksum=3c76f5c4a62b8ad1cab6532537120e5b4a4dca936b68d3a97ef10283ce1d9d0a

From c1e60dc3b5844ae695d7998152d586ce608072dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:54 +0100
Subject: [PATCH 1472/3482] libkcddb: update to 20.12.2.

---
 srcpkgs/libkcddb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 96e175a0fcea..8e31f9dbca18 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=f3688d66a3026d5355a340e2d9a9e669d5b70afe187789ca7a0919713c257e1e
+checksum=13a95d83e61f664ff35b99f9942442c3a443f4ed0f57652756fdfa72d863a7df
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 380490a8331594e19f1f691b32125ce230064d44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:55 +0100
Subject: [PATCH 1473/3482] libkomparediff2: update to 20.12.2.

---
 srcpkgs/libkomparediff2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 0cf9e8ac86a5..e58db295bb2b 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=c3a79ea99dd4f4a72db628f46720049960e6b948f5e14b97a7857e04e1c67412
+checksum=a98555dd0a8ee86c08db3f0f20d50de0f4f82e77e7ba2fcf643b7e88031dd60d
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 33eed2a2ef9786a2a4fe43b40e162ffeaa31cdbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:56 +0100
Subject: [PATCH 1474/3482] svgpart: update to 20.12.2.

---
 srcpkgs/svgpart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 58a03476fb47..4afcdd7dabb3 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=3eb7fe2ebb6cd32fc86fcb659189dd7e84ecda88019456ef7d8873a58bbbc026
+checksum=923fea513a1e95033d9ed02ca6884aa978a1b6424d4961d69e2fa1f5746938ec

From 68aefd3efedd1c0bcdf3699e56ebc04c6859ceee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:57 +0100
Subject: [PATCH 1475/3482] umbrello: update to 20.12.2.

---
 srcpkgs/umbrello/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 5744aaa0ce40..9646350471f0 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=74a787947b670024c8a39fc8fb764fba1e79dfcc2664390b903dd85fb8efdd1d
+checksum=4e4fdc0cbff6d578d6e2510c186a27e402995d35265ac203e100e6950c61f17f
 python_version=2
 
 pre_configure() {

From 2de92e47397c39c4a832f1d68682de631e78100b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 11 Feb 2021 20:41:58 +0100
Subject: [PATCH 1476/3482] yakuake: update to 20.12.2.

---
 srcpkgs/yakuake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index fd176e7eb3a2..ca369503b3ca 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,6 +1,6 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=4a0d934335ec74e4a09b73792ad7a6587adb035742ef1adbe177f1d07ba2ea0a
+checksum=c4664a037ba01e25665720cbb540a09586909e0557ed4c4fb6cabb6e68ff399a

From 5cfa1e2ce3fcd62648c55994643a8ca8e3df0aa6 Mon Sep 17 00:00:00 2001
From: Alex Childs <misuchiru03+void@gmail.com>
Date: Thu, 11 Feb 2021 10:57:33 -0600
Subject: [PATCH 1477/3482] python3-shodan: update to 1.25.0

---
 srcpkgs/python3-shodan/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-shodan/template b/srcpkgs/python3-shodan/template
index 5900d6ce7d10..ad3bab903a3c 100644
--- a/srcpkgs/python3-shodan/template
+++ b/srcpkgs/python3-shodan/template
@@ -1,18 +1,21 @@
 # Template file for 'python3-shodan'
 pkgname=python3-shodan
-version=1.24.0
+version=1.25.0
 revision=1
 wrksrc="shodan-python-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-click python3-click-plugins python3-colorama
  python3-requests python3-XlsxWriter"
+checkdepends="${depends}"
 short_desc="Python library and CLI for Shodan"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="MIT"
 homepage="https://developer.shodan.io"
 distfiles="https://github.com/achillean/shodan-python/archive/${version}.tar.gz"
-checksum=10ab5187de136aeec417c636a7ab33ab7432021143a2b71f31a55bc4d6e3c743
+checksum=52932c6d508622877d0667e0290fee84e6cb749b6565b48ba359fbbf002f0845
+make_check=extended
+# One must export the variable SHODAN-API-KEY in env before running tests
 
 post_install() {
 	vlicense LICENSE

From 3b6958f413c5379d4ff22f1de21715cf0d676cc1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 11 Feb 2021 20:58:33 +0100
Subject: [PATCH 1478/3482] janet: update to 1.15.0.

---
 common/shlibs          | 2 +-
 srcpkgs/janet/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c9d19402628a..4f052075d837 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3860,7 +3860,7 @@ libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.8 libcbor-0.8.0_1
 libfido2.so.1 libfido2-1.3.0_1
-libjanet.so.1.14 janet-1.14.1_1
+libjanet.so.1.15 janet-1.15.1_1
 libOpenImageDenoise.so.0 openimagedenoise-1.2.0_1
 libcbang0.so cbang-1.3.3_1
 libblosc.so.1 c-blosc-1.17.1_1
diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 9c3c160bf501..7710d8265a1e 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.14.2
+version=1.15.0
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://janet-lang.org/"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=587715eddbe007cbd33f16c89cc3aabc67a69196669b3c6995ce983dc00b54fb
+checksum=e2cf16b330e47c858a675ac79b5a0af83727ff041efcb133a80f36bedfae57c4
 
 post_install() {
 	vlicense LICENSE

From 2ca6b0872b8dc459bb49897434f11ab3a2c1a510 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 11 Feb 2021 20:59:40 +0100
Subject: [PATCH 1479/3482] kubefwd: update to 1.17.4.

---
 srcpkgs/kubefwd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 664c1394091c..c9de916a783d 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,6 +1,6 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
-version=1.17.3
+version=1.17.4
 revision=1
 build_style=go
 go_import_path="github.com/txn2/kubefwd/cmd/kubefwd"
@@ -9,8 +9,8 @@ short_desc="Bulk port forwarding Kubernetes services for local development"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/txn2/kubefwd"
-distfiles="https://github.com/txn2/kubefwd/archive/${version}.tar.gz"
-checksum=8e8f90fe2820e0e533470be1bc625bef90f12aace9ca3251f3dfc25187777f5f
+distfiles="https://github.com/txn2/kubefwd/archive/v${version}.tar.gz"
+checksum=96840482139a8d55d9b41d239f4287271a9339a4f3b18aee994d0da2b26705f3
 
 post_install() {
 	vlicense NOTICE

From 6a5d26dc94ac1c8a16487d6314e15f94f19b67de Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 11 Feb 2021 21:00:23 +0100
Subject: [PATCH 1480/3482] pax-utils: update to 1.2.9.

---
 srcpkgs/pax-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pax-utils/template b/srcpkgs/pax-utils/template
index 97c18b4ac21a..f72f65b9a36e 100644
--- a/srcpkgs/pax-utils/template
+++ b/srcpkgs/pax-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'pax-utils'
 pkgname=pax-utils
-version=1.2.8
+version=1.2.9
 revision=1
 build_style=gnu-configure
 configure_args="--with-caps"
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://cgit.gentoo.org/proj/pax-utils.git/"
 distfiles="https://gentoo.osuosl.org/distfiles/${pkgname}-${version}.tar.xz"
-checksum=bab4c8846e1d2cc3669cfa9231d21db335841d7d58f9e19cd099fe6ce626b157
+checksum=ebcec269dc9b9876d73bd33a8d00d567e3946ade94d970d5cb2b0cfcac2988b2

From 5792a6847634b2342cdfe7f095d78fe026c6418b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 11 Feb 2021 21:01:23 +0100
Subject: [PATCH 1481/3482] vttest: update to 20210210.

---
 srcpkgs/vttest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vttest/template b/srcpkgs/vttest/template
index 595b4df74827..b0f34c67516f 100644
--- a/srcpkgs/vttest/template
+++ b/srcpkgs/vttest/template
@@ -1,6 +1,6 @@
 # Template file for 'vttest'
 pkgname=vttest
-version=20201225
+version=20210210
 revision=1
 build_style=gnu-configure
 short_desc="Tests the compatibility so-called 'VT100-compatible' terminals"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="http://invisible-island.net/vttest/vttest.html"
 distfiles="http://invisible-mirror.net/archives/${pkgname}/${pkgname}-${version}.tgz"
-checksum=069db5efca2325280bc14ffe14ff7085e3ddfe6ae152499155daa28d94b90421
+checksum=0f98a2e305982915f1520984c3e8698e3acd508ee210711528c89f5a7ea7f046
 
 post_install() {
 	vlicense COPYING

From 08aa07500836e054168b6b5d3821a0d8c734a7aa Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 22:04:48 +0100
Subject: [PATCH 1482/3482] gpgme: update to 1.15.1.

---
 srcpkgs/gpgme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index 91b76955d6ab..072da12708d4 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,6 +1,6 @@
 # Template file for 'gpgme'
 pkgname=gpgme
-version=1.15.0
+version=1.15.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-fd-passing
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnupg.org/software/gpgme/index.html"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2"
-checksum=0b472bc12c7d455906c8a539ec56da0a6480ef1c3a87aa5b74d7125df68d0e5b
+checksum=eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" ac_cv_sys_file_offset_bits=no"

From 36c18338d8016777e56ac3d183185776656e52f7 Mon Sep 17 00:00:00 2001
From: Alex Childs <misuchiru03+void@gmail.com>
Date: Thu, 11 Feb 2021 14:29:12 -0600
Subject: [PATCH 1483/3482] python3-XlsxWriter: update to 1.3.7

---
 srcpkgs/python3-XlsxWriter/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-XlsxWriter/template b/srcpkgs/python3-XlsxWriter/template
index f7374c7a9a38..fea90638031d 100644
--- a/srcpkgs/python3-XlsxWriter/template
+++ b/srcpkgs/python3-XlsxWriter/template
@@ -1,17 +1,16 @@
 # Template file for 'python3-XlsxWriter'
 pkgname=python3-XlsxWriter
-version=1.1.8
-revision=3
+version=1.3.7
+revision=1
 wrksrc="XlsxWriter-RELEASE_${version}"
 build_style=python3-module
-pycompile_module="XlsxWriter"
 hostmakedepends="python3-setuptools"
 short_desc="Python3 module for creating Excel XLSX files"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://xlsxwriter.readthedocs.io/"
 distfiles="https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_${version}.tar.gz"
-checksum=b9311ec075693be4c0bc6ebbe292bbdac21399f863cb0c4e55100a561d67a56d
+checksum=b08a1b30cde383cf3b09b50fa18fbfca28ec977e5df9ffab89f01a2ca93be2c1
 
 post_install() {
 	vlicense LICENSE.txt

From 1feba53d81b3c825700ee07cc88dd58f139af7eb Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 11 Feb 2021 17:39:56 +0000
Subject: [PATCH 1484/3482] xfce4-taskmanager: update to 1.4.2.

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index 9b7dd16b34a7..cdf36c3cddc6 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
-version=1.4.1
+version=1.4.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,4 +12,4 @@ maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-taskmanager"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=1141d2fde7bd498ccc2ce063800721e3ebb62dc9c9278cf1e2842df474965b5b
+checksum=cd122240e1c195e4e6f159da1bb86b38c41ba27892399ad85a18c37ea20e48f9

From 0f87fcc60052a3c46d09be67395d16c61ce7d7b6 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 21:54:06 +0100
Subject: [PATCH 1485/3482] scrot: update to 1.5.

---
 srcpkgs/scrot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 1e73d6a5deaf..fe8ae3006c5a 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,6 +1,6 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.4
+version=1.5
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
@@ -11,7 +11,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=e19eec69bcdc249917c452270e1c8f28188003b052c352e25999b281cb03510c
+checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
 
 pre_configure() {
 	./autogen.sh

From cd47afa53b27a024d91abc378b697f9962f819f2 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 11 Feb 2021 11:16:35 +0100
Subject: [PATCH 1486/3482] xterm: update to 366.

Fixes CVE-2021-27135.

Closes: #28660 [via git-merge-pr]
---
 srcpkgs/xterm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index 70f3b03bdb9e..072a34dd92a5 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -1,6 +1,6 @@
 # Template file for 'xterm'
 pkgname=xterm
-version=365
+version=366
 revision=1
 build_style=gnu-configure
 configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc
@@ -20,7 +20,7 @@ license="MIT, X11"
 homepage="http://invisible-island.net/xterm/"
 changelog="http://invisible-island.net/xterm/xterm.log.html"
 distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
-checksum=d627d2b005803b4ebcdf04f2d89e3e1d2878235d2ecdfa73d904bb1772a74f90
+checksum=858b2885963fe97e712739066aadc1baeba2b33a0016303a7fec7d38bc73bf6e
 
 post_install() {
 	for f in {u,}xterm.desktop; do

From 6ab62aa1990ccecdc751ead488df4e2bbb7f185c Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Thu, 11 Feb 2021 14:53:01 -0600
Subject: [PATCH 1487/3482] tmuxc: update to 1.8.

---
 srcpkgs/tmuxc/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tmuxc/template b/srcpkgs/tmuxc/template
index 384bcaff1b63..73905ec16c9a 100644
--- a/srcpkgs/tmuxc/template
+++ b/srcpkgs/tmuxc/template
@@ -1,16 +1,17 @@
 # Template file for 'tmuxc'
 pkgname=tmuxc
-version=1.7.1
-revision=2
+version=1.8
+revision=1
 depends="perl"
 short_desc="Local and remote tmux window manager"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"
 homepage="https://github.com/zdykstra/tmuxc"
 distfiles="https://github.com/zdykstra/${pkgname}/archive/v${version}.tar.gz"
-checksum=7bd7596d962b7e14617346e6b9e364420402de90663fa4d3b551a9a9f25453a4
+checksum=fb9e6352e783cc9697887eb2e52e943685125fa97ba87ea001decb8dcd89b0c0
 
 do_install() {
 	vbin tmuxc
+	vman tmuxc.1
 	vlicense LICENSE
 }

From be764442babf4ea06489442de687637fa41d15c4 Mon Sep 17 00:00:00 2001
From: TC <git@titouan.co>
Date: Thu, 11 Feb 2021 10:41:52 +0100
Subject: [PATCH 1488/3482] tailscale: update to 1.4.4.

---
 srcpkgs/tailscale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 9032d1511d11..7d7cbc1783c9 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.2.2
+version=1.4.4
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=10d731adafc6b7535e4f53fe22de73bc7371d0e40bcdd9c08f6f8abd5ff9030f
+checksum=5312c6d075a32049912e0932a89269869def9ac8ea9d0fdccc6b41db60fc2d4c
 
 post_install() {
 	vlicense LICENSE

From 3a8f289483a4efca74f5f9da2a79d016bfad8acd Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 11 Feb 2021 17:20:36 +0000
Subject: [PATCH 1489/3482] Thunar: update to 4.16.3.

---
 srcpkgs/Thunar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index befa4cc39b80..c15c515d944f 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,7 +1,7 @@
 # Template file for 'Thunar'
 pkgname=Thunar
 reverts="4.17.0_1"
-version=4.16.2
+version=4.16.3
 revision=1
 wrksrc=thunar-${version}
 build_style=gnu-configure
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://docs.xfce.org/xfce/thunar/Start"
 changelog="https://raw.githubusercontent.com/xfce-mirror/thunar/master/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=67a90b98c436192f9aa6cd18a22a089e713007864aebfa65f36f121c86ba7add
+checksum=5524dc89da6f1492a5644214be210c4c2d359723a1f8be3e795ea974f2d1ff72
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd

From d8c8ab89091cc1354a6d6fce2c511801720853e9 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 22:14:45 +0100
Subject: [PATCH 1490/3482] libcap: update to 2.48.

By ericonr:
- add changelog

Closes: #28649 [via git-merge-pr]
---
 srcpkgs/libcap/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 2777af1804a6..a446d717a84a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.46
+version=2.48
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -12,8 +12,9 @@ short_desc="POSIX.1e capabilities suite"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
+changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=4ed3d11413fa6c9667e49f819808fbb581cd8864b839f87d7c2a02c70f21d8b4
+checksum=4de9590ee09a87c282d558737ffb5b6175ccbfd26d580add10df44d0f047f6c2
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"

From 41b46c8ec0f18001378ad37cbbd4d9b599e0f2b0 Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Thu, 11 Feb 2021 21:57:31 +0100
Subject: [PATCH 1491/3482] master-pdf-editor: update to 5.7.20

---
 srcpkgs/master-pdf-editor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index fe038ac2cb09..6909faf947bb 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.6.20
+version=5.7.20
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,7 +10,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=2454dc2f3b4a4a98962ec4721cb1d27de5e8282056bf062ff700138460957d20
+checksum=d5f79a58028df1a9f3bac5220e620d33ddf65463544fdae0d486359081d6ce53
 nostrip=yes
 repository=nonfree
 restricted=yes

From 5bb3316f2c59e27cb8cdc9b8d8625753cab80323 Mon Sep 17 00:00:00 2001
From: Dmytro Shynkevych <dm.shynk@gmail.com>
Date: Sun, 24 Jan 2021 16:50:50 -0500
Subject: [PATCH 1492/3482] gopass: update to 1.12.0.

---
 srcpkgs/gopass/template | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template
index 2f6f5c860fae..2b3964146abc 100644
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@@ -1,8 +1,9 @@
 # Template file for 'gopass'
 pkgname=gopass
-version=1.10.1
-revision=2
+version=1.12.0
+revision=1
 build_style=go
+build_helper=qemu
 go_import_path=github.com/gopasspw/gopass
 go_package="${go_import_path} ${go_import_path}/cmd/..."
 makedepends="gnupg2"
@@ -13,29 +14,19 @@ license="MIT"
 homepage="https://www.gopass.pw/"
 changelog="https://raw.githubusercontent.com/gopasspw/gopass/master/CHANGELOG.md"
 distfiles="https://github.com/gopasspw/gopass/archive/v${version}.tar.gz"
-checksum=f4bfe03bc26701baf411795faafe774aa6025bc6050ab3ebf7e931e5ff821961
-
-if [ "$CROSS_BUILD" ]; then
-	# Depend on system gopass to generate completions
-	hostmakedepends+=" gopass"
-fi
+checksum=73b7c5c8367e664d85871fba88f4fa806ef0fb75047c767a72b8516dea6f64b3
 
 post_build() {
-	local GOPASS=${GOPATH}/bin/gopass
-	local completions=(zsh bash fish)
-
-	if [ "$CROSS_BUILD" ]; then
-		GOPASS=/usr/bin/gopass
-	fi
-
-	for completion in "${completions[@]}"; do
-		$GOPASS completion $completion > ${completion}.completion;
+	gopass=$(find $GOPATH/bin -name gopass)
+	for shell in bash fish zsh; do
+		vtargetrun $gopass completion $shell > completion.$shell
 	done
 }
 
 post_install() {
-	install -Dm0755 zsh.completion ${DESTDIR}/usr/share/zsh/site-functions/_gopass
-	install -Dm0755 bash.completion ${DESTDIR}/usr/share/bash-completion/completions/gopass
-	install -Dm0755 fish.completion ${DESTDIR}/usr/share/fish/vendor_completions.d/gopass.fish
 	vlicense LICENSE
+
+	for shell in bash fish zsh; do
+		vcompletion completion.$shell $shell
+	done
 }

From 52c8755c196491678d8a27ba5ffbcb9ab746ae52 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 11 Feb 2021 11:57:46 +0100
Subject: [PATCH 1493/3482] gpick: update to 0.2.6.

-Switch to cmake (as advised by upstream)
-Use GTK3 instead of GTK2

Closes: #28661 [via git-merge-pr]
---
 srcpkgs/gpick/patches/scons-python3.patch | 145 ----------------------
 srcpkgs/gpick/template                    |  18 ++-
 2 files changed, 8 insertions(+), 155 deletions(-)
 delete mode 100644 srcpkgs/gpick/patches/scons-python3.patch

diff --git a/srcpkgs/gpick/patches/scons-python3.patch b/srcpkgs/gpick/patches/scons-python3.patch
deleted file mode 100644
index a257e73def8c..000000000000
--- a/srcpkgs/gpick/patches/scons-python3.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff --git SConscript SConscript
-index 43f9857..6065023 100644
---- SConscript
-+++ SConscript
-@@ -48,7 +48,7 @@ env.AddCustomBuilders()
- env.GetVersionInfo()
- 
- try:
--	umask = os.umask(022)
-+	umask = os.umask(0o22)
- except OSError:     # ignore on systems that don't support umask
- 	pass
- 
-@@ -81,56 +81,20 @@ if not env.GetOption('clean'):
- 
- 	env = conf.Finish()
- 
--if os.environ.has_key('CC'):
-+if 'CC' in os.environ:
- 	env['CC'] = os.environ['CC']
--if os.environ.has_key('CFLAGS'):
-+
-+if 'CFLAGS' in os.environ:
- 	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
--if os.environ.has_key('CXX'):
-+if 'CXX' in os.environ:
- 	env['CXX'] = os.environ['CXX']
--if os.environ.has_key('CXXFLAGS'):
-+if 'CXXFLAGS' in os.environ:
- 	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
--if os.environ.has_key('LDFLAGS'):
-+if 'LDFLAGS' in os.environ:
- 	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
- 	
- Decider('MD5-timestamp')
- 
--if not env['TOOLCHAIN'] == 'msvc':
--	if not (os.environ.has_key('CFLAGS') or os.environ.has_key('CXXFLAGS') or os.environ.has_key('LDFLAGS')):
--		if env['DEBUG']:
--			env.Append(
--				CPPFLAGS = ['-Wall', '-g3', '-O0'],
--				CFLAGS = ['-Wall', '-g3', '-O0'],
--				LINKFLAGS = ['-Wl,-as-needed'],
--				)
--		else:
--			env.Append(
--				CPPDEFINES = ['NDEBUG'],
--				CDEFINES = ['NDEBUG'],
--				CPPFLAGS = ['-Wall', '-O3'],
--				CFLAGS = ['-Wall', '-O3'],
--				LINKFLAGS = ['-Wl,-as-needed', '-s'],
--				)
--
--	if env['BUILD_TARGET'] == 'win32':
--		env.Append(	
--				LINKFLAGS = ['-Wl,--enable-auto-import', '-static-libgcc', '-static-libstdc++'],
--				CPPDEFINES = ['_WIN32_WINNT=0x0501'],
--				)
--else:
--	env['LINKCOM'] = [env['LINKCOM'], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;1']
--	if env['DEBUG']:
--		env.Append(
--				CPPFLAGS = ['/Od', '/EHsc', '/MD', '/Gy', '/Zi', '/TP', '/wd4819'],
--				CPPDEFINES = ['WIN32', '_DEBUG'],
--				LINKFLAGS = ['/MANIFEST', '/DEBUG'],
--			)
--	else:
--		env.Append(
--				CPPFLAGS = ['/O2', '/Oi', '/GL', '/EHsc', '/MD', '/Gy', '/Zi', '/TP', '/wd4819'],
--				CPPDEFINES = ['WIN32', 'NDEBUG'],
--				LINKFLAGS = ['/MANIFEST', '/LTCG'],
--			)
--			
- extern_libs = SConscript(['extern/SConscript'], exports='env')
- executable, parser_files = SConscript(['source/SConscript'], exports='env')
- 
-diff --git source/SConscript source/SConscript
-index b78bfb5..ca42710 100644
---- source/SConscript
-+++ source/SConscript
-@@ -50,6 +50,8 @@ if local_env['BUILD_TARGET'] == 'win32':
- elif local_env['BUILD_TARGET'] == 'linux2':
- 	local_env.Append(LIBS=['rt', 'expat'])
- 
-+local_env.Append(LIBS=['expat'])
-+
- executable = local_env.Program(
- 	'gpick',
- 	source = [sources, objects])
-diff --git tools/gpick.py tools/gpick.py
-index 29000a6..5aecfe8 100644
---- tools/gpick.py
-+++ tools/gpick.py
-@@ -9,10 +9,10 @@ import sys
- import glob
- import subprocess
- 
--from lemon import *
--from flex import *
--from gettext import *
--from resource_template import *
-+from .lemon import *
-+from .flex import *
-+from .gettext import *
-+from .resource_template import *
- 
- from SCons.Script import *
- from SCons.Util import *
-@@ -79,9 +79,9 @@ class GpickEnvironment(SConsEnvironment):
- 	def ConfirmPrograms(self, conf, programs):
- 		conf.AddTests({'CheckProgram': CheckProgram})
- 		
--		for evar, args in programs.iteritems():
-+		for evar, args in programs.items():
- 			found = False
--			for name, member_name in args['checks'].iteritems():
-+			for name, member_name in args['checks'].items():
- 				if conf.CheckProgram(self, name, member_name):
- 					found = True;
- 					break
-@@ -95,9 +95,9 @@ class GpickEnvironment(SConsEnvironment):
- 	def ConfirmLibs(self, conf, libs):
- 		conf.AddTests({'CheckPKG': CheckPKG})
- 		
--		for evar, args in libs.iteritems():
-+		for evar, args in libs.items():
- 			found = False
--			for name, version in args['checks'].iteritems():
-+			for name, version in args['checks'].items():
- 				if conf.CheckPKG(name + ' ' + version):
- 					self[evar]=name
- 					found = True;
-@@ -127,9 +127,9 @@ class GpickEnvironment(SConsEnvironment):
- 				self.AddPostAction(i, Chmod(i, perm))
- 		return dir
- 
--	InstallProgram = lambda self, dir, source: GpickEnvironment.InstallPerm(self, dir, source, 0755)
--	InstallData = lambda self, dir, source: GpickEnvironment.InstallPerm(self, dir, source, 0644)
--	InstallDataAutoDir = lambda self, dir, relative_dir, source: GpickEnvironment.InstallPermAutoDir(self, dir, relative_dir, source, 0644)
-+	InstallProgram = lambda self, dir, source: GpickEnvironment.InstallPerm(self, dir, source, 0o755)
-+	InstallData = lambda self, dir, source: GpickEnvironment.InstallPerm(self, dir, source, 0o644)
-+	InstallDataAutoDir = lambda self, dir, relative_dir, source: GpickEnvironment.InstallPermAutoDir(self, dir, relative_dir, source, 0o644)
- 
- 	def GetSourceFiles(self, dir_exclude_pattern, file_exclude_pattern):
- 		dir_exclude_prog = re.compile(dir_exclude_pattern)
diff --git a/srcpkgs/gpick/template b/srcpkgs/gpick/template
index 5a538a068f2b..b30108334144 100644
--- a/srcpkgs/gpick/template
+++ b/srcpkgs/gpick/template
@@ -1,21 +1,19 @@
 # Template file for 'gpick'
 pkgname=gpick
-version=0.2.5
-revision=5
+version=0.2.6
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
-build_style=scons
-hostmakedepends="gettext pkg-config"
-makedepends="boost-devel gtk+-devel lua52-devel expat-devel"
+build_style=cmake
+hostmakedepends="gettext pkg-config ragel"
+makedepends="boost-devel gtk+3-devel lua52-devel expat-devel"
 short_desc="Advanced color picker written in C++ using GTK+ toolkit"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-3-Clause"
 homepage="https://github.com/thezbyg/gpick"
 distfiles="https://github.com/thezbyg/gpick/archive/${pkgname}-${version}.tar.gz"
-checksum=3a9706c101f82e9a49880db9fb408c760d49e6b4506ee5768962c25ec2ecbb57
+checksum=7d02be171cc88c44ad3e3572c0922bbabedc9d542b989f324fca9d5db3161e9c
 
-do_install() {
-	scons DESTDIR=${DESTDIR}/usr install
+post_install() {
 	rm -rf ${DESTDIR}/usr/share/doc
-	vlicense installer/License.txt LICENSE
+	vlicense LICENSE.txt LICENSE
 }
-

From fd0ac60e171249ba83bdd774311101c1cf5b656f Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 22:47:38 +0100
Subject: [PATCH 1494/3482] vorbis-tools: update to 1.4.2.

Closes: #28653 [via git-merge-pr]
---
 .../CVE-2014-9639-and-CVE-2014-9638.patch     | 84 -------------------
 .../vorbis-tools/patches/CVE-2014-9640.patch  | 25 ------
 .../vorbis-tools/patches/CVE-2015-6749.patch  | 42 ----------
 srcpkgs/vorbis-tools/template                 | 19 ++---
 4 files changed, 8 insertions(+), 162 deletions(-)
 delete mode 100644 srcpkgs/vorbis-tools/patches/CVE-2014-9639-and-CVE-2014-9638.patch
 delete mode 100644 srcpkgs/vorbis-tools/patches/CVE-2014-9640.patch
 delete mode 100644 srcpkgs/vorbis-tools/patches/CVE-2015-6749.patch

diff --git a/srcpkgs/vorbis-tools/patches/CVE-2014-9639-and-CVE-2014-9638.patch b/srcpkgs/vorbis-tools/patches/CVE-2014-9639-and-CVE-2014-9638.patch
deleted file mode 100644
index 975cc4054d2a..000000000000
--- a/srcpkgs/vorbis-tools/patches/CVE-2014-9639-and-CVE-2014-9638.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Petter Reinholdtsen <pere@debian.org>
-Date: Tue, 22 Sep 2015 15:14:06 +0200
-Subject: oggenc: validate count of channels in the header (CVE-2014-9638 &
- CVE-2014-9639)
-
-Author: Kamil Dudka <kdudka@redhat.com>
-Origin: http://lists.xiph.org/pipermail/vorbis-dev/2015-February/020423.html
-Bug: https://trac.xiph.org/ticket/2136
-Bug: https://trac.xiph.org/ticket/2137
-Bug-Debian: https://bugs.debian.org/776086
-Forwarded: not-needed
-Reviewed-By: Petter Reinholdtsen <pere@hungry.com>
-Last-Update: 2015-09-22
----
- oggenc/audio.c | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/oggenc/audio.c b/oggenc/audio.c
-index 05e42b3..1b3f179 100644
---- a/oggenc/audio.c
-+++ b/oggenc/audio.c
-@@ -13,6 +13,7 @@
- #include <config.h>
- #endif
- 
-+#include <limits.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -251,6 +252,7 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
-     aiff_fmt format;
-     aifffile *aiff = malloc(sizeof(aifffile));
-     int i;
-+    long channels;
- 
-     if(buf[11]=='C')
-         aifc=1;
-@@ -277,11 +279,16 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
-         return 0;
-     }
- 
--    format.channels = READ_U16_BE(buffer);
-+    format.channels = channels = READ_U16_BE(buffer);
-     format.totalframes = READ_U32_BE(buffer+2);
-     format.samplesize = READ_U16_BE(buffer+6);
-     format.rate = (int)read_IEEE80(buffer+8);
- 
-+    if(channels <= 0L || SHRT_MAX < channels)
-+    {
-+        fprintf(stderr, _("Warning: Unsupported count of channels in AIFF header\n"));
-+        return 0;
-+    }
-     aiff->bigendian = 1;
- 
-     if(aifc)
-@@ -412,6 +419,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen)
-     wav_fmt format;
-     wavfile *wav = malloc(sizeof(wavfile));
-     int i;
-+    long channels;
- 
-     /* Ok. At this point, we know we have a WAV file. Now we have to detect
-      * whether we support the subtype, and we have to find the actual data
-@@ -449,12 +457,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen)
-     }
- 
-     format.format =      READ_U16_LE(buf);
--    format.channels =    READ_U16_LE(buf+2);
-+    format.channels = channels = READ_U16_LE(buf+2);
-     format.samplerate =  READ_U32_LE(buf+4);
-     format.bytespersec = READ_U32_LE(buf+8);
-     format.align =       READ_U16_LE(buf+12);
-     format.samplesize =  READ_U16_LE(buf+14);
- 
-+    if(channels <= 0L || SHRT_MAX < channels)
-+    {
-+        fprintf(stderr, _("Warning: Unsupported count of channels in WAV header\n"));
-+        return 0;
-+    }
-+
-     if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */
-     {
-       if(len<40)
-
diff --git a/srcpkgs/vorbis-tools/patches/CVE-2014-9640.patch b/srcpkgs/vorbis-tools/patches/CVE-2014-9640.patch
deleted file mode 100644
index 96543f990306..000000000000
--- a/srcpkgs/vorbis-tools/patches/CVE-2014-9640.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/oggenc/oggenc.c
-+++ b/oggenc/oggenc.c
-@@ -98,4 +98,6 @@
-               0,0,0.f,
-               0, 0, 0, 0, 0};
-+    input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
-+      N_("RAW file reader")};
- 
-     int i;
-@@ -240,6 +242,4 @@
-         if(opt.rawmode)
-         {
--            input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
--                N_("RAW file reader")};
- 
-             enc_opts.rate=opt.raw_samplerate;
---- a/oggenc/skeleton.h
-+++ b/oggenc/skeleton.h
-@@ -42,5 +42,5 @@
-     ogg_int64_t start_granule;                             /* start granule value */
-     ogg_uint32_t preroll;                                   /* preroll */
--    unsigned char granule_shift; // a 8-bit field           /* 1 byte value holding the granule shift */
-+    unsigned char granule_shift;                            /* 1 byte value holding the granule shift */
-     char *message_header_fields;                            /* holds all the message header fields */
-     /* current total size of the message header fields, for realloc purpose, initially zero */
diff --git a/srcpkgs/vorbis-tools/patches/CVE-2015-6749.patch b/srcpkgs/vorbis-tools/patches/CVE-2015-6749.patch
deleted file mode 100644
index b6c5589f5d56..000000000000
--- a/srcpkgs/vorbis-tools/patches/CVE-2015-6749.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001
-From: Mark Harris <mark.hsj@gmail.com>
-Date: Sun, 30 Aug 2015 05:54:46 -0700
-Subject: [PATCH] oggenc: Fix large alloca on bad AIFF input
-
-Fixes #2212
----
- oggenc/audio.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/oggenc/audio.c b/oggenc/audio.c
-index 477da8c..4921fb9 100644
-
-Index: oggenc/audio.c
-===================================================================
---- a/oggenc/audio.c
-+++ b/oggenc/audio.c
-@@ -245,8 +245,8 @@ static int aiff_permute_matrix[6][6] =
- int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
- {
-     int aifc; /* AIFC or AIFF? */
--    unsigned int len;
--    unsigned char *buffer;
-+    unsigned int len, readlen;
-+    unsigned char buffer[22];
-     unsigned char buf2[8];
-     aiff_fmt format;
-     aifffile *aiff = malloc(sizeof(aifffile));
-@@ -269,9 +269,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
-         return 0; /* Weird common chunk */
-     }
- 
--    buffer = alloca(len);
--
--    if(fread(buffer,1,len,in) < len)
-+    readlen = len < sizeof(buffer) ? len : sizeof(buffer);
-+    if(fread(buffer,1,readlen,in) < readlen ||
-+       (len > readlen && !seek_forward(in, len-readlen)))
-     {
-         fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
-         return 0;
-
diff --git a/srcpkgs/vorbis-tools/template b/srcpkgs/vorbis-tools/template
index d4589762f4df..e1f2f6750054 100644
--- a/srcpkgs/vorbis-tools/template
+++ b/srcpkgs/vorbis-tools/template
@@ -1,16 +1,13 @@
 # Template file for 'vorbis-tools'
 pkgname=vorbis-tools
-version=1.4.0
-revision=4
-patch_args="-Np1"
+version=1.4.2
+revision=1
+build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libogg-devel libvorbis-devel libao-devel libflac-devel libcurl-devel speex-devel"
-build_style=gnu-configure
-maintainer="Philipp Hirsch <itself@hanspolo.net>"
-license="GPL-2"
-homepage="http://www.vorbis.com/"
-distfiles="http://downloads.xiph.org/releases/vorbis/${pkgname}-${version}.tar.gz"
-checksum=a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc
 short_desc="Tools for Vorbis-Codecs e.g. oggenc and oggdec"
-
-LDFLAGS="-lm"
+maintainer="Philipp Hirsch <itself@hanspolo.net>"
+license="GPL-2.0-only"
+homepage="https://xiph.org/vorbis/"
+distfiles="https://downloads.xiph.org/releases/vorbis/${pkgname}-${version}.tar.gz"
+checksum=db7774ec2bf2c939b139452183669be84fda5774d6400fc57fde37f77624f0b0

From 1ada4ba6c155be7d55d7079e3f734af840fe0319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 11 Feb 2021 18:37:42 -0300
Subject: [PATCH 1495/3482] gpick: fix cross.

Pushing 52c8755c196491678d8a27ba5ffbcb9ab746ae52 was slightly
accidental, and it was missing the patch for cross to work.
---
 srcpkgs/gpick/patches/cmake.patch | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/gpick/patches/cmake.patch

diff --git a/srcpkgs/gpick/patches/cmake.patch b/srcpkgs/gpick/patches/cmake.patch
new file mode 100644
index 000000000000..1426ce09592c
--- /dev/null
+++ b/srcpkgs/gpick/patches/cmake.patch
@@ -0,0 +1,26 @@
+From 5445921d0c3827758f3ad7946b9aa7b37d6d7d19 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira=20Rolim?=
+ <34201958+ericonr@users.noreply.github.com>
+Date: Thu, 11 Feb 2021 18:19:20 -0300
+Subject: [PATCH] cmake/Version: fix cross compilation.
+
+It's a CMake weirdness, sometimes it can't find files when cross compiling unless that option is added.
+---
+ cmake/Version.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/Version.cmake b/cmake/Version.cmake
+index fd0487d..8cbf3c0 100644
+--- cmake/Version.cmake
++++ cmake/Version.cmake
+@@ -1,8 +1,8 @@
+ cmake_minimum_required(VERSION 2.8)
+ find_program(GIT_EXECUTABLE git DOC "Git version control")
+ mark_as_advanced(GIT_EXECUTABLE)
+-find_file(GITDIR NAMES .git PATHS ${CMAKE_CURRENT_SOURCE_DIR} NO_DEFAULT_PATH)
+-find_file(VERSION_FILE NAMES version.py PATHS ${CMAKE_CURRENT_SOURCE_DIR} NO_DEFAULT_PATH)
++find_file(GITDIR NAMES .git PATHS ${CMAKE_CURRENT_SOURCE_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++find_file(VERSION_FILE NAMES version.py PATHS ${CMAKE_CURRENT_SOURCE_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ if (NOT VERSION_FILE)
+ 	message(SEND_ERROR "Missing version file \"version.py\"")
+ endif()

From eeb16e021c49e5d1a97aee0b1e84a681dd31c770 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 31 Jan 2021 00:10:41 +0200
Subject: [PATCH 1496/3482] caffeine-ng: update to 3.5.1.

Closes: #28346 [via git-merge-pr]
---
 srcpkgs/caffeine-ng/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template
index b2b482789131..3057a24c40c4 100644
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@@ -1,19 +1,21 @@
 # Template file for 'caffeine-ng'
 pkgname=caffeine-ng
-version=3.4.2
-revision=3
+version=3.5.1
+revision=1
 build_style=python3-module
-pycompile_module="caffeine"
 hostmakedepends="python3-setuptools"
 depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify
  python3-dbus python3-docopt python3-ewmh python3-gobject
- python3-setproctitle python3-setuptools python3-xdg"
+ python3-setproctitle python3-setuptools python3-xdg
+ python3-pulsectl"
 short_desc="Temporarily inhibits the screensaver and sleep mode"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/caffeine-ng/caffeine-ng"
 distfiles="${PYPI_SITE}/c/caffeine-ng/caffeine-ng-${version}.tar.gz"
-checksum=9cf843f9359b4b8cdb2ad4a14bb433641a100e25206274eb638c494765d56816
+checksum=7549c09b527be98d7313df4801aae308b2231fbcc21b1de47d16dbbe71a37f2a
+# only runs lints and syntax checks via flake8
+make_check=no
 
 pre_build() {
 	sed -i setup.py \
@@ -21,6 +23,4 @@ pre_build() {
 		-e '/use_scm_version/,+3d' \
 		-e "/name=/ a\
 		version='${version}',"
-	# remove dependency on wheel; it's not a runtime dependency
-	sed -i '/wheel/d' requirements.txt
 }

From d48ff88f5dc8fd717c5d876d01d89daefaa1333b Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 16:04:20 +0100
Subject: [PATCH 1497/3482] gd: update to 2.3.1.

Closes: #28332 [via git-merge-pr]
---
 srcpkgs/gd/patches/3dd0e308c.patch | 100 -----------------------------
 srcpkgs/gd/template                |  12 ++--
 2 files changed, 6 insertions(+), 106 deletions(-)
 delete mode 100644 srcpkgs/gd/patches/3dd0e308c.patch

diff --git a/srcpkgs/gd/patches/3dd0e308c.patch b/srcpkgs/gd/patches/3dd0e308c.patch
deleted file mode 100644
index e4c464a0a312..000000000000
--- a/srcpkgs/gd/patches/3dd0e308c.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 3dd0e308cbd2c24fde2fc9e9b707181252a2de95 Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Tue, 5 May 2020 12:02:45 +0200
-Subject: [PATCH] Fix #615: gdImageStringFT() fails for empty strings as of
- libgd 2.3.0 (#633)
-
-We change the return type of `textLayout()` to `ssize_t`, and signal
-failure by returning `-1`, so that laying out an empty string is no
-longer handled as failure.  We make sure that no overflow occurs,
-assuming that all `int` values can be fully represented as `ssize_t`.
----
- src/gdft.c                           | 18 +++++++++---------
- tests/gdimagestringft/.gitignore     |  1 +
- tests/gdimagestringft/CMakeLists.txt |  1 +
- tests/gdimagestringft/Makemodule.am  |  1 +
- tests/gdimagestringft/bug00615.c     | 25 +++++++++++++++++++++++++
- 5 files changed, 37 insertions(+), 9 deletions(-)
- create mode 100644 tests/gdimagestringft/bug00615.c
-
-diff --git a/src/gdft.c b/src/gdft.c
-index b483b383..186eefff 100644
---- a/src/gdft.c
-+++ b/src/gdft.c
-@@ -441,7 +441,7 @@ typedef struct {
- 	uint32_t cluster;
- } glyphInfo;
- 
--static size_t
-+static ssize_t
- textLayout(uint32_t *text, int len,
- 		FT_Face face, gdFTStringExtraPtr strex,
- 		glyphInfo **glyph_info)
-@@ -459,19 +459,19 @@ textLayout(uint32_t *text, int len,
- 		!raqm_set_par_direction (rq, RAQM_DIRECTION_DEFAULT) ||
- 		!raqm_layout (rq)) {
- 		raqm_destroy (rq);
--		return 0;
-+		return -1;
- 	}
- 
- 	glyphs = raqm_get_glyphs (rq, &count);
- 	if (!glyphs) {
- 		raqm_destroy (rq);
--		return 0;
-+		return -1;
- 	}
- 
- 	info = (glyphInfo*) gdMalloc (sizeof (glyphInfo) * count);
- 	if (!info) {
- 		raqm_destroy (rq);
--		return 0;
-+		return -1;
- 	}
- 
- 	for (i = 0; i < count; i++) {
-@@ -489,7 +489,7 @@ textLayout(uint32_t *text, int len,
- 	FT_Error err;
- 	info = (glyphInfo*) gdMalloc (sizeof (glyphInfo) * len);
- 	if (!info) {
--		return 0;
-+		return -1;
- 	}
- 	for (count = 0; count < len; count++) {
- 		/* Convert character code to glyph index */
-@@ -508,7 +508,7 @@ textLayout(uint32_t *text, int len,
- 		err = FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT);
- 		if (err) {
- 			gdFree (info);
--			return 0;
-+			return -1;
- 		}
- 		info[count].index = glyph_index;
- 		info[count].x_offset = 0;
-@@ -527,7 +527,7 @@ textLayout(uint32_t *text, int len,
- #endif
- 
- 	*glyph_info = info;
--	return count;
-+	return count <= SSIZE_MAX ? count : -1;
- }
- 
- /********************************************************************/
-@@ -1108,7 +1108,7 @@ BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const c
- 	char *tmpstr = 0;
- 	uint32_t *text;
- 	glyphInfo *info = NULL;
--	size_t count;
-+	ssize_t count;
- 	int render = (im && (im->trueColor || (fg <= 255 && fg >= -255)));
- 	FT_BitmapGlyph bm;
- 	/* 2.0.13: Bob Ostermann: don't force autohint, that's just for testing
-@@ -1409,7 +1409,7 @@ BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const c
- 
- 	count = textLayout (text , i, face, strex, &info);
- 
--	if (!count) {
-+	if (count < 0) {
- 		gdFree (text);
- 		gdFree (tmpstr);
- 		gdCacheDelete (tc_cache);
diff --git a/srcpkgs/gd/template b/srcpkgs/gd/template
index 4e20db7d1f32..3bec34f339e6 100644
--- a/srcpkgs/gd/template
+++ b/srcpkgs/gd/template
@@ -1,20 +1,20 @@
 # Template file for 'gd'
 pkgname=gd
-version=2.3.0
-revision=2
+version=2.3.1
+revision=1
 wrksrc="libgd-${version}"
 build_style=gnu-configure
 configure_args="--without-xpm"
 hostmakedepends="pkg-config"
 makedepends="libjpeg-turbo-devel libpng-devel libwebp-devel tiff-devel fontconfig-devel"
+# There needs to be a font installed for fontconfig/basic test
+checkdepends="liberation-fonts-ttf"
 short_desc="Graphics library for the dynamic creation of images"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="custom:BSD-like"
 homepage="http://www.libgd.org/"
-license="BSD"
 distfiles="https://github.com/libgd/libgd/releases/download/gd-${version}/libgd-${version}.tar.xz"
-checksum=ecd9155b9a417fb3f837f29e5966323796de247789163761dd72dbf83bfcac58
-
-patch_args="-Np1"
+checksum=9767917d9f818faec4ddd763fe4a4ad9f6322c3d25da290ab2ea3e2ce4b52a7b
 
 post_install() {
 	vlicense COPYING

From 8b7c1c00440571d76aedde54c02952616f49a944 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 12 Feb 2021 00:55:34 +0100
Subject: [PATCH 1498/3482] New package: opustags-1.6.0

---
 srcpkgs/opustags/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/opustags/template

diff --git a/srcpkgs/opustags/template b/srcpkgs/opustags/template
new file mode 100644
index 000000000000..8e9f84c89627
--- /dev/null
+++ b/srcpkgs/opustags/template
@@ -0,0 +1,17 @@
+# Template file for 'opustags'
+pkgname=opustags
+version=1.6.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libogg-devel"
+short_desc="Ogg Opus tags editor"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/fmang/opustags"
+distfiles="https://github.com/fmang/opustags/archive/${version}.tar.gz"
+checksum=0f82703a49b35d44503c53bb596129e89ec061fb1f6e82363f982d1e35377dce
+
+post_install() {
+	vlicense LICENSE
+}

From c4195455adf158f4de24787ab4ff997f69715d97 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 12 Feb 2021 02:30:27 +0100
Subject: [PATCH 1499/3482] youtube-dl: update to 2021.02.10.

---
 srcpkgs/youtube-dl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index f9b24b836220..c2e287ce8a43 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-dl'
 pkgname=youtube-dl
-version=2021.02.04.1
+version=2021.02.10
 revision=1
 wrksrc="${pkgname}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
 homepage="https://yt-dl.org"
 changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"
 distfiles="${homepage}/downloads/${version}/${pkgname}-${version}.tar.gz"
-checksum=0a4b3865ab0471d26c5977f1390b555e4e222c1cfff5bed9e2f52fd128bdc866
+checksum=d607adf66b7047865733f7d05af9478118ee4dd974ef9f971563e11de7f29122
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 75a8098ceb421e034d582a318a21e2d85aa4d35b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 12 Feb 2021 02:41:35 +0100
Subject: [PATCH 1500/3482] kak-lsp: update to 9.0.0.

---
 srcpkgs/kak-lsp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kak-lsp/template b/srcpkgs/kak-lsp/template
index b656a9cef19e..ecf4d09dfe9e 100644
--- a/srcpkgs/kak-lsp/template
+++ b/srcpkgs/kak-lsp/template
@@ -1,14 +1,14 @@
 # Template file for 'kak-lsp'
 pkgname=kak-lsp
-version=8.0.0
+version=9.0.0
 revision=1
 build_style=cargo
 short_desc="Language Server Protocol client for Kakoune"
 maintainer="Emerson Ferreira <me@skrps.me>"
 license="Unlicense"
-homepage="https://github.com/ul/kak-lsp"
+homepage="https://github.com/kak-lsp/kak-lsp"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d5961395bc4e8dce68917f3b64876acd83723ff353fabfd0fd789ddca14b0d5c
+checksum=25898b816a92fc2436c146d7cd2e891b608203fe63690aafa648e6ae8bfa9112
 
 post_install() {
 	vlicense UNLICENSE

From c98392259786ea8ff8d30d9f4dcc8e7864d075ac Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Thu, 29 Oct 2020 11:47:37 +0200
Subject: [PATCH 1501/3482] dmd2.081: backport clean ld exit.

---
 srcpkgs/dmd2.081/patches/backport-ld-exit.patch | 11 +++++++++++
 srcpkgs/dmd2.081/template                       |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dmd2.081/patches/backport-ld-exit.patch

diff --git a/srcpkgs/dmd2.081/patches/backport-ld-exit.patch b/srcpkgs/dmd2.081/patches/backport-ld-exit.patch
new file mode 100644
index 000000000000..a3012be7beef
--- /dev/null
+++ b/srcpkgs/dmd2.081/patches/backport-ld-exit.patch
@@ -0,0 +1,11 @@
+--- dmd/src/dmd/link.d
++++ dmd/src/dmd/link.d
+@@ -685,7 +685,7 @@ public int runLINK()
+             close(fds[0]);
+             execvp(argv[0], cast(char**)argv.tdata());
+             perror(argv[0]); // failed to execute
+-            return -1;
++            _exit(-1);
+         }
+         else if (childpid == -1)
+         {
diff --git a/srcpkgs/dmd2.081/template b/srcpkgs/dmd2.081/template
index 6bb0d3160abe..79aad0940085 100644
--- a/srcpkgs/dmd2.081/template
+++ b/srcpkgs/dmd2.081/template
@@ -1,7 +1,7 @@
 # Template file for 'dmd2.081'
 pkgname=dmd2.081
 version=2.081.1
-revision=2
+revision=3
 create_wrksrc=yes
 hostmakedepends="which"
 makedepends="dmd-bootstrap"

From b13248c657b134ccfa71d0cca468847acdee2ac3 Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Sun, 25 Oct 2020 17:13:56 +0200
Subject: [PATCH 1502/3482] New package: dmd2.091

- libphobos2.091 conflicts with libphobos2.081
- backport clean ld exit
- disable parallel build
---
 srcpkgs/dmd2.091/files/dmd.conf               |  2 +
 .../dmd2.091/patches/backport-ld-exit.patch   | 11 +++
 srcpkgs/dmd2.091/template                     | 79 +++++++++++++++++++
 3 files changed, 92 insertions(+)
 create mode 100644 srcpkgs/dmd2.091/files/dmd.conf
 create mode 100644 srcpkgs/dmd2.091/patches/backport-ld-exit.patch
 create mode 100644 srcpkgs/dmd2.091/template

diff --git a/srcpkgs/dmd2.091/files/dmd.conf b/srcpkgs/dmd2.091/files/dmd.conf
new file mode 100644
index 000000000000..e8d42d10620e
--- /dev/null
+++ b/srcpkgs/dmd2.091/files/dmd.conf
@@ -0,0 +1,2 @@
+[Environment]
+DFLAGS=-I/usr/include/d -I/usr/include/d/druntime/import -L-L/usr/lib -L-L/usr/lib -L--no-warn-search-mismatch -L--export-dynamic -fPIC
diff --git a/srcpkgs/dmd2.091/patches/backport-ld-exit.patch b/srcpkgs/dmd2.091/patches/backport-ld-exit.patch
new file mode 100644
index 000000000000..d4d340357910
--- /dev/null
+++ b/srcpkgs/dmd2.091/patches/backport-ld-exit.patch
@@ -0,0 +1,11 @@
+--- dmd/src/dmd/link.d
++++ dmd/src/dmd/link.d
+@@ -782,7 +782,7 @@ public int runLINK()
+             close(fds[0]);
+             execvp(argv[0], argv.tdata());
+             perror(argv[0]); // failed to execute
+-            return -1;
++            _exit(-1);
+         }
+         else if (childpid == -1)
+         {
diff --git a/srcpkgs/dmd2.091/template b/srcpkgs/dmd2.091/template
new file mode 100644
index 000000000000..72521df7cd3f
--- /dev/null
+++ b/srcpkgs/dmd2.091/template
@@ -0,0 +1,79 @@
+# Template file for 'dmd2.091'
+pkgname=dmd2.091
+version=2.091.0
+revision=1
+create_wrksrc=yes
+hostmakedepends="dmd2.081 which"
+makedepends="git"
+depends="gcc"
+short_desc="Digital Mars D compiler, 2.091"
+maintainer="Auri <me@aurieh.me>"
+license="BSL-1.0"
+homepage="http://www.digitalmars.com/d/2.0/"
+distfiles="
+ https://github.com/dlang/dmd/archive/v${version}.tar.gz>dmd-${version}.tar.gz
+ https://github.com/dlang/druntime/archive/v${version}.tar.gz>druntime-${version}.tar.gz
+ https://github.com/dlang/phobos/archive/v${version}.tar.gz>phobos-${version}.tar.gz
+ http://downloads.dlang.org/releases/2.x/${version}/dmd.${version}.linux.tar.xz"
+checksum="bcca38f4b80b51ae0a1955dc29e6cbfaa4d01d94869ddfcacf9292898c34343a
+ cc8ba196b08cca04488d97d0e35c878f7351b7d8128aec90eaa312d2bd9a6af2
+ df9f81eecda4366adc5ca9ed31a0b4474c248544b120ff6fa3f6cb45917d8769
+ 6e4bd4ee73a553921cdca7e3e21768b842b18186d07c0b4898fbd13a359875c0"
+conf_files="/etc/dmd.conf"
+provides="d-compiler-${version}_${revision}"
+conflicts="dmd-bootstrap dmd2.081 libphobos2.081"
+nopie=yes
+nocross=yes
+disable_parallel_build=yes
+LDFLAGS="-lpthread"
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*) _archbits=64;;
+	i686) _archbits=32;;
+	*) broken="unsupported arch upstream";;
+esac
+
+post_extract() {
+	mv dmd-${version} dmd
+	mv druntime-${version} druntime
+	mv phobos-${version} phobos
+}
+
+do_build() {
+	local dmd
+
+	cd dmd
+	make ${makejobs} -f posix.mak MODEL=${_archbits} TARGET_CPU=X86 ENABLE_RELEASE=1 PIC=1
+	dmd=${wrksrc}/dmd/generated/linux/release/$_archbits/dmd
+
+	make ${makejobs} -C docs
+
+	cd ../druntime
+	make ${makejobs} -f posix.mak MODEL=${_archbits} DMD=$dmd ENABLE_RELEASE=1 PIC=1
+
+	cd ../phobos
+	make ${makejobs} -f posix.mak MODEL=${_archbits} DMD=$dmd ENABLE_RELEASE=1 PIC=1
+}
+
+do_install() {
+	cd dmd
+	vbin generated/linux/release/$_archbits/dmd
+	vinstall ${FILESDIR}/dmd.conf 644 etc
+
+	# note: dmd, druntime and phobos all share the same license
+	vlicense LICENSE.txt
+
+	vman generated/docs/man/man1/dmd.1
+	vman generated/docs/man/man5/dmd.conf.5
+
+	vmkdir usr/include/d
+
+	cd ../phobos
+	cp -r ./{*.d,etc,std} ${PKGDESTDIR}/usr/include/d
+	vinstall generated/linux/release/$_archbits/libphobos2.a 644 usr/lib libphobos2.a
+
+	cd ../druntime
+	vmkdir usr/include/d/druntime
+	cp -r import ${PKGDESTDIR}/usr/include/d/druntime
+	vinstall generated/linux/release/$_archbits/libdruntime.a 644 usr/lib libdruntime.a
+}

From 490980b0cc892e383a26ace200b37b156b5cbe20 Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Sun, 25 Oct 2020 17:14:54 +0200
Subject: [PATCH 1503/3482] dmd: update to 2.095.0

- reverts
https://github.com/dlang/dmd/commit/bab39b625f875ac14dd6668c2b442e76898ac342
on musl systems.
- disable parallel build

Closes: #25878 [via git-merge-pr]
---
 srcpkgs/dmd/files/musl.patch | 12 ++++++++++++
 srcpkgs/dmd/template         | 24 +++++++++++++++---------
 2 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/dmd/files/musl.patch

diff --git a/srcpkgs/dmd/files/musl.patch b/srcpkgs/dmd/files/musl.patch
new file mode 100644
index 000000000000..bf41a3e49619
--- /dev/null
+++ b/srcpkgs/dmd/files/musl.patch
@@ -0,0 +1,12 @@
+--- dmd/src/dmd/link.d
++++ dmd/src/dmd/link.d
+@@ -759,8 +759,7 @@
+             perror("unable to create pipe to linker");
+             return -1;
+         }
+-        // vfork instead of fork to avoid https://issues.dlang.org/show_bug.cgi?id=21089
+-        childpid = vfork();
++        childpid = fork();
+         if (childpid == 0)
+         {
+             // pipe linker stderr to fds[0]
diff --git a/srcpkgs/dmd/template b/srcpkgs/dmd/template
index 6167a347f498..36f7fce51781 100644
--- a/srcpkgs/dmd/template
+++ b/srcpkgs/dmd/template
@@ -1,10 +1,10 @@
 # Template file for 'dmd'
 pkgname=dmd
-version=2.091.0
+version=2.095.0
 revision=1
 create_wrksrc=yes
-hostmakedepends="which"
-makedepends="dmd2.081 git"
+hostmakedepends="dmd2.091 which"
+makedepends="git"
 depends="libphobos>=${version} gcc"
 short_desc="Digital Mars D compiler"
 maintainer="streaks <assemblyislaw@gmail.com>"
@@ -15,14 +15,15 @@ distfiles="
  https://github.com/dlang/druntime/archive/v${version}.tar.gz>druntime-${version}.tar.gz
  https://github.com/dlang/phobos/archive/v${version}.tar.gz>phobos-${version}.tar.gz
  http://downloads.dlang.org/releases/2.x/${version}/dmd.${version}.linux.tar.xz"
-checksum="bcca38f4b80b51ae0a1955dc29e6cbfaa4d01d94869ddfcacf9292898c34343a
- cc8ba196b08cca04488d97d0e35c878f7351b7d8128aec90eaa312d2bd9a6af2
- df9f81eecda4366adc5ca9ed31a0b4474c248544b120ff6fa3f6cb45917d8769
- 6e4bd4ee73a553921cdca7e3e21768b842b18186d07c0b4898fbd13a359875c0"
+checksum="d8b54cdd885b86e2cc30ccb4ccc6923940b3bd79183b499889b86d34dd22621b
+ f8d6346aa13bdc6ff893eb9d9e5aa5e8ff5efe97dbfd92f7ecd8db8172d0c04a
+ f5c9606a988917a38b3b9a495c6da0d4e36b60beac8e805f6dea719d042d50d4
+ 02853f8a4988f55dab5daa1e0e9910ea91905b85bcaa7a5ffd83079147dc7d93"
 conf_files="/etc/dmd.conf"
 provides="d-compiler-${version}_${revision}"
-conflicts="dmd-bootstrap dmd2.081"
+conflicts="dmd-bootstrap dmd2.081 dmd2.091"
 nopie=yes
+disable_parallel_build=yes
 LDFLAGS="-lpthread"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -32,12 +33,17 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 post_extract() {
-	rm -rf dmd druntime phobos
 	mv dmd-${version} dmd
 	mv druntime-${version} druntime
 	mv phobos-${version} phobos
 }
 
+post_patch() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		patch -p0 < ${FILESDIR}/musl.patch
+	fi
+}
+
 do_build() {
 	local dmd
 

From 8300c363cc5e5a95e4ef430c43fd1850ba595d55 Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Sun, 25 Oct 2020 17:25:55 +0200
Subject: [PATCH 1504/3482] dtools: update to 2.095.0

Closes: #25879 [via git-merge-pr]
---
 srcpkgs/dtools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dtools/template b/srcpkgs/dtools/template
index d4e6cea7bb5c..d37489dd4281 100644
--- a/srcpkgs/dtools/template
+++ b/srcpkgs/dtools/template
@@ -1,7 +1,7 @@
 # Template file for 'dtools'
 pkgname=dtools
 # keep this synchronized with libphobos and dmd
-version=2.088.1
+version=2.095.0
 revision=1
 wrksrc="tools-${version}"
 hostmakedepends="dmd"
@@ -12,7 +12,7 @@ maintainer="Auri <me@aurieh.me>"
 license="BSL-1.0"
 homepage="http://www.digitalmars.com/d/2.0/"
 distfiles="https://github.com/dlang/tools/archive/v${version}.tar.gz"
-checksum=e2eb1afe24985096554c971059916bfad1573b85786529c0394009c8db967139
+checksum=7688c56285e098b91ec81a3efaaec6d236aa1a1736fe21797d3335175f8fea8c
 
 do_build() {
 	# rdmd can't be built normally, is used to build others

From 5596893a57f743be0d9604fdf834fe873808751c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 26 Dec 2020 03:43:48 -0600
Subject: [PATCH 1505/3482] gajim: unmark nocross

By ericonr:
- fix changelog
- use make_check

Closes: #27147 [via git-merge-pr]
---
 srcpkgs/gajim/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index cce8f28496e7..e4546a5e72fa 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -11,7 +11,9 @@ short_desc="Full featured Jabber/XMPP client"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"
 homepage="https://www.gajim.org"
-#changelog="https://dev.gajim.org/gajim/gajim/raw/gajim-${version}/ChangeLog"
+changelog="https://dev.gajim.org/gajim/gajim/-/raw/master/ChangeLog"
 distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.gz"
 checksum=fd0d1653fb3f7f97207fecc3218d38915adb1d741bf95a7eef83605bd6b8ccbd
-nocross="gobject-introspection"
+# Does not find gdk, introspection typelib
+# even wtih gdk-pixbuf in checkdepends
+make_check=no

From 3c2d08021e42cae8ecc8097b6437a389110ef770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 12 Feb 2021 11:31:09 +0100
Subject: [PATCH 1506/3482] zsnes: fix build

---
 srcpkgs/zsnes/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/zsnes/template b/srcpkgs/zsnes/template
index 5009a30b88d4..df49c9c7d3e7 100644
--- a/srcpkgs/zsnes/template
+++ b/srcpkgs/zsnes/template
@@ -21,6 +21,8 @@ homepage="http://www.zsnes.com/"
 distfiles="${SOURCEFORGE_SITE}/zsnes/zsnes151src.tar.bz2"
 checksum=2856dedba272e9eed66cbf68dd4a9ae56797c373686c57371a65c7df35264623
 
+CFLAGS="-fcommon"
+
 post_install() {
 	vmkdir usr/share
 	mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share

From 7bfedfa96431436b48d1c9176dcc326cdf0dd3d5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 12 Feb 2021 11:37:35 +0100
Subject: [PATCH 1507/3482] rlwrap: update to 0.45.

---
 srcpkgs/rlwrap/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rlwrap/template b/srcpkgs/rlwrap/template
index 22787a1bfc7f..afbdf6c7fcfe 100644
--- a/srcpkgs/rlwrap/template
+++ b/srcpkgs/rlwrap/template
@@ -1,13 +1,18 @@
 # Template file for 'rlwrap'
 pkgname=rlwrap
-version=0.44
+version=0.45
 revision=1
 build_style=gnu-configure
+hostmakedepends="automake"
 makedepends="readline-devel"
 depends="perl"
 short_desc="Adds readline-style editing and history to programs"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/hanslub42/rlwrap"
-distfiles="https://github.com/hanslub42/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=cd7ff50cde66e443cbea0049b4abf1cca64a74948371fa4f1b5d9a5bbce1e13c
+distfiles="https://github.com/hanslub42/rlwrap/archive/v${version}.tar.gz"
+checksum=780faa7330f306430aaf895984c936f451a8d35555145eff5451dc57b0c3ba8c
+
+pre_configure() {
+	autoreconf -fi
+}

From e2b461c45603c9498e4ba8d875e48e6da48aab68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 12 Feb 2021 13:15:54 +0100
Subject: [PATCH 1508/3482] ghc-bin: enable i686-musl

Cross built bindist ghc-8.8.4-i386-unknown-linux-musl.tar.xz,
manually moved and uploaded to distfiles.voidlinux.de
N.B.: Option -o bindist of ghc fails to move the resulting tarball
because it ends up in ${wrksrc}.
---
 srcpkgs/ghc-bin/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 3490190c209d..9101601358b9 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -2,7 +2,7 @@
 pkgname=ghc-bin
 version=8.8.4
 revision=1
-archs="i686 x86_64* ppc64le*"
+archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
@@ -27,6 +27,10 @@ i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
 	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
 	;;
+i686-musl)
+	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"
+	checksum=8d84fbab62b3712bdcfb92f7d258a0d15d8295397d84b48716a3c625f09be782
+	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"
 	checksum=4a13d36a3e3d605db02b89269ed727c3ba23c9d03b84b72c1716a910a28f8074

From f3d78e3bf52072f4b34cbaeb5b04a8685c0661d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 12 Feb 2021 14:48:27 +0100
Subject: [PATCH 1509/3482] libsidplayfp: update to 2.1.0

---
 common/shlibs                 | 2 +-
 srcpkgs/libsidplayfp/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4f052075d837..37511cdc2f1c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2915,7 +2915,7 @@ libiscsi.so.9 libiscsi-1.19.0_1
 libgme.so.0 libgme-0.6.1_1
 libzmusic.so.1 ZMusic-1.1.2_1
 libzmusiclite.so.1 ZMusic-1.1.2_1
-libsidplayfp.so.5 libsidplayfp-2.0.0_1
+libsidplayfp.so.6 libsidplayfp-2.1.0_1
 libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
diff --git a/srcpkgs/libsidplayfp/template b/srcpkgs/libsidplayfp/template
index 2655df2c5792..6d610d7bc2fe 100644
--- a/srcpkgs/libsidplayfp/template
+++ b/srcpkgs/libsidplayfp/template
@@ -1,6 +1,6 @@
 # Template file for 'libsidplayfp'
 pkgname=libsidplayfp
-version=2.0.5
+version=2.1.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf"
@@ -9,7 +9,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/p/sidplay-residfp/wiki/Home/"
 distfiles="${SOURCEFORGE_SITE}/sidplay-residfp/${pkgname}/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=e0a70c898e318bcb915f0e73aa3559e0402588b8ed1959734e3df90267ce6d13
+checksum=03af34ab2114990ea299f61afa6cb123fb65e22ece1ee51c28ce6d9d671fe5b7
 
 libsidplayfp-devel_package() {
 	short_desc+=" - development files"

From 50bc757ffe68720642af26dd94c3e05a7892a5d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 12 Feb 2021 14:54:50 +0100
Subject: [PATCH 1510/3482] sidplayfp: update to 2.0.3

---
 srcpkgs/sidplayfp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sidplayfp/template b/srcpkgs/sidplayfp/template
index 427d1cc70583..9607f389eeca 100644
--- a/srcpkgs/sidplayfp/template
+++ b/srcpkgs/sidplayfp/template
@@ -1,6 +1,6 @@
 # Template file for 'sidplayfp'
 pkgname=sidplayfp
-version=2.0.2
+version=2.0.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Zeinok <zeinok@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/sidplay-residfp/"
 distfiles="${SOURCEFORGE_SITE}/sidplay-residfp/${pkgname}/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=937ca6c9f393691f0fe64e31d231fb00dad4150fe171f5ddcd8ac3f093764de8
+checksum=35e6f87a297316b491589cb658762e7df4cc2337203e2f5e80f399a9d64d8f00

From 02e1bfdf2851ee57eb38fb2a8693e3c5a05f3899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 12 Feb 2021 14:48:09 +0100
Subject: [PATCH 1511/3482] QMPlay2: revbump for libsidplayfp-2.1.0

---
 srcpkgs/QMPlay2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index eda2d94829e0..682cbf3058ba 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
 version=20.12.16
-revision=1
+revision=2
 wrksrc="${pkgname}-src-${version}"
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 86cbb9eccb5f9733ef62b676ed701c6806cb94ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 12 Feb 2021 14:48:09 +0100
Subject: [PATCH 1512/3482] audacious-plugins: revbump for libsidplayfp-2.1.0

---
 srcpkgs/audacious-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index ea24c316e3ad..9cc976b2f23d 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -2,7 +2,7 @@
 #Keep in sync with audacious!
 pkgname=audacious-plugins
 version=4.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
 hostmakedepends="gettext pkg-config"

From d844c7397a478dc5b618d4156075de2b667209bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 12 Feb 2021 14:48:10 +0100
Subject: [PATCH 1513/3482] qmmp: revbump for libsidplayfp-2.1.0

---
 srcpkgs/qmmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index eb55a8f7a7cb..a57dc9550d15 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
 # Template file for 'qmmp'
 pkgname=qmmp
 version=1.4.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"

From fcfcca02b8ccddac00268463cfc6dd2b4d605acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 12 Feb 2021 15:24:11 +0100
Subject: [PATCH 1514/3482] qmmp: fix projectM path to config.inp

Our projectM package installs the file to usr/libexec/projectM/config.inp
---
 .../qmmp/patches/projectM-config_inp.patch    | 22 +++++++++++++++++++
 srcpkgs/qmmp/template                         |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch

diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
new file mode 100644
index 000000000000..aa8c1b46c468
--- /dev/null
+++ b/srcpkgs/qmmp/patches/projectM-config_inp.patch
@@ -0,0 +1,22 @@
+--- src/plugins/Visual/projectm/projectm.pro	2021-02-04 20:09:45.000000000 +0100
++++ src/plugins/Visual/projectm/projectm.pro	2021-02-12 15:19:03.951750274 +0100
+@@ -22,6 +22,7 @@
+     LIBS += -L/usr/lib -I/usr/include
+     #projectM config path
+     PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
++                            /usr/libexec/projectM/config.inp \
+                             /usr/local/share/projectM/config.inp
+     for(path, PROJECTM_CONFIG_FILES) {
+          exists($$path) {
+diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
+--- src/plugins/Visual/projectm/projectmwidget.cpp	2021-02-04 20:09:45.000000000 +0100
++++ src/plugins/Visual/projectm/projectmwidget.cpp	2021-02-12 15:22:26.833419341 +0100
+@@ -34,7 +34,7 @@
+ #include "projectmwidget.h"
+ 
+ #ifndef PROJECTM_CONFIG
+-#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
++#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
+ #endif
+ 
+ ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index a57dc9550d15..3757bed23eb0 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
 # Template file for 'qmmp'
 pkgname=qmmp
 version=1.4.4
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"

From 8d3d41a73c4e9b85dca2b54e77699a91bcd902a3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 12 Feb 2021 15:11:07 +0200
Subject: [PATCH 1515/3482] s6-networking-man-pages: update to 2.4.0.0.2.

---
 ...8f959dd2f37a245de3f22babff34f445948ab.diff | 41 -------------------
 srcpkgs/s6-networking-man-pages/template      |  7 ++--
 2 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/s6-networking-man-pages/patches/b608f959dd2f37a245de3f22babff34f445948ab.diff

diff --git a/srcpkgs/s6-networking-man-pages/patches/b608f959dd2f37a245de3f22babff34f445948ab.diff b/srcpkgs/s6-networking-man-pages/patches/b608f959dd2f37a245de3f22babff34f445948ab.diff
deleted file mode 100644
index 802a091c8ba4..000000000000
--- a/srcpkgs/s6-networking-man-pages/patches/b608f959dd2f37a245de3f22babff34f445948ab.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 065f1dd..15d5322 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,21 +13,21 @@ man1_targets = \
- 	s6-taiclockd.1 \
- 	s6-tcpclient.1 \
- 	s6-tcpserver.1 \
--	s6-tcpserver-access.1.in \
--	s6-tcpserver4.1.in \
--	s6-tcpserver4-socketbinder.1.in \
--	s6-tcpserver4d.1.in \
--	s6-tcpserver6.1.in \
--	s6-tcpserver6-socketbinder.1.in \
--	s6-tcpserver6d.1.in \
--	s6-tlsc.1.in \
--	s6-tlsc-io.1.in \
--	s6-tlsclient.1.in \
--	s6-tlsd.1.in \
--	s6-tlsd-io.1.in \
--	s6-tlsserver.1.in \
--	s6-ucspitlsc.1.in \
--	s6-ucspitlsd.1.in
-+	s6-tcpserver-access.1 \
-+	s6-tcpserver4.1 \
-+	s6-tcpserver4-socketbinder.1 \
-+	s6-tcpserver4d.1 \
-+	s6-tcpserver6.1 \
-+	s6-tcpserver6-socketbinder.1 \
-+	s6-tcpserver6d.1 \
-+	s6-tlsc.1 \
-+	s6-tlsc-io.1 \
-+	s6-tlsclient.1 \
-+	s6-tlsd.1 \
-+	s6-tlsd-io.1 \
-+	s6-tlsserver.1 \
-+	s6-ucspitlsc.1 \
-+	s6-ucspitlsd.1
- 
- man7_targets = \
- 	s6-tls.7
diff --git a/srcpkgs/s6-networking-man-pages/template b/srcpkgs/s6-networking-man-pages/template
index 627b0db3891d..f8b5f43a308b 100644
--- a/srcpkgs/s6-networking-man-pages/template
+++ b/srcpkgs/s6-networking-man-pages/template
@@ -1,6 +1,6 @@
 # Template file for 's6-networking-man-pages'
 pkgname=s6-networking-man-pages
-version=2.4.0.0.1
+version=2.4.0.0.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="mdocml"
@@ -9,12 +9,11 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://github.com/flexibeast/s6-networking-man-pages"
 distfiles="https://github.com/flexibeast/s6-networking-man-pages/archive/v${version}.tar.gz"
-checksum=d7de2f957873fae4fd14d3aac9d0621f70cf513fcee91d2c42e119eaee4a5f10
-patch_args=" -Np1"
+checksum=a1e80966d7536ee38b7a54fd0acafd6d75885bbf81c7d79fb6c901db3743131a
 
 do_install() {
 	vmkdir usr/share/man/man1
 	vmkdir usr/share/man/man7
-	make MANPATH="${DESTDIR}/usr/share/man"  install-man
+	make MANPATH="${DESTDIR}/usr/share/man"
 	vlicense LICENSE
 }

From 0fb9fef145130c00b1843fa520a2727deefcbf89 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 12 Feb 2021 15:05:50 +0200
Subject: [PATCH 1516/3482] s6-man-pages: update to 2.10.0.1.2.

---
 srcpkgs/s6-man-pages/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/s6-man-pages/template b/srcpkgs/s6-man-pages/template
index 7b26862c1d18..8301518fdf97 100644
--- a/srcpkgs/s6-man-pages/template
+++ b/srcpkgs/s6-man-pages/template
@@ -1,6 +1,6 @@
 # Template file for 's6-man-pages'
 pkgname=s6-man-pages
-version=2.10.0.1.1
+version=2.10.0.1.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="mdocml"
@@ -9,12 +9,12 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://github.com/flexibeast/s6-man-pages"
 distfiles="https://github.com/flexibeast/s6-man-pages/archive/v${version}.tar.gz"
-checksum=de85efead2548166df4450286abbae4f9450dcff49e300ffba2b8e34a362078e
+checksum=d7d8d16662d8fc9ccdb73ab24576c1f88718103d1a46d2c063bde9d234b79c7f
 
 
 do_install() {
 	vmkdir usr/share/man/man1
 	vmkdir usr/share/man/man7
-	make MANPATH="${DESTDIR}/usr/share/man"  install-man
+	make MANPATH="${DESTDIR}/usr/share/man"
 	vlicense LICENSE
 }

From 5314f213ce6a0a3d93c6eaa7ec737cc92e3520a7 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Fri, 12 Feb 2021 10:22:33 +0000
Subject: [PATCH 1517/3482] GPaste: update to 3.38.5.

---
 srcpkgs/GPaste/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 61929e51a6ae..7286be4a9fb7 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
 # Template file for 'GPaste'
 pkgname=GPaste
-version=3.38.2
+version=3.38.5
 revision=1
 wrksrc="gpaste-${version}"
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.imagination-land.org/tags/GPaste.html"
 distfiles="https://www.imagination-land.org/files/gpaste/gpaste-${version}.tar.xz"
-checksum=a27d59fa3f34160389246983c7a8f3bec60c76bd04ff02e8f792cff41eff07ba
+checksum=43698005b4c45719256dee4d3150ed652ce21d7a88f87b441145a29c78248146
 
 build_options="gnome_shell"
 desc_option_gnome_shell="Build GNOME Shell integration and extension"

From c80ea77fbec94962ad6d6fc474d0b518b1834774 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Fri, 12 Feb 2021 09:32:07 +0000
Subject: [PATCH 1518/3482] gedit: update to 3.38.1.

---
 srcpkgs/gedit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index efce069ed853..419d64742995 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,7 +1,7 @@
 # Template file for 'gedit'
 pkgname=gedit
-version=3.38.0
-revision=2
+version=3.38.1
+revision=1
 build_helper="gir"
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gedit"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=46cf06806de58f6e5e95e34fd98ad0b2c0c50b3dae6d23ca57d16d5cc41856f8
+checksum=0053853d2cd59cad8a1662f5b4fdcfab47b4c0940063bacd6790a9948642844d
 shlib_provides="libgedit-3.38.so"
 python_version=3
 

From f005a88e40c0340b8690eeba466e5f457e13eb31 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Fri, 12 Feb 2021 09:18:07 +0000
Subject: [PATCH 1519/3482] gnome-disk-utility: update to 3.38.2.

---
 srcpkgs/gnome-disk-utility/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index be862d7fdc11..d90f7d7d9fc4 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-disk-utility'
 pkgname=gnome-disk-utility
-version=3.38.1
+version=3.38.2
 revision=1
 build_style=meson
 configure_args="-Dlogind=none"
@@ -13,5 +13,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Disks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d53b85dc1303a1b5ce1e421c1f5c6ac0b318e07cd9a95939d2e1f0959a5ed7d9
+checksum=10bedde5494beb34e3a220d6f30d9320c88252feeb8426bd98cefad1836d78e9
 lib32disabled=yes

From dfd1febffd12d45ed21ce840bb84993598730dd0 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 12 Feb 2021 09:59:31 +0100
Subject: [PATCH 1520/3482] eselect: update to 1.4.17, fix license

License is GPL-2.0 or later.
---
 srcpkgs/eselect/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/eselect/template b/srcpkgs/eselect/template
index 976f8225c85e..ce5def56b431 100644
--- a/srcpkgs/eselect/template
+++ b/srcpkgs/eselect/template
@@ -1,16 +1,16 @@
 # Template file for 'eselect'
 pkgname=eselect
-version=1.4.16
-revision=2
+version=1.4.17
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 depends="bash"
 short_desc="Modular configuration framework for Gentoo systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gentoo.org/wiki/Project:Eselect"
 distfiles="https://gitweb.gentoo.org/proj/eselect.git/snapshot/eselect-${version}.tar.gz"
-checksum=7180f8e211a039ceb1f31622b4434ac5d2f4ccf32e907864ca8d4013aaf47cee
+checksum=b049722b33a40e929d498723daf81c73db8eded706435e552d92522438c60163
 
 pre_configure() {
 	./autogen.bash

From 48960b7466a133279986041450370de1be2bbe37 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Fri, 12 Feb 2021 08:54:49 +0000
Subject: [PATCH 1521/3482] OTPClient: update to 2.4.2.

---
 srcpkgs/OTPClient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 67c6e9cb88c9..e8c0099850b7 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,6 +1,6 @@
 # Template file for 'OTPClient'
 pkgname=OTPClient
-version=2.4.1
+version=2.4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/paolostivanin/OTPClient"
 distfiles="https://github.com/paolostivanin/OTPClient/archive/v${version}.tar.gz"
-checksum=e505f4ebba92342f4029c1d49167bc346cbb2295e2379cb6b7b232f837011520
+checksum=74bc4312aa1cd336ca983434e3bed951c5ead327091e7708e3beb08508813495

From 642e7f5e0da79bde5ec0f28b8f5ef7ca8ced1a28 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 12 Feb 2021 17:05:51 +0100
Subject: [PATCH 1522/3482] linux5.4: update to 5.4.97.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 276ae9fc7e29..75d8e5d8d534 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.96
+version=5.4.97
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f728de695ec5eb17efa15acaecc48fcd7a6c4a912b51704ed137cccf93f9f5e0
+checksum=71a866100a630fbc66d24770f932feb121dd764c0bb95a88c0a00e3cb629483f
 python_version=3
 patch_args="-Np1"
 

From f1f96b25314f53f08d67f866e390079bffd86fc5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 12 Feb 2021 17:07:35 +0100
Subject: [PATCH 1523/3482] linux4.19: update to 4.19.175.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index a5e1047ef930..e21433f132ad 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.174
+version=4.19.175
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=0ff6c703e90c714f31904850f4c0c74c0b1caa9ddabbecaa28de0eb61c049ee5
+checksum=ccee4b84ff2b16ad438e013bd211efea12f14e69f7cadb0e095fc89c781b2b25
 python_version=2 #unverified
 patch_args="-Np1"
 

From 32b61668d4173e0342d46471701e866a9f17e822 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Feb 2021 09:24:36 -0500
Subject: [PATCH 1524/3482] python3-uvloop: update to 0.15.0.

---
 srcpkgs/python3-uvloop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 9bb256f5729a..3f62151b2e4d 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.14.0
-revision=2
+version=0.15.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools python3-Cython"
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=29738dd376afd33fbaebbb5c129385cbfe08c04ca7d2c187be60334233935d6a
+checksum=2586ff9a081c4cbcc2e016e01d2ea343d3d510a09ff1975a151530bcc19e0ce3
 
 post_patch() {
 	cat <<-EOF >> setup.cfg

From 0523c377f66ac2b24acb2644e6c913caaff5a7e3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Feb 2021 09:57:18 -0500
Subject: [PATCH 1525/3482] python3-prompt_toolkit: update to 3.0.16.

---
 srcpkgs/python3-prompt_toolkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index fbafe67b6615..5cd63f4abe63 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-prompt_toolkit'
 pkgname=python3-prompt_toolkit
-version=3.0.14
+version=3.0.16
 revision=1
 wrksrc="prompt_toolkit-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
 changelog="https://raw.githubusercontent.com/prompt-toolkit/python-prompt-toolkit/master/CHANGELOG"
 distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=7e966747c18ececaec785699626b771c1ba8344c8d31759a1915d6b12fad6525
+checksum=0fa02fa80363844a4ab4b8d6891f62dd0645ba672723130423ca4037b80c1974
 conflicts="python3-prompt_toolkit2<=2.0.9_4"
 
 post_install() {

From 7d9b7eb46edf9203e12b4f39e8f5020d524b8a3e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Feb 2021 10:21:09 -0500
Subject: [PATCH 1526/3482] python3-pandas: update to 1.2.2.

---
 srcpkgs/python3-pandas/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index c4cf88cc45da..955e14075caf 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.2.1
+version=1.2.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=e129d3abfa6134a1d6dc061ebb5e52da661ce0aa2febc2b7757ffb785b65e8e4
+checksum=043693dc2a2722a0a7ab4be66b2b7e47f4987225c710120d0ef97a970e296a79
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds

From 53ecd29071ae355d2d6c3920f38eac1422b35253 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Feb 2021 10:29:57 -0500
Subject: [PATCH 1527/3482] python3-pyzmq: update to 22.0.3.

---
 srcpkgs/python3-pyzmq/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index db236716fa03..32c24aba9cf8 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.0.2
+version=22.0.3
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -10,12 +10,12 @@ makedepends="zeromq-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Python3 bindings for the ZeroMQ messaging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=d7b82a959e5e22d492f4f5a1e650e909a6c8c76ede178f538313ddb9d1e92963
+checksum=f7f63ce127980d40f3e6a5fdb87abf17ce1a7c2bd8bf2c7560e1bbce8ab1f92d
 
 pre_build() {
 	cat > setup.cfg <<-EOF

From e175d9b8304a11e4f54a45d42b9d39bd3482a121 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Feb 2021 10:39:50 -0500
Subject: [PATCH 1528/3482] python3-setuptools: update to 53.0.0.

---
 srcpkgs/python3-setuptools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index a694659b68db..6bdad45add7f 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=52.0.0
+version=53.0.0
 revision=1
 wrksrc="setuptools-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://github.com/pypa/setuptools"
 changelog="https://raw.githubusercontent.com/pypa/setuptools/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.tar.gz"
-checksum=fb3a1ee622509550dbf1d419f241296169d7f09cb1eb5b1736f2f10965932b96
+checksum=1b18ef17d74ba97ac9c0e4b4265f123f07a8ae85d9cd093949fa056d3eeeead5
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"
 

From c905ec893696db0e66481e677db61094e83966e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 12 Feb 2021 17:50:11 +0100
Subject: [PATCH 1529/3482] strace: fix i686-musl

For i686-musl libunwind requires libucontext also.
---
 srcpkgs/strace/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 27f9e927b771..a030b371ca3e 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -16,9 +16,16 @@ checksum=fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*|ppc64*) configure_args+=" --enable-mpers=no" ;;
 	# work around https://github.com/strace/strace/issues/133
+	i686-musl) configure_args+=" --enable-mpers=no"; makedepends+=" libucontext-devel" ;;
 	x86_64-musl) configure_args+=" --enable-mpers=no" ;;
 esac
 
+pre_configure() {
+	if [ "$XBPS_TARGET_MACHINE" = "i686-musl" ]; then
+		vsed -i configure -e "s;libunwind_LIBS=$;&-lucontext;"
+	fi
+}
+
 do_check() {
 	if [ "$XBPS_CHECK_PKGS" = full ]; then
 		# XXX: Some tests may fail inside of containers or if they are missing

From 0aab812144e00e383ea99137bd748b0d082f0a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 11 Feb 2021 17:27:50 -0300
Subject: [PATCH 1530/3482] linux5.9: remove package.

---
 srcpkgs/linux5.9-dbg                          |     1 -
 srcpkgs/linux5.9-headers                      |     1 -
 srcpkgs/linux5.9/files/DocBook/Makefile       |   282 -
 srcpkgs/linux5.9/files/arm64-dotconfig        | 11318 ----------------
 srcpkgs/linux5.9/files/i386-dotconfig         |  9855 --------------
 srcpkgs/linux5.9/files/mv-debug               |     7 -
 srcpkgs/linux5.9/files/ppc-dotconfig          |  7972 -----------
 srcpkgs/linux5.9/files/ppc64-dotconfig        |  9946 --------------
 srcpkgs/linux5.9/files/ppc64le-dotconfig      |  9682 -------------
 srcpkgs/linux5.9/files/x86_64-dotconfig       | 10047 --------------
 srcpkgs/linux5.9/patches/navi_arm64.patch     |   289 -
 srcpkgs/linux5.9/patches/ppc-vas-on-4k.patch  |    26 -
 srcpkgs/linux5.9/patches/ppc64-be-elfv2.patch |    86 -
 .../linux5.9/patches/ppcle-broken-vdso.patch  |    17 -
 srcpkgs/linux5.9/patches/ppcle-enable.patch   |    33 -
 .../patches/ppcle-ll-compat-sys.patch         |   107 -
 srcpkgs/linux5.9/template                     |   339 -
 17 files changed, 60008 deletions(-)
 delete mode 120000 srcpkgs/linux5.9-dbg
 delete mode 120000 srcpkgs/linux5.9-headers
 delete mode 100644 srcpkgs/linux5.9/files/DocBook/Makefile
 delete mode 100644 srcpkgs/linux5.9/files/arm64-dotconfig
 delete mode 100644 srcpkgs/linux5.9/files/i386-dotconfig
 delete mode 100755 srcpkgs/linux5.9/files/mv-debug
 delete mode 100644 srcpkgs/linux5.9/files/ppc-dotconfig
 delete mode 100644 srcpkgs/linux5.9/files/ppc64-dotconfig
 delete mode 100644 srcpkgs/linux5.9/files/ppc64le-dotconfig
 delete mode 100644 srcpkgs/linux5.9/files/x86_64-dotconfig
 delete mode 100644 srcpkgs/linux5.9/patches/navi_arm64.patch
 delete mode 100644 srcpkgs/linux5.9/patches/ppc-vas-on-4k.patch
 delete mode 100644 srcpkgs/linux5.9/patches/ppc64-be-elfv2.patch
 delete mode 100644 srcpkgs/linux5.9/patches/ppcle-broken-vdso.patch
 delete mode 100644 srcpkgs/linux5.9/patches/ppcle-enable.patch
 delete mode 100644 srcpkgs/linux5.9/patches/ppcle-ll-compat-sys.patch
 delete mode 100644 srcpkgs/linux5.9/template

diff --git a/srcpkgs/linux5.9-dbg b/srcpkgs/linux5.9-dbg
deleted file mode 120000
index 399a8d3c4147..000000000000
--- a/srcpkgs/linux5.9-dbg
+++ /dev/null
@@ -1 +0,0 @@
-linux5.9
\ No newline at end of file
diff --git a/srcpkgs/linux5.9-headers b/srcpkgs/linux5.9-headers
deleted file mode 120000
index 399a8d3c4147..000000000000
--- a/srcpkgs/linux5.9-headers
+++ /dev/null
@@ -1 +0,0 @@
-linux5.9
\ No newline at end of file
diff --git a/srcpkgs/linux5.9/files/DocBook/Makefile b/srcpkgs/linux5.9/files/DocBook/Makefile
deleted file mode 100644
index 85916f13d330..000000000000
--- a/srcpkgs/linux5.9/files/DocBook/Makefile
+++ /dev/null
@@ -1,282 +0,0 @@
-###
-# This makefile is used to generate the kernel documentation,
-# primarily based on in-line comments in various source files.
-# See Documentation/kernel-doc-nano-HOWTO.txt for instruction in how
-# to document the SRC - and how to read it.
-# To add a new book the only step required is to add the book to the
-# list of DOCBOOKS.
-
-DOCBOOKS := z8530book.xml  \
-	    kernel-hacking.xml kernel-locking.xml \
-	    networking.xml \
-	    filesystems.xml lsm.xml kgdb.xml \
-	    libata.xml mtdnand.xml librs.xml rapidio.xml \
-	    s390-drivers.xml scsi.xml \
-	    sh.xml w1.xml
-
-ifeq ($(DOCBOOKS),)
-
-# Skip DocBook build if the user explicitly requested no DOCBOOKS.
-.DEFAULT:
-	@echo "  SKIP    DocBook $@ target (DOCBOOKS=\"\" specified)."
-else
-ifneq ($(SPHINXDIRS),)
-
-# Skip DocBook build if the user explicitly requested a sphinx dir
-.DEFAULT:
-	@echo "  SKIP    DocBook $@ target (SPHINXDIRS specified)."
-else
-
-
-###
-# The build process is as follows (targets):
-#              (xmldocs) [by docproc]
-# file.tmpl --> file.xml +--> file.ps   (psdocs)   [by db2ps or xmlto]
-#                        +--> file.pdf  (pdfdocs)  [by db2pdf or xmlto]
-#                        +--> DIR=file  (htmldocs) [by xmlto]
-#                        +--> man/      (mandocs)  [by xmlto]
-
-
-# for PDF and PS output you can choose between xmlto and docbook-utils tools
-PDF_METHOD	= $(prefer-db2x)
-PS_METHOD	= $(prefer-db2x)
-
-
-targets += $(DOCBOOKS)
-BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
-xmldocs: $(BOOKS)
-sgmldocs: xmldocs
-
-PS := $(patsubst %.xml, %.ps, $(BOOKS))
-psdocs: $(PS)
-
-PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
-pdfdocs: $(PDF)
-
-HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
-htmldocs: $(HTML)
-	$(call cmd,build_main_index)
-
-MAN := $(patsubst %.xml, %.9, $(BOOKS))
-mandocs: $(MAN)
-	find $(obj)/man -name '*.9' | xargs gzip -nf
-
-# Default location for installed man pages
-export INSTALL_MAN_PATH = $(objtree)/usr
-
-installmandocs: mandocs
-	mkdir -p $(INSTALL_MAN_PATH)/man/man9/
-	find $(obj)/man -name '*.9.gz' -printf '%h %f\n' | \
-		sort -k 2 -k 1 | uniq -f 1 | sed -e 's: :/:' | \
-		xargs install -m 644 -t $(INSTALL_MAN_PATH)/man/man9/
-
-# no-op for the DocBook toolchain
-epubdocs:
-latexdocs:
-linkcheckdocs:
-
-###
-#External programs used
-KERNELDOCXMLREF = $(srctree)/scripts/kernel-doc-xml-ref
-KERNELDOC       = $(srctree)/scripts/kernel-doc
-DOCPROC         = $(objtree)/scripts/docproc
-CHECK_LC_CTYPE = $(objtree)/scripts/check-lc_ctype
-
-# Use a fixed encoding - UTF-8 if the C library has support built-in
-# or ASCII if not
-LC_CTYPE := $(call try-run, LC_CTYPE=C.UTF-8 $(CHECK_LC_CTYPE),C.UTF-8,C)
-export LC_CTYPE
-
-XMLTOFLAGS = -m $(srctree)/$(src)/stylesheet.xsl
-XMLTOFLAGS += --skip-validation
-
-###
-# DOCPROC is used for two purposes:
-# 1) To generate a dependency list for a .tmpl file
-# 2) To preprocess a .tmpl file and call kernel-doc with
-#     appropriate parameters.
-# The following rules are used to generate the .xml documentation
-# required to generate the final targets. (ps, pdf, html).
-quiet_cmd_docproc = DOCPROC $@
-      cmd_docproc = SRCTREE=$(srctree)/ $(DOCPROC) doc $< >$@
-define rule_docproc
-	set -e;								\
-        $(if $($(quiet)cmd_$(1)),echo '  $($(quiet)cmd_$(1))';) 	\
-        $(cmd_$(1)); 							\
-        ( 								\
-          echo 'cmd_$@ := $(cmd_$(1))'; 				\
-          echo $@: `SRCTREE=$(srctree) $(DOCPROC) depend $<`; 		\
-        ) > $(dir $@).$(notdir $@).cmd
-endef
-
-%.xml: %.tmpl $(KERNELDOC) $(DOCPROC) $(KERNELDOCXMLREF) FORCE
-	$(call if_changed_rule,docproc)
-
-# Tell kbuild to always build the programs
-always := $(hostprogs-y)
-
-notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \
-		   exit 1
-db2xtemplate = db2TYPE -o $(dir $@) $<
-xmltotemplate = xmlto TYPE $(XMLTOFLAGS) -o $(dir $@) $<
-
-# determine which methods are available
-ifeq ($(shell which db2ps >/dev/null 2>&1 && echo found),found)
-	use-db2x = db2x
-	prefer-db2x = db2x
-else
-	use-db2x = notfound
-	prefer-db2x = $(use-xmlto)
-endif
-ifeq ($(shell which xmlto >/dev/null 2>&1 && echo found),found)
-	use-xmlto = xmlto
-	prefer-xmlto = xmlto
-else
-	use-xmlto = notfound
-	prefer-xmlto = $(use-db2x)
-endif
-
-# the commands, generated from the chosen template
-quiet_cmd_db2ps = PS      $@
-      cmd_db2ps = $(subst TYPE,ps, $($(PS_METHOD)template))
-%.ps : %.xml
-	$(call cmd,db2ps)
-
-quiet_cmd_db2pdf = PDF     $@
-      cmd_db2pdf = $(subst TYPE,pdf, $($(PDF_METHOD)template))
-%.pdf : %.xml
-	$(call cmd,db2pdf)
-
-
-index = index.html
-main_idx = $(obj)/$(index)
-quiet_cmd_build_main_index = HTML    $(main_idx)
-      cmd_build_main_index = rm -rf $(main_idx); \
-		   echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \
-		   echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \
-		   cat $(HTML) >> $(main_idx)
-
-quiet_cmd_db2html = HTML    $@
-      cmd_db2html = xmlto html $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \
-		echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \
-		$(patsubst %.html,%,$(notdir $@))</a><p>' > $@
-
-###
-# Rules to create an aux XML and .db, and use them to re-process the DocBook XML
-# to fill internal hyperlinks
-       gen_aux_xml = :
- quiet_gen_aux_xml = echo '  XMLREF  $@'
-silent_gen_aux_xml = :
-%.aux.xml: %.xml
-	@$($(quiet)gen_aux_xml)
-	@rm -rf $@
-	@(cat $< | egrep "^<refentry id" | egrep -o "\".*\"" | cut -f 2 -d \" > $<.db)
-	@$(KERNELDOCXMLREF) -db $<.db $< > $@
-.PRECIOUS: %.aux.xml
-
-%.html:	%.aux.xml
-	@(which xmlto > /dev/null 2>&1) || \
-	 (echo "*** You need to install xmlto ***"; \
-	  exit 1)
-	@rm -rf $@ $(patsubst %.html,%,$@)
-	$(call cmd,db2html)
-	@if [ ! -z "$(PNG-$(basename $(notdir $@)))" ]; then \
-            cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi
-
-quiet_cmd_db2man = MAN     $@
-      cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man/$(*F) $< ; fi
-%.9 : %.xml
-	@(which xmlto > /dev/null 2>&1) || \
-	 (echo "*** You need to install xmlto ***"; \
-	  exit 1)
-	$(Q)mkdir -p $(obj)/man/$(*F)
-	$(call cmd,db2man)
-	@touch $@
-
-###
-# Rules to generate postscripts and PNG images from .fig format files
-quiet_cmd_fig2eps = FIG2EPS $@
-      cmd_fig2eps = fig2dev -Leps $< $@
-
-%.eps: %.fig
-	@(which fig2dev > /dev/null 2>&1) || \
-	 (echo "*** You need to install transfig ***"; \
-	  exit 1)
-	$(call cmd,fig2eps)
-
-quiet_cmd_fig2png = FIG2PNG $@
-      cmd_fig2png = fig2dev -Lpng $< $@
-
-%.png: %.fig
-	@(which fig2dev > /dev/null 2>&1) || \
-	 (echo "*** You need to install transfig ***"; \
-	  exit 1)
-	$(call cmd,fig2png)
-
-###
-# Rule to convert a .c file to inline XML documentation
-       gen_xml = :
- quiet_gen_xml = echo '  GEN     $@'
-silent_gen_xml = :
-%.xml: %.c
-	@$($(quiet)gen_xml)
-	@(                            \
-	   echo "<programlisting>";   \
-	   expand --tabs=8 < $< |     \
-	   sed -e "s/&/\\&amp;/g"     \
-	       -e "s/</\\&lt;/g"      \
-	       -e "s/>/\\&gt;/g";     \
-	   echo "</programlisting>")  > $@
-
-endif # DOCBOOKS=""
-endif # SPHINDIR=...
-
-###
-# Help targets as used by the top-level makefile
-dochelp:
-	@echo  ' Linux kernel internal documentation in different formats (DocBook):'
-	@echo  '  htmldocs        - HTML'
-	@echo  '  pdfdocs         - PDF'
-	@echo  '  psdocs          - Postscript'
-	@echo  '  xmldocs         - XML DocBook'
-	@echo  '  mandocs         - man pages'
-	@echo  '  installmandocs  - install man pages generated by mandocs to INSTALL_MAN_PATH'; \
-	 echo  '                    (default: $(INSTALL_MAN_PATH))'; \
-	 echo  ''
-	@echo  '  cleandocs       - clean all generated DocBook files'
-	@echo
-	@echo  '  make DOCBOOKS="s1.xml s2.xml" [target] Generate only docs s1.xml s2.xml'
-	@echo  '  valid values for DOCBOOKS are: $(DOCBOOKS)'
-	@echo
-	@echo  "  make DOCBOOKS=\"\" [target] Don't generate docs from Docbook"
-	@echo  '     This is useful to generate only the ReST docs (Sphinx)'
-
-
-###
-# Temporary files left by various tools
-clean-files := $(DOCBOOKS) \
-	$(patsubst %.xml, %.dvi,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.aux,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.tex,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.log,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.out,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.ps,      $(DOCBOOKS)) \
-	$(patsubst %.xml, %.pdf,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.html,    $(DOCBOOKS)) \
-	$(patsubst %.xml, %.9,       $(DOCBOOKS)) \
-	$(patsubst %.xml, %.aux.xml, $(DOCBOOKS)) \
-	$(patsubst %.xml, %.xml.db,  $(DOCBOOKS)) \
-	$(patsubst %.xml, %.xml,     $(DOCBOOKS)) \
-	$(patsubst %.xml, .%.xml.cmd, $(DOCBOOKS)) \
-	$(index)
-
-clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man
-
-cleandocs:
-	$(Q)rm -f $(call objectify, $(clean-files))
-	$(Q)rm -rf $(call objectify, $(clean-dirs))
-
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable so we can use it in if_changed and friends.
-
-.PHONY: $(PHONY)
diff --git a/srcpkgs/linux5.9/files/arm64-dotconfig b/srcpkgs/linux5.9/files/arm64-dotconfig
deleted file mode 100644
index 5caba683a944..000000000000
--- a/srcpkgs/linux5.9/files/arm64-dotconfig
+++ /dev/null
@@ -1,11318 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.9.2 Kernel Configuration
-#
-CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 9.3.0"
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=232000000
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_TABLE_SORT=y
-CONFIG_THREAD_INFO_IN_TASK=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_1"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT=""
-CONFIG_DEFAULT_INIT=""
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_WATCH_QUEUE=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-# CONFIG_USELIB is not set
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_GENERIC_IRQ_INJECTION=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_SIM=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_IRQ_MSI_IOMMU=y
-CONFIG_HANDLE_DOMAIN_IRQ=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
-# end of IRQ subsystem
-
-CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_ARCH_HAS_TICK_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
-CONFIG_CONTEXT_TRACKING=y
-# CONFIG_CONTEXT_TRACKING_FORCE is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-# end of Timers subsystem
-
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_VIRT_CPU_ACCOUNTING=y
-# CONFIG_TICK_CPU_ACCOUNTING is not set
-CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_SCHED_THERMAL_PRESSURE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_PSI=y
-CONFIG_PSI_DEFAULT_DISABLED=y
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
-CONFIG_TASKS_TRACE_RCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKHEADERS=m
-CONFIG_LOG_BUF_SHIFT=18
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-CONFIG_GENERIC_SCHED_CLOCK=y
-
-#
-# Scheduler features
-#
-# CONFIG_UCLAMP_TASK is not set
-# end of Scheduler features
-
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_CC_HAS_INT128=y
-CONFIG_ARCH_SUPPORTS_INT128=y
-CONFIG_NUMA_BALANCING=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_CGROUPS=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_RDMA=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_HUGETLB=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_TIME_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-CONFIG_CHECKPOINT_RESTORE=y
-# CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_RD_ZSTD=y
-CONFIG_BOOT_CONFIG=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_MULTIUSER=y
-# CONFIG_SGETMASK_SYSCALL is not set
-CONFIG_SYSFS_SYSCALL=y
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_HAVE_FUTEX_CMPXCHG=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_LSM=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
-CONFIG_BPF_JIT_DEFAULT_ON=y
-CONFIG_USERFAULTFD=y
-CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLAB_FREELIST_RANDOM=y
-CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_SYSTEM_DATA_VERIFICATION=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-# end of General setup
-
-CONFIG_ARM64=y
-CONFIG_64BIT=y
-CONFIG_MMU=y
-CONFIG_ARM64_PAGE_SHIFT=12
-CONFIG_ARM64_CONT_SHIFT=4
-CONFIG_ARCH_MMAP_RND_BITS_MIN=18
-CONFIG_ARCH_MMAP_RND_BITS_MAX=33
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CSUM=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ZONE_DMA=y
-CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_SMP=y
-CONFIG_KERNEL_MODE_NEON=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=4
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-
-#
-# Platform selection
-#
-CONFIG_ARCH_ACTIONS=y
-CONFIG_ARCH_AGILEX=y
-CONFIG_ARCH_SUNXI=y
-CONFIG_ARCH_ALPINE=y
-CONFIG_ARCH_BCM2835=y
-CONFIG_ARCH_BCM_IPROC=y
-CONFIG_ARCH_BERLIN=y
-CONFIG_ARCH_BITMAIN=y
-CONFIG_ARCH_BRCMSTB=y
-CONFIG_ARCH_EXYNOS=y
-CONFIG_ARCH_SPARX5=y
-# CONFIG_ARCH_K3 is not set
-CONFIG_ARCH_LAYERSCAPE=y
-CONFIG_ARCH_LG1K=y
-CONFIG_ARCH_HISI=y
-CONFIG_ARCH_KEEMBAY=y
-CONFIG_ARCH_MEDIATEK=y
-CONFIG_ARCH_MESON=y
-CONFIG_ARCH_MVEBU=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_QCOM=y
-CONFIG_ARCH_REALTEK=y
-# CONFIG_ARCH_RENESAS is not set
-CONFIG_ARCH_ROCKCHIP=y
-CONFIG_ARCH_S32=y
-CONFIG_ARCH_SEATTLE=y
-CONFIG_ARCH_STRATIX10=y
-CONFIG_ARCH_SYNQUACER=y
-CONFIG_ARCH_TEGRA=y
-CONFIG_ARCH_SPRD=y
-CONFIG_ARCH_THUNDER=y
-CONFIG_ARCH_THUNDER2=y
-# CONFIG_ARCH_UNIPHIER is not set
-CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARCH_XGENE=y
-CONFIG_ARCH_ZX=y
-CONFIG_ARCH_ZYNQMP=y
-# end of Platform selection
-
-#
-# Kernel Features
-#
-
-#
-# ARM errata workarounds via the alternatives framework
-#
-CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
-CONFIG_ARM64_ERRATUM_826319=y
-CONFIG_ARM64_ERRATUM_827319=y
-CONFIG_ARM64_ERRATUM_824069=y
-CONFIG_ARM64_ERRATUM_819472=y
-CONFIG_ARM64_ERRATUM_832075=y
-CONFIG_ARM64_ERRATUM_834220=y
-CONFIG_ARM64_ERRATUM_845719=y
-CONFIG_ARM64_ERRATUM_843419=y
-CONFIG_ARM64_ERRATUM_1024718=y
-CONFIG_ARM64_ERRATUM_1418040=y
-CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
-CONFIG_ARM64_ERRATUM_1165522=y
-CONFIG_ARM64_ERRATUM_1319367=y
-CONFIG_ARM64_ERRATUM_1530923=y
-CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
-CONFIG_ARM64_ERRATUM_1286807=y
-CONFIG_ARM64_ERRATUM_1463225=y
-CONFIG_ARM64_ERRATUM_1542419=y
-CONFIG_CAVIUM_ERRATUM_22375=y
-CONFIG_CAVIUM_ERRATUM_23144=y
-CONFIG_CAVIUM_ERRATUM_23154=y
-CONFIG_CAVIUM_ERRATUM_27456=y
-CONFIG_CAVIUM_ERRATUM_30115=y
-CONFIG_CAVIUM_TX2_ERRATUM_219=y
-CONFIG_FUJITSU_ERRATUM_010001=y
-CONFIG_HISILICON_ERRATUM_161600802=y
-CONFIG_QCOM_FALKOR_ERRATUM_1003=y
-CONFIG_QCOM_FALKOR_ERRATUM_1009=y
-CONFIG_QCOM_QDF2400_ERRATUM_0065=y
-CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
-CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
-# end of ARM errata workarounds via the alternatives framework
-
-CONFIG_ARM64_4K_PAGES=y
-# CONFIG_ARM64_16K_PAGES is not set
-# CONFIG_ARM64_64K_PAGES is not set
-# CONFIG_ARM64_VA_BITS_39 is not set
-CONFIG_ARM64_VA_BITS_48=y
-CONFIG_ARM64_VA_BITS=48
-CONFIG_ARM64_PA_BITS_48=y
-CONFIG_ARM64_PA_BITS=48
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_SMT=y
-CONFIG_NR_CPUS=480
-CONFIG_HOTPLUG_CPU=y
-CONFIG_NUMA=y
-CONFIG_NODES_SHIFT=6
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_HOLES_IN_ZONE=y
-CONFIG_HZ_100=y
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=100
-CONFIG_SCHED_HRTICK=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
-CONFIG_HW_PERF_EVENTS=y
-CONFIG_SYS_SUPPORTS_HUGETLBFS=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_SECCOMP=y
-# CONFIG_PARAVIRT is not set
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_KEXEC=y
-# CONFIG_KEXEC_FILE is not set
-CONFIG_CRASH_DUMP=y
-# CONFIG_XEN is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_UNMAP_KERNEL_AT_EL0=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
-CONFIG_ARM64_SSBD=y
-CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM64_TAGGED_ADDR_ABI=y
-CONFIG_COMPAT=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_ARMV8_DEPRECATED=y
-CONFIG_SWP_EMULATION=y
-CONFIG_CP15_BARRIER_EMULATION=y
-CONFIG_SETEND_EMULATION=y
-
-#
-# ARMv8.1 architectural features
-#
-CONFIG_ARM64_HW_AFDBM=y
-CONFIG_ARM64_PAN=y
-CONFIG_ARM64_LSE_ATOMICS=y
-CONFIG_ARM64_USE_LSE_ATOMICS=y
-CONFIG_ARM64_VHE=y
-# end of ARMv8.1 architectural features
-
-#
-# ARMv8.2 architectural features
-#
-CONFIG_ARM64_UAO=y
-CONFIG_ARM64_PMEM=y
-CONFIG_ARM64_RAS_EXTN=y
-CONFIG_ARM64_CNP=y
-# end of ARMv8.2 architectural features
-
-#
-# ARMv8.3 architectural features
-#
-CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
-CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
-CONFIG_AS_HAS_PAC=y
-# end of ARMv8.3 architectural features
-
-#
-# ARMv8.4 architectural features
-#
-CONFIG_ARM64_AMU_EXTN=y
-CONFIG_AS_HAS_ARMV8_4=y
-CONFIG_ARM64_TLB_RANGE=y
-# end of ARMv8.4 architectural features
-
-#
-# ARMv8.5 architectural features
-#
-CONFIG_ARM64_BTI=y
-CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
-CONFIG_ARM64_E0PD=y
-CONFIG_ARCH_RANDOM=y
-# end of ARMv8.5 architectural features
-
-CONFIG_ARM64_SVE=y
-CONFIG_ARM64_MODULE_PLTS=y
-CONFIG_ARM64_PSEUDO_NMI=y
-# CONFIG_ARM64_DEBUG_PRIORITY_MASKING is not set
-CONFIG_RELOCATABLE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
-CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
-CONFIG_STACKPROTECTOR_PER_TASK=y
-# end of Kernel Features
-
-#
-# Boot options
-#
-CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
-CONFIG_CMDLINE=""
-CONFIG_EFI_STUB=y
-CONFIG_EFI=y
-CONFIG_DMI=y
-# end of Boot options
-
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
-
-#
-# Power management options
-#
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_HIBERNATION_SNAPSHOT_DEV=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_AUTOSLEEP=y
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=100
-CONFIG_PM_WAKELOCKS_GC=y
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_PM_SLEEP_DEBUG=y
-CONFIG_DPM_WATCHDOG=y
-CONFIG_DPM_WATCHDOG_TIMEOUT=60
-CONFIG_PM_CLK=y
-CONFIG_PM_GENERIC_DOMAINS=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_GENERIC_DOMAINS_OF=y
-CONFIG_CPU_PM=y
-CONFIG_ENERGY_MODEL=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# end of Power management options
-
-#
-# CPU Power Management
-#
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_CPU_IDLE_GOV_TEO=y
-CONFIG_DT_IDLE_STATES=y
-
-#
-# ARM CPU Idle Drivers
-#
-CONFIG_ARM_CPUIDLE=y
-CONFIG_ARM_PSCI_CPUIDLE=y
-CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
-# end of ARM CPU Idle Drivers
-# end of CPU Idle
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-
-#
-# CPU frequency scaling drivers
-#
-CONFIG_CPUFREQ_DT=m
-CONFIG_CPUFREQ_DT_PLATDEV=y
-CONFIG_ACPI_CPPC_CPUFREQ=m
-CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m
-CONFIG_ARM_ARMADA_37XX_CPUFREQ=m
-CONFIG_ARM_ARMADA_8K_CPUFREQ=m
-CONFIG_ARM_SCPI_CPUFREQ=m
-CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=m
-CONFIG_ARM_IMX_CPUFREQ_DT=m
-CONFIG_ARM_MEDIATEK_CPUFREQ=m
-CONFIG_ARM_QCOM_CPUFREQ_NVMEM=m
-CONFIG_ARM_QCOM_CPUFREQ_HW=m
-CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
-CONFIG_ARM_SCMI_CPUFREQ=m
-# CONFIG_ARM_TEGRA20_CPUFREQ is not set
-CONFIG_ARM_TEGRA124_CPUFREQ=y
-CONFIG_ARM_TEGRA186_CPUFREQ=m
-CONFIG_ARM_TEGRA194_CPUFREQ=m
-CONFIG_QORIQ_CPUFREQ=m
-# end of CPU Frequency scaling
-# end of CPU Power Management
-
-#
-# Firmware Drivers
-#
-CONFIG_ARM_SCMI_PROTOCOL=y
-CONFIG_ARM_SCMI_POWER_DOMAIN=m
-CONFIG_ARM_SCPI_PROTOCOL=m
-CONFIG_ARM_SCPI_POWER_DOMAIN=m
-CONFIG_ARM_SDE_INTERFACE=y
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=m
-CONFIG_ISCSI_IBFT=m
-CONFIG_RASPBERRYPI_FIRMWARE=y
-CONFIG_FW_CFG_SYSFS=m
-CONFIG_FW_CFG_SYSFS_CMDLINE=y
-CONFIG_INTEL_STRATIX10_SERVICE=m
-CONFIG_INTEL_STRATIX10_RSU=m
-CONFIG_QCOM_SCM=y
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-CONFIG_TURRIS_MOX_RWTM=m
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=y
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=m
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
-CONFIG_EFI_SOFT_RESERVE=y
-CONFIG_EFI_PARAMS_FROM_FDT=y
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_GENERIC_STUB=y
-CONFIG_EFI_ARMSTUB_DTB_LOADER=y
-CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
-CONFIG_EFI_BOOTLOADER_CONTROL=m
-CONFIG_EFI_CAPSULE_LOADER=m
-# CONFIG_EFI_TEST is not set
-# CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_EFI_DISABLE_PCI_DMA is not set
-# end of EFI (Extensible Firmware Interface) Support
-
-CONFIG_UEFI_CPER=y
-CONFIG_UEFI_CPER_ARM=y
-CONFIG_EFI_EARLYCON=y
-CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
-CONFIG_IMX_DSP=m
-CONFIG_IMX_SCU=y
-CONFIG_IMX_SCU_PD=y
-CONFIG_MESON_SM=y
-CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_PSCI_CHECKER is not set
-CONFIG_HAVE_ARM_SMCCC=y
-CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
-CONFIG_ARM_SMCCC_SOC_ID=y
-
-#
-# Tegra firmware driver
-#
-CONFIG_TEGRA_IVC=y
-CONFIG_TEGRA_BPMP=y
-# end of Tegra firmware driver
-
-#
-# Zynq MPSoC Firmware Drivers
-#
-CONFIG_ZYNQMP_FIRMWARE=y
-# CONFIG_ZYNQMP_FIRMWARE_DEBUG is not set
-# end of Zynq MPSoC Firmware Drivers
-# end of Firmware Drivers
-
-CONFIG_ARCH_SUPPORTS_ACPI=y
-CONFIG_ACPI=y
-CONFIG_ACPI_GENERIC_GSI=y
-CONFIG_ACPI_CCA_REQUIRED=y
-# CONFIG_ACPI_DEBUGGER is not set
-CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_EC_DEBUGFS is not set
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=y
-CONFIG_ACPI_FAN=y
-CONFIG_ACPI_TAD=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_PROCESSOR_IDLE=y
-CONFIG_ACPI_MCFG=y
-CONFIG_ACPI_CPPC_LIB=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_CUSTOM_DSDT_FILE=""
-CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
-CONFIG_ACPI_TABLE_UPGRADE=y
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_MEMORY=y
-CONFIG_ACPI_HED=y
-CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_BGRT=y
-CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
-CONFIG_ACPI_NFIT=m
-# CONFIG_NFIT_SECURITY_DEBUG is not set
-CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_HMAT=y
-CONFIG_HAVE_ACPI_APEI=y
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_SEA=y
-CONFIG_ACPI_APEI_MEMORY_FAILURE=y
-CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_ERST_DEBUG=m
-CONFIG_ACPI_WATCHDOG=y
-CONFIG_PMIC_OPREGION=y
-CONFIG_ACPI_CONFIGFS=m
-CONFIG_ACPI_IORT=y
-CONFIG_ACPI_GTDT=y
-CONFIG_ACPI_PPTT=y
-# CONFIG_TPS68470_PMIC_OPREGION is not set
-CONFIG_IRQ_BYPASS_MANAGER=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_MMIO=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
-CONFIG_KVM_ARM_PMU=y
-CONFIG_KVM_INDIRECT_VECTORS=y
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA256_ARM64=m
-CONFIG_CRYPTO_SHA512_ARM64=m
-CONFIG_CRYPTO_SHA1_ARM64_CE=m
-CONFIG_CRYPTO_SHA2_ARM64_CE=m
-CONFIG_CRYPTO_SHA512_ARM64_CE=m
-CONFIG_CRYPTO_SHA3_ARM64=m
-CONFIG_CRYPTO_SM3_ARM64_CE=m
-CONFIG_CRYPTO_SM4_ARM64_CE=m
-CONFIG_CRYPTO_GHASH_ARM64_CE=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64=m
-CONFIG_CRYPTO_AES_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
-CONFIG_CRYPTO_CHACHA20_NEON=m
-CONFIG_CRYPTO_POLY1305_NEON=m
-CONFIG_CRYPTO_NHPOLY1305_NEON=m
-CONFIG_CRYPTO_AES_ARM64_BS=m
-
-#
-# General architecture-dependent options
-#
-CONFIG_CRASH_CORE=y
-CONFIG_KEXEC_CORE=y
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_KRETPROBES=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_KEEPINITRD=y
-CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
-CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
-CONFIG_HAVE_ASM_MODVERSIONS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
-CONFIG_MMU_GATHER_TABLE_FREE=y
-CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_ARCH_STACKLEAK=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_HUGE_VMAP=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_ARCH_MMAP_RND_BITS=18
-CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
-CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_COMPAT_OLD_SIGACTION=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_HAVE_ARCH_VMAP_STACK=y
-CONFIG_VMAP_STACK=y
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_HAVE_ARCH_COMPILER_H=y
-CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
-CONFIG_ARCH_HAS_RELR=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# end of GCOV-based kernel profiling
-
-CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-CONFIG_ASM_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_RQ_ALLOC_TIME=y
-CONFIG_BLK_SCSI_REQUEST=y
-CONFIG_BLK_CGROUP_RWSTAT=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
-CONFIG_BLK_DEV_ZONED=y
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
-# CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_WBT=y
-CONFIG_BLK_CGROUP_IOLATENCY=y
-CONFIG_BLK_CGROUP_IOCOST=y
-CONFIG_BLK_WBT_MQ=y
-CONFIG_BLK_DEBUG_FS=y
-CONFIG_BLK_DEBUG_FS_ZONED=y
-# CONFIG_BLK_SED_OPAL is not set
-CONFIG_BLK_INLINE_ENCRYPTION=y
-CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AIX_PARTITION is not set
-CONFIG_OSF_PARTITION=y
-# CONFIG_AMIGA_PARTITION is not set
-CONFIG_ATARI_PARTITION=y
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-# CONFIG_MINIX_SUBPARTITION is not set
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-CONFIG_SGI_PARTITION=y
-CONFIG_ULTRIX_PARTITION=y
-CONFIG_SUN_PARTITION=y
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-CONFIG_SYSV68_PARTITION=y
-# CONFIG_CMDLINE_PARTITION is not set
-# end of Partition Types
-
-CONFIG_BLOCK_COMPAT=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_MQ_RDMA=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-CONFIG_IOSCHED_BFQ=y
-CONFIG_BFQ_GROUP_IOSCHED=y
-# CONFIG_BFQ_CGROUP_DEBUG is not set
-# end of IO Schedulers
-
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=y
-CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y
-CONFIG_ARCH_INLINE_SPIN_TRYLOCK_BH=y
-CONFIG_ARCH_INLINE_SPIN_LOCK=y
-CONFIG_ARCH_INLINE_SPIN_LOCK_BH=y
-CONFIG_ARCH_INLINE_SPIN_LOCK_IRQ=y
-CONFIG_ARCH_INLINE_SPIN_LOCK_IRQSAVE=y
-CONFIG_ARCH_INLINE_SPIN_UNLOCK=y
-CONFIG_ARCH_INLINE_SPIN_UNLOCK_BH=y
-CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE=y
-CONFIG_ARCH_INLINE_READ_LOCK=y
-CONFIG_ARCH_INLINE_READ_LOCK_BH=y
-CONFIG_ARCH_INLINE_READ_LOCK_IRQ=y
-CONFIG_ARCH_INLINE_READ_LOCK_IRQSAVE=y
-CONFIG_ARCH_INLINE_READ_UNLOCK=y
-CONFIG_ARCH_INLINE_READ_UNLOCK_BH=y
-CONFIG_ARCH_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_ARCH_INLINE_READ_UNLOCK_IRQRESTORE=y
-CONFIG_ARCH_INLINE_WRITE_LOCK=y
-CONFIG_ARCH_INLINE_WRITE_LOCK_BH=y
-CONFIG_ARCH_INLINE_WRITE_LOCK_IRQ=y
-CONFIG_ARCH_INLINE_WRITE_LOCK_IRQSAVE=y
-CONFIG_ARCH_INLINE_WRITE_UNLOCK=y
-CONFIG_ARCH_INLINE_WRITE_UNLOCK_BH=y
-CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE=y
-CONFIG_INLINE_SPIN_TRYLOCK=y
-CONFIG_INLINE_SPIN_TRYLOCK_BH=y
-CONFIG_INLINE_SPIN_LOCK=y
-CONFIG_INLINE_SPIN_LOCK_BH=y
-CONFIG_INLINE_SPIN_LOCK_IRQ=y
-CONFIG_INLINE_SPIN_LOCK_IRQSAVE=y
-CONFIG_INLINE_SPIN_UNLOCK_BH=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE=y
-CONFIG_INLINE_READ_LOCK=y
-CONFIG_INLINE_READ_LOCK_BH=y
-CONFIG_INLINE_READ_LOCK_IRQ=y
-CONFIG_INLINE_READ_LOCK_IRQSAVE=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_BH=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK_IRQRESTORE=y
-CONFIG_INLINE_WRITE_LOCK=y
-CONFIG_INLINE_WRITE_LOCK_BH=y
-CONFIG_INLINE_WRITE_LOCK_IRQ=y
-CONFIG_INLINE_WRITE_LOCK_IRQSAVE=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_BH=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
-CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_ARCH_BINFMT_ELF_STATE=y
-CONFIG_ARCH_HAVE_ELF_PROT=y
-CONFIG_ARCH_USE_GNU_PROPERTY=y
-CONFIG_ELFCORE=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_FAST_GUP=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_NUMA_KEEP_MEMINFO=y
-CONFIG_MEMORY_ISOLATION=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_PAGE_REPORTING=y
-CONFIG_MIGRATION=y
-CONFIG_CONTIG_ALLOC=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_BOUNCE=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_MEMORY_FAILURE=y
-CONFIG_HWPOISON_INJECT=m
-CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
-CONFIG_CLEANCACHE=y
-CONFIG_FRONTSWAP=y
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_AREAS=7
-CONFIG_ZSWAP=y
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
-CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
-CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
-CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
-CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
-# CONFIG_ZSWAP_DEFAULT_ON is not set
-CONFIG_ZPOOL=y
-CONFIG_ZBUD=y
-CONFIG_Z3FOLD=m
-CONFIG_ZSMALLOC=y
-CONFIG_ZSMALLOC_PGTABLE_MAPPING=y
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
-# CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_ARCH_HAS_PTE_DEVMAP=y
-CONFIG_ZONE_DEVICE=y
-CONFIG_DEV_PAGEMAP_OPS=y
-CONFIG_HMM_MIRROR=y
-CONFIG_DEVICE_PRIVATE=y
-CONFIG_FRAME_VECTOR=y
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-CONFIG_READ_ONLY_THP_FOR_FS=y
-CONFIG_ARCH_HAS_PTE_SPECIAL=y
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-CONFIG_NET_REDIRECT=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=m
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-CONFIG_UNIX_DIAG=m
-CONFIG_TLS=m
-CONFIG_TLS_DEVICE=y
-# CONFIG_TLS_TOE is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_OFFLOAD=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-CONFIG_XFRM_INTERFACE=m
-CONFIG_XFRM_SUB_POLICY=y
-CONFIG_XFRM_MIGRATE=y
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_AH=m
-CONFIG_XFRM_ESP=m
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_XFRM_ESPINTCP=y
-CONFIG_SMC=m
-CONFIG_SMC_DIAG=m
-CONFIG_XDP_SOCKETS=y
-CONFIG_XDP_SOCKETS_DIAG=m
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_ESP_OFFLOAD=m
-CONFIG_INET_ESPINTCP=y
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
-# CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_NV=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_TCP_CONG_DCTCP=m
-CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_ESP_OFFLOAD=m
-CONFIG_INET6_ESPINTCP=y
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_FOU=m
-CONFIG_IPV6_FOU_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-CONFIG_IPV6_SEG6_LWTUNNEL=y
-CONFIG_IPV6_SEG6_HMAC=y
-CONFIG_IPV6_SEG6_BPF=y
-CONFIG_IPV6_RPL_LWTUNNEL=y
-CONFIG_NETLABEL=y
-CONFIG_MPTCP=y
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_MPTCP_IPV6=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NET_PTP_CLASSIFY=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_FAMILY_BRIDGE=y
-CONFIG_NETFILTER_FAMILY_ARP=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-CONFIG_NF_LOG_NETDEV=m
-CONFIG_NETFILTER_CONNCOUNT=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NF_NAT_MASQUERADE=y
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CONNLIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_TUNNEL=m
-CONFIG_NFT_OBJREF=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
-CONFIG_NFT_XFRM=m
-CONFIG_NFT_SOCKET=m
-CONFIG_NFT_OSF=m
-CONFIG_NFT_TPROXY=m
-CONFIG_NFT_SYNPROXY=m
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_FIB_NETDEV=m
-CONFIG_NF_FLOW_TABLE_INET=m
-CONFIG_NF_FLOW_TABLE=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-# end of Core Netfilter Configuration
-
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_MH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS MH scheduler
-#
-CONFIG_IP_VS_MH_TAB_INDEX=12
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_SOCKET_IPV4=m
-CONFIG_NF_TPROXY_IPV4=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_FLOW_TABLE_IPV4=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# end of IP: Netfilter Configuration
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_SOCKET_IPV6=m
-CONFIG_NF_TPROXY_IPV6=m
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_FLOW_TABLE_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_SRH=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-# end of IPv6: Netfilter Configuration
-
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NFT_BRIDGE_META=m
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
-CONFIG_NF_CONNTRACK_BRIDGE=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_BPFILTER=y
-# CONFIG_BPFILTER_UMH is not set
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-# end of DCCP CCIDs Configuration
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-# end of DCCP Kernel Hacking
-
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_COOKIE_HMAC_SHA1 is not set
-CONFIG_INET_SCTP_DIAG=m
-CONFIG_RDS=m
-CONFIG_RDS_RDMA=m
-CONFIG_RDS_TCP=m
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-# CONFIG_TIPC_MEDIA_IB is not set
-CONFIG_TIPC_MEDIA_UDP=y
-CONFIG_TIPC_CRYPTO=y
-CONFIG_TIPC_DIAG=m
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-CONFIG_L2TP_DEBUGFS=m
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_MRP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_BRIDGE_MRP=y
-CONFIG_HAVE_NET_DSA=y
-CONFIG_NET_DSA=m
-CONFIG_NET_DSA_TAG_8021Q=m
-# CONFIG_NET_DSA_TAG_AR9331 is not set
-CONFIG_NET_DSA_TAG_BRCM_COMMON=m
-CONFIG_NET_DSA_TAG_BRCM=m
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
-CONFIG_NET_DSA_TAG_GSWIP=m
-CONFIG_NET_DSA_TAG_DSA=m
-CONFIG_NET_DSA_TAG_EDSA=m
-CONFIG_NET_DSA_TAG_MTK=m
-CONFIG_NET_DSA_TAG_KSZ=m
-CONFIG_NET_DSA_TAG_RTL4_A=m
-CONFIG_NET_DSA_TAG_OCELOT=m
-CONFIG_NET_DSA_TAG_QCA=m
-CONFIG_NET_DSA_TAG_LAN9303=m
-CONFIG_NET_DSA_TAG_SJA1105=m
-CONFIG_NET_DSA_TAG_TRAILER=m
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_X25=m
-CONFIG_LAPB=m
-CONFIG_PHONET=m
-CONFIG_6LOWPAN=m
-# CONFIG_6LOWPAN_DEBUGFS is not set
-CONFIG_6LOWPAN_NHC=m
-CONFIG_6LOWPAN_NHC_DEST=m
-CONFIG_6LOWPAN_NHC_FRAGMENT=m
-CONFIG_6LOWPAN_NHC_HOP=m
-CONFIG_6LOWPAN_NHC_IPV6=m
-CONFIG_6LOWPAN_NHC_MOBILITY=m
-CONFIG_6LOWPAN_NHC_ROUTING=m
-CONFIG_6LOWPAN_NHC_UDP=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
-CONFIG_6LOWPAN_GHC_UDP=m
-CONFIG_6LOWPAN_GHC_ICMPV6=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
-CONFIG_IEEE802154=m
-CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
-CONFIG_IEEE802154_SOCKET=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_CBS=m
-CONFIG_NET_SCH_ETF=m
-CONFIG_NET_SCH_TAPRIO=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_SKBPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_CAKE=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_FQ_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-CONFIG_NET_SCH_ETS=m
-# CONFIG_NET_SCH_DEFAULT is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_MATCHALL=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_CANID=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_IPT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_SAMPLE=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_ACT_MPLS=m
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-CONFIG_NET_ACT_CTINFO=m
-CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-CONFIG_NET_ACT_CT=m
-CONFIG_NET_ACT_GATE=m
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_TC_SKB_EXT=y
-CONFIG_NET_SCH_FIFO=y
-CONFIG_DCB=y
-CONFIG_DNS_RESOLVER=m
-CONFIG_BATMAN_ADV=m
-CONFIG_BATMAN_ADV_BATMAN_V=y
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-CONFIG_BATMAN_ADV_NC=y
-CONFIG_BATMAN_ADV_MCAST=y
-CONFIG_BATMAN_ADV_DEBUGFS=y
-CONFIG_BATMAN_ADV_DEBUG=y
-CONFIG_BATMAN_ADV_SYSFS=y
-# CONFIG_BATMAN_ADV_TRACING is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
-CONFIG_VSOCKETS_DIAG=m
-CONFIG_VSOCKETS_LOOPBACK=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-CONFIG_NETLINK_DIAG=m
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_NET_NSH=m
-CONFIG_HSR=m
-CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_L3_MASTER_DEV=y
-CONFIG_QRTR=m
-CONFIG_QRTR_SMD=m
-CONFIG_QRTR_TUN=m
-CONFIG_QRTR_MHI=m
-CONFIG_NET_NCSI=y
-CONFIG_NCSI_OEM_CMD_GET_MAC=y
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-CONFIG_BPF_STREAM_PARSER=y
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_DROP_MONITOR=y
-# end of Network testing
-# end of Networking options
-
-CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
-CONFIG_AX25=m
-CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_MKISS=m
-CONFIG_6PACK=m
-CONFIG_BPQETHER=m
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_YAM=m
-# end of AX.25 network device drivers
-
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_GW=m
-CONFIG_CAN_J1939=m
-
-#
-# CAN Device Drivers
-#
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_VXCAN=m
-CONFIG_CAN_SLCAN=m
-CONFIG_CAN_DEV=m
-CONFIG_CAN_CALC_BITTIMING=y
-CONFIG_CAN_FLEXCAN=m
-# CONFIG_CAN_GRCAN is not set
-CONFIG_CAN_KVASER_PCIEFD=m
-CONFIG_CAN_XILINXCAN=m
-CONFIG_CAN_C_CAN=m
-# CONFIG_CAN_C_CAN_PLATFORM is not set
-CONFIG_CAN_C_CAN_PCI=m
-# CONFIG_CAN_CC770 is not set
-CONFIG_CAN_IFI_CANFD=m
-CONFIG_CAN_M_CAN=m
-CONFIG_CAN_M_CAN_PLATFORM=m
-CONFIG_CAN_M_CAN_TCAN4X5X=m
-CONFIG_CAN_PEAK_PCIEFD=m
-CONFIG_CAN_SJA1000=m
-CONFIG_CAN_EMS_PCI=m
-CONFIG_CAN_EMS_PCMCIA=m
-CONFIG_CAN_F81601=m
-CONFIG_CAN_KVASER_PCI=m
-CONFIG_CAN_PEAK_PCI=m
-CONFIG_CAN_PEAK_PCIEC=y
-CONFIG_CAN_PEAK_PCMCIA=m
-CONFIG_CAN_PLX_PCI=m
-# CONFIG_CAN_SJA1000_ISA is not set
-# CONFIG_CAN_SJA1000_PLATFORM is not set
-CONFIG_CAN_SOFTING=m
-CONFIG_CAN_SOFTING_CS=m
-
-#
-# CAN SPI interfaces
-#
-CONFIG_CAN_HI311X=m
-# CONFIG_CAN_MCP251X is not set
-# end of CAN SPI interfaces
-
-#
-# CAN USB interfaces
-#
-CONFIG_CAN_8DEV_USB=m
-CONFIG_CAN_EMS_USB=m
-CONFIG_CAN_ESD_USB2=m
-CONFIG_CAN_GS_USB=m
-CONFIG_CAN_KVASER_USB=m
-CONFIG_CAN_MCBA_USB=m
-CONFIG_CAN_PEAK_USB=m
-CONFIG_CAN_UCAN=m
-# end of CAN USB interfaces
-
-# CONFIG_CAN_DEBUG_DEVICES is not set
-# end of CAN Device Drivers
-
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-CONFIG_BT_6LOWPAN=m
-CONFIG_BT_LEDS=y
-CONFIG_BT_MSFTEXT=y
-# CONFIG_BT_DEBUGFS is not set
-# CONFIG_BT_SELFTEST is not set
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_MTK=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_SERDEV=y
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_NOKIA=m
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_BCM=y
-CONFIG_BT_HCIUART_RTL=y
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIUART_MRVL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_MTKSDIO=m
-CONFIG_BT_MTKUART=m
-CONFIG_BT_QCOMSMD=m
-CONFIG_BT_HCIRSI=m
-# end of Bluetooth device drivers
-
-CONFIG_AF_RXRPC=m
-CONFIG_AF_RXRPC_IPV6=y
-# CONFIG_AF_RXRPC_INJECT_LOSS is not set
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=y
-CONFIG_AF_KCM=m
-CONFIG_STREAM_PARSER=y
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
-CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
-CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_CFG80211_CRDA_SUPPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-CONFIG_MAC80211_DEBUGFS=y
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_GPIO=m
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-CONFIG_NET_9P_RDMA=m
-# CONFIG_NET_9P_DEBUG is not set
-CONFIG_CAIF=m
-# CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_NETDEV=m
-CONFIG_CAIF_USB=m
-CONFIG_CEPH_LIB=m
-CONFIG_CEPH_LIB_PRETTYDEBUG=y
-# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
-CONFIG_NFC=m
-CONFIG_NFC_DIGITAL=m
-CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
-CONFIG_NFC_NCI_UART=m
-CONFIG_NFC_HCI=m
-CONFIG_NFC_SHDLC=y
-
-#
-# Near Field Communication (NFC) devices
-#
-# CONFIG_NFC_TRF7970A is not set
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PORT100=m
-# CONFIG_NFC_FDP is not set
-CONFIG_NFC_PN544=m
-CONFIG_NFC_PN544_I2C=m
-CONFIG_NFC_PN533=m
-CONFIG_NFC_PN533_USB=m
-CONFIG_NFC_PN533_I2C=m
-CONFIG_NFC_PN532_UART=m
-CONFIG_NFC_MICROREAD=m
-CONFIG_NFC_MICROREAD_I2C=m
-CONFIG_NFC_MRVL=m
-CONFIG_NFC_MRVL_USB=m
-CONFIG_NFC_MRVL_UART=m
-CONFIG_NFC_MRVL_I2C=m
-CONFIG_NFC_ST21NFCA=m
-CONFIG_NFC_ST21NFCA_I2C=m
-CONFIG_NFC_ST_NCI=m
-CONFIG_NFC_ST_NCI_I2C=m
-CONFIG_NFC_ST_NCI_SPI=m
-CONFIG_NFC_NXP_NCI=m
-CONFIG_NFC_NXP_NCI_I2C=m
-CONFIG_NFC_S3FWRN5=m
-CONFIG_NFC_S3FWRN5_I2C=m
-CONFIG_NFC_ST95HF=m
-# end of Near Field Communication (NFC) devices
-
-CONFIG_PSAMPLE=m
-CONFIG_NET_IFE=m
-CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_SOCK_VALIDATE_XMIT=y
-CONFIG_NET_SOCK_MSG=y
-CONFIG_NET_DEVLINK=y
-CONFIG_PAGE_POOL=y
-CONFIG_FAILOVER=m
-CONFIG_ETHTOOL_NETLINK=y
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_ARM_AMBA=y
-CONFIG_TEGRA_AHB=y
-CONFIG_HAVE_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_DOMAINS_GENERIC=y
-CONFIG_PCI_SYSCALL=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-CONFIG_PCIEAER_INJECT=m
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEASPM=y
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-CONFIG_PCIE_DPC=y
-CONFIG_PCIE_PTM=y
-# CONFIG_PCIE_BW is not set
-CONFIG_PCIE_EDR=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-CONFIG_PCI_STUB=y
-CONFIG_PCI_PF_STUB=m
-CONFIG_PCI_ATS=y
-CONFIG_PCI_ECAM=y
-CONFIG_PCI_BRIDGE_EMUL=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_P2PDMA=y
-CONFIG_PCI_LABEL=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_SHPC=y
-
-#
-# PCI controller drivers
-#
-CONFIG_PCI_AARDVARK=y
-CONFIG_PCIE_XILINX_NWL=y
-CONFIG_PCI_FTPCI100=y
-CONFIG_PCI_TEGRA=y
-CONFIG_PCI_HOST_COMMON=y
-CONFIG_PCI_HOST_GENERIC=y
-CONFIG_PCIE_XILINX=y
-CONFIG_PCIE_XILINX_CPM=y
-CONFIG_PCI_XGENE=y
-CONFIG_PCI_XGENE_MSI=y
-CONFIG_PCIE_IPROC=m
-CONFIG_PCIE_IPROC_PLATFORM=m
-CONFIG_PCIE_IPROC_MSI=y
-CONFIG_PCIE_ALTERA=y
-CONFIG_PCIE_ALTERA_MSI=y
-CONFIG_PCI_HOST_THUNDER_PEM=y
-CONFIG_PCI_HOST_THUNDER_ECAM=y
-CONFIG_PCIE_ROCKCHIP=y
-CONFIG_PCIE_ROCKCHIP_HOST=m
-CONFIG_PCIE_ROCKCHIP_EP=y
-CONFIG_PCIE_MEDIATEK=y
-CONFIG_PCIE_BRCMSTB=m
-
-#
-# DesignWare PCI Core Support
-#
-CONFIG_PCIE_DW=y
-CONFIG_PCIE_DW_HOST=y
-CONFIG_PCIE_DW_EP=y
-CONFIG_PCIE_DW_PLAT=y
-CONFIG_PCIE_DW_PLAT_HOST=y
-CONFIG_PCIE_DW_PLAT_EP=y
-CONFIG_PCI_IMX6=y
-CONFIG_PCI_LAYERSCAPE=y
-CONFIG_PCI_LAYERSCAPE_EP=y
-CONFIG_PCI_HISI=y
-CONFIG_PCIE_QCOM=y
-CONFIG_PCIE_ARMADA_8K=y
-CONFIG_PCIE_KIRIN=y
-CONFIG_PCIE_HISI_STB=y
-CONFIG_PCI_MESON=y
-CONFIG_PCIE_TEGRA194=m
-CONFIG_PCIE_TEGRA194_HOST=m
-CONFIG_PCIE_TEGRA194_EP=m
-CONFIG_PCIE_AL=y
-# end of DesignWare PCI Core Support
-
-#
-# Mobiveil PCIe Core Support
-#
-CONFIG_PCIE_MOBIVEIL=y
-CONFIG_PCIE_MOBIVEIL_HOST=y
-CONFIG_PCIE_MOBIVEIL_PLAT=y
-CONFIG_PCIE_LAYERSCAPE_GEN4=y
-# end of Mobiveil PCIe Core Support
-
-#
-# Cadence PCIe controllers support
-#
-CONFIG_PCIE_CADENCE=y
-CONFIG_PCIE_CADENCE_HOST=y
-CONFIG_PCIE_CADENCE_EP=y
-CONFIG_PCIE_CADENCE_PLAT=y
-CONFIG_PCIE_CADENCE_PLAT_HOST=y
-CONFIG_PCIE_CADENCE_PLAT_EP=y
-CONFIG_PCI_J721E=y
-CONFIG_PCI_J721E_HOST=y
-CONFIG_PCI_J721E_EP=y
-# end of Cadence PCIe controllers support
-# end of PCI controller drivers
-
-#
-# PCI Endpoint
-#
-CONFIG_PCI_ENDPOINT=y
-CONFIG_PCI_ENDPOINT_CONFIGFS=y
-CONFIG_PCI_EPF_TEST=m
-# end of PCI Endpoint
-
-#
-# PCI switch controller drivers
-#
-CONFIG_PCI_SW_SWITCHTEC=m
-# end of PCI switch controller drivers
-
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
-CONFIG_RAPIDIO=m
-CONFIG_RAPIDIO_TSI721=m
-CONFIG_RAPIDIO_DISC_TIMEOUT=30
-# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
-CONFIG_RAPIDIO_DMA_ENGINE=y
-# CONFIG_RAPIDIO_DEBUG is not set
-CONFIG_RAPIDIO_ENUM_BASIC=m
-CONFIG_RAPIDIO_CHMAN=m
-CONFIG_RAPIDIO_MPORT_CDEV=m
-
-#
-# RapidIO Switch drivers
-#
-CONFIG_RAPIDIO_TSI57X=m
-CONFIG_RAPIDIO_CPS_XX=m
-CONFIG_RAPIDIO_TSI568=m
-CONFIG_RAPIDIO_CPS_GEN2=m
-CONFIG_RAPIDIO_RXS_GEN3=m
-# end of RapidIO Switch drivers
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_STANDALONE is not set
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-CONFIG_FW_LOADER_COMPRESS=y
-CONFIG_FW_CACHE=y
-# end of Firmware loader
-
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_ALLOW_DEV_COREDUMP=y
-CONFIG_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-CONFIG_HMEM_REPORTING=y
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_SOC_BUS=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=y
-CONFIG_REGMAP_SPI=m
-CONFIG_REGMAP_SPMI=m
-CONFIG_REGMAP_W1=m
-CONFIG_REGMAP_MMIO=y
-CONFIG_REGMAP_IRQ=y
-CONFIG_REGMAP_SOUNDWIRE=m
-CONFIG_REGMAP_SCCB=m
-CONFIG_REGMAP_I3C=m
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-CONFIG_GENERIC_ARCH_TOPOLOGY=y
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-CONFIG_ARM_CCI=y
-CONFIG_ARM_CCI400_COMMON=y
-CONFIG_BRCMSTB_GISB_ARB=y
-CONFIG_MOXTET=m
-CONFIG_HISILICON_LPC=y
-CONFIG_IMX_WEIM=y
-CONFIG_QCOM_EBI2=y
-CONFIG_SIMPLE_PM_BUS=y
-CONFIG_SUN50I_DE2_BUS=y
-CONFIG_SUNXI_RSB=m
-CONFIG_TEGRA_ACONNECT=y
-CONFIG_TEGRA_GMI=m
-CONFIG_VEXPRESS_CONFIG=y
-CONFIG_FSL_MC_BUS=y
-CONFIG_MHI_BUS=m
-# end of Bus devices
-
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_GNSS=m
-CONFIG_GNSS_SERIAL=m
-CONFIG_GNSS_MTK_SERIAL=m
-CONFIG_GNSS_SIRF_SERIAL=m
-CONFIG_GNSS_UBX_SERIAL=m
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-
-#
-# Partition parsers
-#
-CONFIG_MTD_AR7_PARTS=m
-CONFIG_MTD_CMDLINE_PARTS=m
-CONFIG_MTD_OF_PARTS=m
-CONFIG_MTD_AFS_PARTS=m
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# end of Partition parsers
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-# CONFIG_SM_FTL is not set
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_PSTORE=m
-CONFIG_MTD_SWAP=m
-CONFIG_MTD_PARTITIONED_MASTER=y
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_GEOMETRY=y
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_MAP_BANK_WIDTH_8=y
-CONFIG_MTD_MAP_BANK_WIDTH_16=y
-CONFIG_MTD_MAP_BANK_WIDTH_32=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_I4=y
-CONFIG_MTD_CFI_I8=y
-CONFIG_MTD_OTP=y
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-# end of RAM/ROM/Flash chip drivers
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-CONFIG_MTD_PHYSMAP_OF=y
-# CONFIG_MTD_PHYSMAP_VERSATILE is not set
-# CONFIG_MTD_PHYSMAP_GEMINI is not set
-CONFIG_MTD_PHYSMAP_GPIO_ADDR=y
-CONFIG_MTD_PCI=m
-CONFIG_MTD_PCMCIA=m
-# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
-CONFIG_MTD_INTEL_VR_NOR=m
-CONFIG_MTD_PLATRAM=m
-# end of Mapping drivers for chip access
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-CONFIG_MTD_PMC551_BUGFIX=y
-# CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_DATAFLASH is not set
-CONFIG_MTD_MCHP23K256=m
-# CONFIG_MTD_SST25L is not set
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOCG3 is not set
-# end of Self-contained MTD device drivers
-
-#
-# NAND
-#
-CONFIG_MTD_NAND_CORE=m
-CONFIG_MTD_ONENAND=m
-CONFIG_MTD_ONENAND_VERIFY_WRITE=y
-CONFIG_MTD_ONENAND_GENERIC=m
-CONFIG_MTD_ONENAND_OTP=y
-CONFIG_MTD_ONENAND_2X_PROGRAM=y
-CONFIG_MTD_NAND_ECC_SW_HAMMING=m
-# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-CONFIG_MTD_RAW_NAND=m
-CONFIG_MTD_NAND_ECC_SW_BCH=y
-
-#
-# Raw/parallel NAND flash controllers
-#
-CONFIG_MTD_NAND_DENALI=m
-# CONFIG_MTD_NAND_DENALI_PCI is not set
-CONFIG_MTD_NAND_DENALI_DT=m
-CONFIG_MTD_NAND_CAFE=m
-CONFIG_MTD_NAND_MARVELL=m
-# CONFIG_MTD_NAND_BRCMNAND is not set
-CONFIG_MTD_NAND_GPMI_NAND=m
-CONFIG_MTD_NAND_FSL_IFC=m
-CONFIG_MTD_NAND_MXC=m
-CONFIG_MTD_NAND_SUNXI=m
-CONFIG_MTD_NAND_HISI504=m
-CONFIG_MTD_NAND_QCOM=m
-CONFIG_MTD_NAND_MTK=m
-CONFIG_MTD_NAND_MXIC=m
-CONFIG_MTD_NAND_TEGRA=m
-CONFIG_MTD_NAND_MESON=m
-CONFIG_MTD_NAND_GPIO=m
-CONFIG_MTD_NAND_PLATFORM=m
-CONFIG_MTD_NAND_CADENCE=m
-CONFIG_MTD_NAND_ARASAN=m
-
-#
-# Misc
-#
-CONFIG_MTD_SM_COMMON=m
-CONFIG_MTD_NAND_NANDSIM=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x0
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
-CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
-CONFIG_MTD_SPI_NAND=m
-# end of NAND
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-# end of LPDDR & LPDDR2 PCM memory drivers
-
-CONFIG_MTD_SPI_NOR=m
-CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
-CONFIG_SPI_HISI_SFC=m
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-CONFIG_MTD_UBI_GLUEBI=m
-CONFIG_MTD_UBI_BLOCK=y
-CONFIG_MTD_HYPERBUS=m
-CONFIG_HBMC_AM654=m
-CONFIG_DTC=y
-CONFIG_OF=y
-# CONFIG_OF_UNITTEST is not set
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_DYNAMIC=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-CONFIG_OF_MDIO=y
-CONFIG_OF_RESERVED_MEM=y
-CONFIG_OF_RESOLVE=y
-CONFIG_OF_OVERLAY=y
-CONFIG_OF_NUMA=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-CONFIG_PNP_DEBUG_MESSAGES=y
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_NULL_BLK=m
-CONFIG_CDROM=m
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_ZRAM=m
-CONFIG_ZRAM_WRITEBACK=y
-# CONFIG_ZRAM_MEMORY_TRACKING is not set
-CONFIG_BLK_DEV_UMEM=m
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_SKD=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=131072
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-CONFIG_CDROM_PKTCDVD_WCACHE=y
-CONFIG_ATA_OVER_ETH=m
-CONFIG_VIRTIO_BLK=m
-CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_BLK_DEV_RNBD=y
-CONFIG_BLK_DEV_RNBD_CLIENT=m
-CONFIG_BLK_DEV_RNBD_SERVER=m
-
-#
-# NVME Support
-#
-CONFIG_NVME_CORE=m
-CONFIG_BLK_DEV_NVME=m
-CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_HWMON=y
-CONFIG_NVME_FABRICS=m
-CONFIG_NVME_RDMA=m
-CONFIG_NVME_FC=m
-CONFIG_NVME_TCP=m
-CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_PASSTHRU=y
-CONFIG_NVME_TARGET_LOOP=m
-CONFIG_NVME_TARGET_RDMA=m
-CONFIG_NVME_TARGET_FC=m
-CONFIG_NVME_TARGET_FCLOOP=m
-CONFIG_NVME_TARGET_TCP=m
-# end of NVME Support
-
-#
-# Misc devices
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-# CONFIG_AD525X_DPOT_SPI is not set
-CONFIG_DUMMY_IRQ=m
-CONFIG_PHANTOM=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_HP_ILO=m
-# CONFIG_QCOM_COINCELL is not set
-CONFIG_QCOM_FASTRPC=m
-# CONFIG_APDS9802ALS is not set
-# CONFIG_ISL29003 is not set
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-# CONFIG_LATTICE_ECP3_CONFIG is not set
-CONFIG_SRAM=y
-CONFIG_PCI_ENDPOINT_TEST=m
-CONFIG_XILINX_SDFEC=m
-CONFIG_MISC_RTSX=m
-CONFIG_PVPANIC=m
-CONFIG_C2PORT=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-# CONFIG_EEPROM_AT25 is not set
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-# CONFIG_EEPROM_93XX46 is not set
-CONFIG_EEPROM_IDT_89HPESX=m
-CONFIG_EEPROM_EE1004=m
-# end of EEPROM support
-
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-# end of Texas Instruments shared transport line discipline
-
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_ALTERA_STAPL=m
-
-#
-# Intel MIC & related support
-#
-# CONFIG_VOP_BUS is not set
-# end of Intel MIC & related support
-
-CONFIG_GENWQE=m
-CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
-CONFIG_ECHO=m
-CONFIG_MISC_ALCOR_PCI=m
-CONFIG_MISC_RTSX_PCI=m
-CONFIG_MISC_RTSX_USB=m
-CONFIG_HABANA_AI=m
-CONFIG_UACCE=m
-# end of Misc devices
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-# end of SCSI Transports
-
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=5000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_HISI_SAS=m
-CONFIG_SCSI_HISI_SAS_PCI=m
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-CONFIG_SCSI_MVSAS_TASKLET=y
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ESAS2R=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_SMARTPQI=m
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_UFS_CDNS_PLATFORM=m
-# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
-# CONFIG_SCSI_UFS_QCOM is not set
-CONFIG_SCSI_UFS_MEDIATEK=m
-CONFIG_SCSI_UFS_HISI=m
-CONFIG_SCSI_UFS_BSG=y
-CONFIG_SCSI_UFS_EXYNOS=m
-CONFIG_SCSI_UFS_CRYPTO=y
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_MYRB=m
-CONFIG_SCSI_MYRS=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_SCSI_SNIC=m
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_FDOMAIN=m
-CONFIG_SCSI_FDOMAIN_PCI=m
-# CONFIG_SCSI_GDTH is not set
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
-# CONFIG_TCM_QLA2XXX_DEBUG is not set
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_QEDI=m
-CONFIG_QEDF=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=y
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-# end of SCSI device support
-
-CONFIG_HAVE_PATA_PLATFORM=y
-CONFIG_ATA=y
-CONFIG_SATA_HOST=y
-CONFIG_PATA_TIMINGS=y
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_FORCE=y
-CONFIG_ATA_ACPI=y
-# CONFIG_SATA_ZPODD is not set
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=y
-CONFIG_SATA_MOBILE_LPM_POLICY=0
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_AHCI_BRCM=m
-CONFIG_AHCI_IMX=m
-CONFIG_AHCI_CEVA=m
-CONFIG_AHCI_MTK=m
-CONFIG_AHCI_MVEBU=m
-CONFIG_AHCI_SUNXI=m
-CONFIG_AHCI_TEGRA=m
-CONFIG_AHCI_XGENE=m
-CONFIG_AHCI_QORIQ=m
-CONFIG_SATA_AHCI_SEATTLE=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SX4=m
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-CONFIG_SATA_DWC=m
-CONFIG_SATA_DWC_OLD_DMA=y
-# CONFIG_SATA_DWC_DEBUG is not set
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-# CONFIG_PATA_HPT3X3_DMA is not set
-CONFIG_PATA_IMX=m
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PLATFORM=m
-# CONFIG_PATA_OF_PLATFORM is not set
-CONFIG_PATA_RZ1000=m
-
-#
-# Generic fallback / legacy drivers
-#
-# CONFIG_PATA_ACPI is not set
-CONFIG_ATA_GENERIC=m
-# CONFIG_PATA_LEGACY is not set
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_MD_CLUSTER=m
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_UNSTRIPED=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_WRITECACHE=m
-CONFIG_DM_EBS=m
-CONFIG_DM_ERA=m
-CONFIG_DM_CLONE=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_MULTIPATH_HST=m
-CONFIG_DM_DELAY=m
-CONFIG_DM_DUST=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_DM_INTEGRITY=m
-CONFIG_DM_ZONED=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_TCM_USER2=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_ISCSI_TARGET_CXGB4=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-# end of IEEE 1394 (FireWire) support
-
-CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_WIREGUARD=m
-# CONFIG_WIREGUARD_DEBUG is not set
-CONFIG_EQUALIZER=m
-CONFIG_NET_FC=y
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
-CONFIG_IPVTAP=m
-CONFIG_VXLAN=m
-CONFIG_GENEVE=m
-CONFIG_BAREUDP=m
-CONFIG_GTP=m
-CONFIG_MACSEC=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NTB_NETDEV=m
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-CONFIG_TUN=m
-CONFIG_TAP=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_NET_VRF=m
-CONFIG_VSOCKMON=m
-CONFIG_SUNGEM_PHY=m
-# CONFIG_ARCNET is not set
-CONFIG_ATM_DRIVERS=y
-CONFIG_ATM_DUMMY=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-CONFIG_ATM_ENI_TUNE_BURST=y
-CONFIG_ATM_ENI_BURST_TX_16W=y
-CONFIG_ATM_ENI_BURST_TX_8W=y
-CONFIG_ATM_ENI_BURST_TX_4W=y
-CONFIG_ATM_ENI_BURST_TX_2W=y
-CONFIG_ATM_ENI_BURST_RX_16W=y
-CONFIG_ATM_ENI_BURST_RX_8W=y
-CONFIG_ATM_ENI_BURST_RX_4W=y
-CONFIG_ATM_ENI_BURST_RX_2W=y
-CONFIG_ATM_NICSTAR=m
-CONFIG_ATM_NICSTAR_USE_SUNI=y
-CONFIG_ATM_NICSTAR_USE_IDT77105=y
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-CONFIG_ATM_FORE200E_USE_TASKLET=y
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-CONFIG_ATM_HE_USE_SUNI=y
-CONFIG_ATM_SOLOS=m
-# CONFIG_CAIF_DRIVERS is not set
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_B53=m
-CONFIG_B53_SPI_DRIVER=m
-CONFIG_B53_MDIO_DRIVER=m
-CONFIG_B53_MMAP_DRIVER=m
-CONFIG_B53_SRAB_DRIVER=m
-CONFIG_B53_SERDES=m
-CONFIG_NET_DSA_BCM_SF2=m
-CONFIG_NET_DSA_LOOP=m
-CONFIG_NET_DSA_LANTIQ_GSWIP=m
-CONFIG_NET_DSA_MT7530=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
-CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
-CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
-CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
-CONFIG_NET_DSA_MICROCHIP_KSZ8795=m
-CONFIG_NET_DSA_MICROCHIP_KSZ8795_SPI=m
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
-CONFIG_NET_DSA_MV88E6XXX_PTP=y
-CONFIG_NET_DSA_MSCC_FELIX=m
-# CONFIG_NET_DSA_AR9331 is not set
-CONFIG_NET_DSA_SJA1105=m
-CONFIG_NET_DSA_SJA1105_PTP=y
-CONFIG_NET_DSA_SJA1105_TAS=y
-CONFIG_NET_DSA_SJA1105_VL=y
-CONFIG_NET_DSA_QCA8K=m
-CONFIG_NET_DSA_REALTEK_SMI=m
-CONFIG_NET_DSA_SMSC_LAN9303=m
-CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
-CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
-CONFIG_NET_DSA_VITESSE_VSC73XX=m
-CONFIG_NET_DSA_VITESSE_VSC73XX_SPI=m
-CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_AGERE=y
-CONFIG_ET131X=m
-CONFIG_NET_VENDOR_ALACRITECH=y
-CONFIG_SLICOSS=m
-CONFIG_NET_VENDOR_ALLWINNER=y
-# CONFIG_SUN4I_EMAC is not set
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-# CONFIG_ALTERA_TSE is not set
-CONFIG_NET_VENDOR_AMAZON=y
-CONFIG_ENA_ETHERNET=m
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_AMD_XGBE=m
-CONFIG_AMD_XGBE_DCB=y
-CONFIG_NET_XGENE=y
-CONFIG_NET_XGENE_V2=y
-CONFIG_NET_VENDOR_AQUANTIA=y
-CONFIG_AQTION=m
-CONFIG_NET_VENDOR_ARC=y
-# CONFIG_EMAC_ROCKCHIP is not set
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-CONFIG_NET_VENDOR_AURORA=y
-CONFIG_AURORA_NB8800=m
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BCMGENET=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_TIGON3=m
-CONFIG_TIGON3_HWMON=y
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_BGMAC=m
-CONFIG_BGMAC_PLATFORM=m
-CONFIG_SYSTEMPORT=m
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_BNXT_FLOWER_OFFLOAD=y
-CONFIG_BNXT_DCB=y
-CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
-CONFIG_NET_VENDOR_CADENCE=y
-CONFIG_MACB=m
-CONFIG_MACB_USE_HWSTAMP=y
-CONFIG_MACB_PCI=m
-CONFIG_NET_VENDOR_CAVIUM=y
-CONFIG_THUNDER_NIC_PF=m
-CONFIG_THUNDER_NIC_VF=m
-CONFIG_THUNDER_NIC_BGX=m
-CONFIG_THUNDER_NIC_RGX=m
-CONFIG_CAVIUM_PTP=m
-CONFIG_LIQUIDIO=m
-CONFIG_LIQUIDIO_VF=m
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4_DCB=y
-CONFIG_CHELSIO_T4_FCOE=y
-CONFIG_CHELSIO_T4VF=m
-CONFIG_CHELSIO_LIB=m
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-CONFIG_NET_VENDOR_CORTINA=y
-CONFIG_GEMINI_ETHERNET=m
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-CONFIG_TULIP_NAPI=y
-CONFIG_TULIP_NAPI_HW_MITIGATION=y
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET_BE2=y
-CONFIG_BE2NET_BE3=y
-CONFIG_BE2NET_LANCER=y
-CONFIG_BE2NET_SKYHAWK=y
-CONFIG_NET_VENDOR_EZCHIP=y
-CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m
-CONFIG_NET_VENDOR_FREESCALE=y
-CONFIG_FEC=m
-CONFIG_FSL_FMAN=m
-CONFIG_DPAA_ERRATUM_A050385=y
-CONFIG_FSL_PQ_MDIO=m
-CONFIG_FSL_XGMAC_MDIO=m
-CONFIG_GIANFAR=m
-CONFIG_FSL_DPAA_ETH=m
-CONFIG_FSL_DPAA2_ETH=m
-CONFIG_FSL_DPAA2_ETH_DCB=y
-CONFIG_FSL_DPAA2_PTP_CLOCK=m
-CONFIG_FSL_ENETC=m
-CONFIG_FSL_ENETC_VF=m
-CONFIG_FSL_ENETC_MDIO=m
-CONFIG_FSL_ENETC_PTP_CLOCK=m
-CONFIG_FSL_ENETC_QOS=y
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_NET_VENDOR_GOOGLE=y
-CONFIG_GVE=m
-CONFIG_NET_VENDOR_HISILICON=y
-CONFIG_HIX5HD2_GMAC=m
-CONFIG_HISI_FEMAC=m
-CONFIG_HIP04_ETH=m
-CONFIG_HI13X1_GMAC=y
-CONFIG_HNS_MDIO=m
-CONFIG_HNS=m
-CONFIG_HNS_DSAF=m
-CONFIG_HNS_ENET=m
-CONFIG_HNS3=m
-CONFIG_HNS3_HCLGE=m
-CONFIG_HNS3_DCB=y
-CONFIG_HNS3_HCLGEVF=m
-CONFIG_HNS3_ENET=m
-CONFIG_NET_VENDOR_HUAWEI=y
-CONFIG_HINIC=m
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IGB=m
-CONFIG_IGB_HWMON=y
-CONFIG_IGBVF=m
-CONFIG_IXGB=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE_DCB=y
-CONFIG_IXGBE_IPSEC=y
-CONFIG_IXGBEVF=m
-CONFIG_IXGBEVF_IPSEC=y
-CONFIG_I40E=m
-CONFIG_I40E_DCB=y
-CONFIG_IAVF=m
-CONFIG_I40EVF=m
-CONFIG_ICE=m
-CONFIG_FM10K=m
-CONFIG_IGC=m
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_MVMDIO=m
-CONFIG_MVNETA=m
-CONFIG_MVPP2=m
-# CONFIG_PXA168_ETH is not set
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_OCTEONTX2_MBOX=m
-CONFIG_OCTEONTX2_AF=m
-# CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
-CONFIG_OCTEONTX2_PF=m
-CONFIG_OCTEONTX2_VF=m
-CONFIG_NET_VENDOR_MEDIATEK=y
-CONFIG_NET_MEDIATEK_SOC=m
-CONFIG_NET_MEDIATEK_STAR_EMAC=m
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_DCB=y
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX4_CORE_GEN2=y
-CONFIG_MLX5_CORE=m
-CONFIG_MLX5_ACCEL=y
-CONFIG_MLX5_FPGA=y
-CONFIG_MLX5_CORE_EN=y
-CONFIG_MLX5_EN_ARFS=y
-CONFIG_MLX5_EN_RXNFC=y
-CONFIG_MLX5_MPFS=y
-CONFIG_MLX5_ESWITCH=y
-CONFIG_MLX5_CLS_ACT=y
-CONFIG_MLX5_TC_CT=y
-CONFIG_MLX5_CORE_EN_DCB=y
-CONFIG_MLX5_CORE_IPOIB=y
-CONFIG_MLX5_FPGA_IPSEC=y
-CONFIG_MLX5_IPSEC=y
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA_TLS=y
-CONFIG_MLX5_TLS=y
-CONFIG_MLX5_EN_TLS=y
-CONFIG_MLX5_SW_STEERING=y
-CONFIG_MLXSW_CORE=m
-CONFIG_MLXSW_CORE_HWMON=y
-CONFIG_MLXSW_CORE_THERMAL=y
-CONFIG_MLXSW_PCI=m
-CONFIG_MLXSW_I2C=m
-CONFIG_MLXSW_SWITCHIB=m
-CONFIG_MLXSW_SWITCHX2=m
-CONFIG_MLXSW_SPECTRUM=m
-CONFIG_MLXSW_SPECTRUM_DCB=y
-CONFIG_MLXSW_MINIMAL=m
-CONFIG_MLXFW=m
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_ENCX24J600=m
-CONFIG_LAN743X=m
-CONFIG_NET_VENDOR_MICROSEMI=y
-CONFIG_MSCC_OCELOT_SWITCH_LIB=m
-CONFIG_MSCC_OCELOT_SWITCH=m
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_NETERION=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_NETRONOME=y
-CONFIG_NFP=m
-CONFIG_NFP_APP_FLOWER=y
-CONFIG_NFP_APP_ABM_NIC=y
-# CONFIG_NFP_DEBUG is not set
-CONFIG_NET_VENDOR_NI=y
-CONFIG_NI_XGE_MANAGEMENT_ENET=m
-CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_ETHOC=m
-CONFIG_NET_VENDOR_PACKET_ENGINES=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_PENSANDO=y
-CONFIG_IONIC=m
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLCNIC_DCB=y
-CONFIG_QLCNIC_HWMON=y
-CONFIG_NETXEN_NIC=m
-CONFIG_QED=m
-CONFIG_QED_LL2=y
-CONFIG_QED_SRIOV=y
-CONFIG_QEDE=m
-CONFIG_QED_RDMA=y
-CONFIG_QED_ISCSI=y
-CONFIG_QED_FCOE=y
-CONFIG_QED_OOO=y
-CONFIG_NET_VENDOR_QUALCOMM=y
-CONFIG_QCA7000=m
-CONFIG_QCA7000_SPI=m
-CONFIG_QCA7000_UART=m
-CONFIG_QCOM_EMAC=m
-CONFIG_RMNET=m
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_ROCKER=y
-CONFIG_ROCKER=m
-CONFIG_NET_VENDOR_SAMSUNG=y
-CONFIG_SXGBE_ETH=m
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SOLARFLARE=y
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_SFC_MCDI_LOGGING=y
-CONFIG_SFC_FALCON=m
-CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_SMC91X=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-CONFIG_SMSC911X=m
-CONFIG_SMSC9420=m
-CONFIG_NET_VENDOR_SOCIONEXT=y
-CONFIG_SNI_NETSEC=m
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_SELFTESTS is not set
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_DWMAC_DWC_QOS_ETH=m
-CONFIG_DWMAC_GENERIC=m
-CONFIG_DWMAC_IPQ806X=m
-CONFIG_DWMAC_MEDIATEK=m
-CONFIG_DWMAC_MESON=m
-CONFIG_DWMAC_QCOM_ETHQOS=m
-CONFIG_DWMAC_ROCKCHIP=m
-CONFIG_DWMAC_SOCFPGA=m
-CONFIG_DWMAC_SUNXI=m
-CONFIG_DWMAC_SUN8I=m
-CONFIG_DWMAC_IMX8=m
-CONFIG_STMMAC_PCI=m
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_SYNOPSYS=y
-CONFIG_DWC_XLGMAC=m
-CONFIG_DWC_XLGMAC_PCI=m
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-# CONFIG_TI_CPSW_PHY_SEL is not set
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_WIZNET_W5100_SPI=m
-CONFIG_NET_VENDOR_XILINX=y
-CONFIG_XILINX_AXI_EMAC=m
-CONFIG_XILINX_LL_TEMAC=m
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_FDDI=m
-CONFIG_DEFXX=m
-CONFIG_DEFXX_MMIO=y
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-CONFIG_QCOM_IPA=m
-# CONFIG_NET_SB1000 is not set
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_BUS=y
-CONFIG_MDIO_DEVRES=y
-# CONFIG_MDIO_BCM_IPROC is not set
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_BUS_MUX=m
-CONFIG_MDIO_BUS_MUX_BCM_IPROC=m
-CONFIG_MDIO_BUS_MUX_GPIO=m
-CONFIG_MDIO_BUS_MUX_MESON_G12A=m
-CONFIG_MDIO_BUS_MUX_MMIOREG=m
-CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
-CONFIG_MDIO_CAVIUM=m
-CONFIG_MDIO_GPIO=m
-CONFIG_MDIO_HISI_FEMAC=m
-CONFIG_MDIO_I2C=m
-CONFIG_MDIO_IPQ4019=m
-CONFIG_MDIO_IPQ8064=m
-CONFIG_MDIO_MSCC_MIIM=m
-CONFIG_MDIO_MVUSB=m
-CONFIG_MDIO_OCTEON=m
-CONFIG_MDIO_SUN4I=m
-CONFIG_MDIO_THUNDER=m
-CONFIG_MDIO_XGENE=y
-CONFIG_MDIO_XPCS=m
-CONFIG_PHYLINK=m
-CONFIG_PHYLIB=y
-CONFIG_SWPHY=y
-CONFIG_LED_TRIGGER_PHY=y
-
-#
-# MII PHY device drivers
-#
-CONFIG_SFP=m
-CONFIG_ADIN_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_AQUANTIA_PHY=m
-CONFIG_AX88796B_PHY=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM54140_PHY=m
-CONFIG_BCM84881_PHY=y
-CONFIG_CICADA_PHY=m
-CONFIG_CORTINA_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_DP83822_PHY=m
-CONFIG_DP83TC811_PHY=m
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_DP83869_PHY=m
-CONFIG_FIXED_PHY=y
-CONFIG_ICPLUS_PHY=m
-CONFIG_INTEL_XWAY_PHY=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_MARVELL_10G_PHY=m
-CONFIG_MESON_GXL_PHY=m
-CONFIG_MICREL_PHY=m
-CONFIG_MICROCHIP_PHY=m
-CONFIG_MICROCHIP_T1_PHY=m
-CONFIG_MICROSEMI_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_NXP_TJA11XX_PHY=m
-CONFIG_AT803X_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_RENESAS_PHY=m
-CONFIG_ROCKCHIP_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_STE10XP=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_XILINX_GMII2RGMII=m
-CONFIG_MICREL_KS8995MA=m
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#
-CONFIG_USB_NET_DRIVERS=m
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_USB_NET_CH9200=m
-CONFIG_USB_NET_AQC111=m
-CONFIG_WLAN=y
-# CONFIG_WIRELESS_WDS is not set
-CONFIG_WLAN_VENDOR_ADMTEK=y
-CONFIG_ADM8211=m
-CONFIG_ATH_COMMON=m
-CONFIG_WLAN_VENDOR_ATH=y
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-# CONFIG_ATH9K_AHB is not set
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DYNACK is not set
-CONFIG_ATH9K_WOW=y
-CONFIG_ATH9K_RFKILL=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_PCI_NO_EEPROM=m
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_ATH9K_HWRNG=y
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-# CONFIG_CARL9170_DEBUGFS is not set
-CONFIG_CARL9170_WPC=y
-CONFIG_CARL9170_HWRNG=y
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-# CONFIG_ATH6KL_DEBUG is not set
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-CONFIG_WIL6210_TRACING=y
-# CONFIG_WIL6210_DEBUGFS is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_CE=y
-CONFIG_ATH10K_PCI=m
-CONFIG_ATH10K_AHB=y
-CONFIG_ATH10K_SDIO=m
-CONFIG_ATH10K_USB=m
-CONFIG_ATH10K_SNOC=m
-# CONFIG_ATH10K_DEBUG is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_WCN36XX=m
-# CONFIG_WCN36XX_DEBUGFS is not set
-CONFIG_ATH11K=m
-# CONFIG_ATH11K_DEBUG is not set
-CONFIG_ATH11K_DEBUGFS=y
-# CONFIG_ATH11K_TRACING is not set
-CONFIG_ATH11K_SPECTRAL=y
-CONFIG_WLAN_VENDOR_ATMEL=y
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_WLAN_VENDOR_BROADCOM=y
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMFMAC_PCIE=y
-# CONFIG_BRCM_TRACING is not set
-# CONFIG_BRCMDBG is not set
-CONFIG_WLAN_VENDOR_CISCO=y
-CONFIG_AIRO_CS=m
-CONFIG_WLAN_VENDOR_INTEL=y
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-CONFIG_IPW2100_DEBUG=y
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-CONFIG_IPW2200_DEBUG=y
-CONFIG_LIBIPW=m
-CONFIG_LIBIPW_DEBUG=y
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-
-#
-# iwl3945 / iwl4965 Debugging Options
-#
-# CONFIG_IWLEGACY_DEBUG is not set
-# CONFIG_IWLEGACY_DEBUGFS is not set
-# end of iwl3945 / iwl4965 Debugging Options
-
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLDVM=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-# CONFIG_IWLWIFI_BCAST_FILTERING is not set
-
-#
-# Debugging Options
-#
-CONFIG_IWLWIFI_DEBUG=y
-CONFIG_IWLWIFI_DEBUGFS=y
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
-# end of Debugging Options
-
-CONFIG_WLAN_VENDOR_INTERSIL=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-# CONFIG_P54_SPI is not set
-CONFIG_P54_LEDS=y
-CONFIG_PRISM54=m
-CONFIG_WLAN_VENDOR_MARVELL=y
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_SPI is not set
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_MWL8K=m
-CONFIG_WLAN_VENDOR_MEDIATEK=y
-CONFIG_MT7601U=m
-CONFIG_MT76_CORE=m
-CONFIG_MT76_LEDS=y
-CONFIG_MT76_USB=m
-CONFIG_MT76_SDIO=m
-CONFIG_MT76x02_LIB=m
-CONFIG_MT76x02_USB=m
-CONFIG_MT76x0_COMMON=m
-CONFIG_MT76x0U=m
-CONFIG_MT76x0E=m
-CONFIG_MT76x2_COMMON=m
-CONFIG_MT76x2E=m
-CONFIG_MT76x2U=m
-CONFIG_MT7603E=m
-CONFIG_MT7615_COMMON=m
-CONFIG_MT7615E=m
-CONFIG_MT7622_WMAC=y
-CONFIG_MT7663_USB_SDIO_COMMON=m
-CONFIG_MT7663U=m
-CONFIG_MT7663S=m
-CONFIG_MT7915E=m
-CONFIG_WLAN_VENDOR_MICROCHIP=y
-# CONFIG_WILC1000_SDIO is not set
-# CONFIG_WILC1000_SPI is not set
-CONFIG_WLAN_VENDOR_RALINK=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_LIB_DEBUGFS is not set
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WLAN_VENDOR_REALTEK=y
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8821AE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-CONFIG_RTLWIFI_DEBUG=y
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL8XXXU=m
-CONFIG_RTL8XXXU_UNTESTED=y
-CONFIG_RTW88=m
-CONFIG_RTW88_CORE=m
-CONFIG_RTW88_PCI=m
-CONFIG_RTW88_8822B=m
-CONFIG_RTW88_8822C=m
-CONFIG_RTW88_8723D=m
-CONFIG_RTW88_8821C=m
-CONFIG_RTW88_8822BE=m
-CONFIG_RTW88_8822CE=m
-CONFIG_RTW88_8723DE=m
-CONFIG_RTW88_8821CE=m
-# CONFIG_RTW88_DEBUG is not set
-# CONFIG_RTW88_DEBUGFS is not set
-CONFIG_WLAN_VENDOR_RSI=y
-CONFIG_RSI_91X=m
-# CONFIG_RSI_DEBUGFS is not set
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-CONFIG_RSI_COEX=y
-CONFIG_WLAN_VENDOR_ST=y
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-# CONFIG_CW1200_WLAN_SPI is not set
-CONFIG_WLAN_VENDOR_TI=y
-CONFIG_WL1251=m
-# CONFIG_WL1251_SPI is not set
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-# CONFIG_WLCORE_SPI is not set
-CONFIG_WLCORE_SDIO=m
-# CONFIG_WILINK_PLATFORM_DATA is not set
-CONFIG_WLAN_VENDOR_ZYDAS=y
-CONFIG_USB_ZD1201=m
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_WLAN_VENDOR_QUANTENNA=y
-CONFIG_QTNFMAC=m
-CONFIG_QTNFMAC_PCIE=m
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_MAC80211_HWSIM=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_VIRT_WIFI=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-# end of WiMAX Wireless Broadband devices
-
-# CONFIG_WAN is not set
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKELB=m
-# CONFIG_IEEE802154_AT86RF230 is not set
-# CONFIG_IEEE802154_MRF24J40 is not set
-# CONFIG_IEEE802154_CC2520 is not set
-# CONFIG_IEEE802154_ATUSB is not set
-CONFIG_IEEE802154_ADF7242=m
-CONFIG_IEEE802154_CA8210=m
-CONFIG_IEEE802154_CA8210_DEBUGFS=y
-CONFIG_IEEE802154_MCR20A=m
-CONFIG_IEEE802154_HWSIM=m
-CONFIG_VMXNET3=m
-# CONFIG_FUJITSU_ES is not set
-CONFIG_USB4_NET=m
-CONFIG_NETDEVSIM=m
-CONFIG_NET_FAILOVER=m
-# CONFIG_ISDN is not set
-# CONFIG_NVM is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_LEDS=y
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ADC is not set
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_QT1050=m
-CONFIG_KEYBOARD_QT1070=m
-CONFIG_KEYBOARD_QT2160=m
-CONFIG_KEYBOARD_DLINK_DIR685=m
-# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_GPIO_POLLED=m
-CONFIG_KEYBOARD_TCA6416=m
-CONFIG_KEYBOARD_TCA8418=m
-CONFIG_KEYBOARD_MATRIX=m
-CONFIG_KEYBOARD_LM8323=m
-CONFIG_KEYBOARD_LM8333=m
-CONFIG_KEYBOARD_MAX7359=m
-CONFIG_KEYBOARD_MCS=m
-CONFIG_KEYBOARD_MPR121=m
-CONFIG_KEYBOARD_SNVS_PWRKEY=m
-CONFIG_KEYBOARD_IMX=m
-CONFIG_KEYBOARD_IMX_SC_KEY=m
-CONFIG_KEYBOARD_NEWTON=m
-CONFIG_KEYBOARD_TEGRA=m
-CONFIG_KEYBOARD_OPENCORES=m
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-CONFIG_KEYBOARD_SUNKBD=m
-CONFIG_KEYBOARD_SUN4I_LRADC=m
-CONFIG_KEYBOARD_IQS62X=m
-# CONFIG_KEYBOARD_OMAP4 is not set
-CONFIG_KEYBOARD_TM2_TOUCHKEY=m
-CONFIG_KEYBOARD_XTKBD=m
-CONFIG_KEYBOARD_CROS_EC=m
-CONFIG_KEYBOARD_CAP11XX=m
-# CONFIG_KEYBOARD_BCM is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_BYD=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
-CONFIG_MOUSE_PS2_CYPRESS=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_PS2_FOCALTECH=y
-CONFIG_MOUSE_PS2_SMBUS=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=m
-CONFIG_JOYSTICK_IFORCE_232=m
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-CONFIG_JOYSTICK_PSXPAD_SPI=m
-CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
-CONFIG_JOYSTICK_PXRC=m
-CONFIG_JOYSTICK_FSIA6B=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_PEGASUS=m
-CONFIG_TABLET_SERIAL_WACOM4=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_PROPERTIES=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-CONFIG_TOUCHSCREEN_ADC=m
-CONFIG_TOUCHSCREEN_AR1021_I2C=m
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-CONFIG_TOUCHSCREEN_ATMEL_MXT_T37=y
-CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_BU21029=m
-CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
-CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
-CONFIG_TOUCHSCREEN_CY8CTMA140=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
-# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
-CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
-# CONFIG_TOUCHSCREEN_CYTTSP4_SPI is not set
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-# CONFIG_TOUCHSCREEN_EGALAX is not set
-CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
-CONFIG_TOUCHSCREEN_EXC3000=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GOODIX=m
-CONFIG_TOUCHSCREEN_HIDEEP=m
-CONFIG_TOUCHSCREEN_ILI210X=m
-CONFIG_TOUCHSCREEN_IPROC=m
-CONFIG_TOUCHSCREEN_S6SY761=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_EKTF2127=m
-CONFIG_TOUCHSCREEN_ELAN=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_WACOM_I2C=m
-CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MMS114=m
-CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-# CONFIG_TOUCHSCREEN_TI_AM335X_TSC is not set
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-CONFIG_TOUCHSCREEN_TSC200X_CORE=m
-CONFIG_TOUCHSCREEN_TSC2004=m
-# CONFIG_TOUCHSCREEN_TSC2005 is not set
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_TSC2007_IIO=y
-CONFIG_TOUCHSCREEN_RM_TS=m
-CONFIG_TOUCHSCREEN_SILEAD=m
-CONFIG_TOUCHSCREEN_SIS_I2C=m
-CONFIG_TOUCHSCREEN_ST1232=m
-CONFIG_TOUCHSCREEN_STMFTS=m
-CONFIG_TOUCHSCREEN_SUN4I=m
-CONFIG_TOUCHSCREEN_SUR40=m
-# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
-CONFIG_TOUCHSCREEN_SX8654=m
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_TOUCHSCREEN_ZET6223=m
-CONFIG_TOUCHSCREEN_ZFORCE=m
-CONFIG_TOUCHSCREEN_ROHM_BU21023=m
-CONFIG_TOUCHSCREEN_IQS5XX=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-# CONFIG_INPUT_AD714X_SPI is not set
-CONFIG_INPUT_ATMEL_CAPTOUCH=m
-CONFIG_INPUT_BMA150=m
-# CONFIG_INPUT_E3X0_BUTTON is not set
-CONFIG_INPUT_PM8941_PWRKEY=m
-CONFIG_INPUT_PM8XXX_VIBRATOR=m
-CONFIG_INPUT_MAX77650_ONKEY=m
-CONFIG_INPUT_MMA8450=m
-# CONFIG_INPUT_GPIO_BEEPER is not set
-CONFIG_INPUT_GPIO_DECODER=m
-CONFIG_INPUT_GPIO_VIBRA=m
-CONFIG_INPUT_CPCAP_PWRBUTTON=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_REGULATOR_HAPTIC=m
-CONFIG_INPUT_AXP20X_PEK=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_PWM_BEEPER=m
-CONFIG_INPUT_PWM_VIBRA=m
-CONFIG_INPUT_RK805_PWRKEY=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
-CONFIG_INPUT_IMS_PCU=m
-CONFIG_INPUT_IQS269A=m
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_INPUT_DRV260X_HAPTICS=m
-CONFIG_INPUT_DRV2665_HAPTICS=m
-CONFIG_INPUT_DRV2667_HAPTICS=m
-CONFIG_INPUT_HISI_POWERKEY=m
-CONFIG_INPUT_SC27XX_VIBRA=m
-CONFIG_INPUT_STPMIC1_ONKEY=m
-CONFIG_RMI4_CORE=m
-CONFIG_RMI4_I2C=m
-CONFIG_RMI4_SPI=m
-CONFIG_RMI4_SMB=m
-CONFIG_RMI4_F03=y
-CONFIG_RMI4_F03_SERIO=m
-CONFIG_RMI4_2D_SENSOR=y
-CONFIG_RMI4_F11=y
-CONFIG_RMI4_F12=y
-CONFIG_RMI4_F30=y
-CONFIG_RMI4_F34=y
-CONFIG_RMI4_F54=y
-CONFIG_RMI4_F55=y
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_PARKBD=m
-# CONFIG_SERIO_AMBAKMI is not set
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-# CONFIG_SERIO_ARC_PS2 is not set
-CONFIG_SERIO_APBPS2=m
-# CONFIG_SERIO_SUN4I_PS2 is not set
-CONFIG_SERIO_GPIO_PS2=m
-CONFIG_USERIO=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=0
-CONFIG_LDISC_AUTOLOAD=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-CONFIG_SERIAL_8250_PNP=y
-# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
-# CONFIG_SERIAL_8250_FINTEK is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_EXAR=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=32
-CONFIG_SERIAL_8250_EXTENDED=y
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-# CONFIG_SERIAL_8250_ASPEED_VUART is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-# CONFIG_SERIAL_8250_RSA is not set
-CONFIG_SERIAL_8250_DWLIB=y
-CONFIG_SERIAL_8250_BCM2835AUX=y
-CONFIG_SERIAL_8250_FSL=y
-CONFIG_SERIAL_8250_DW=y
-# CONFIG_SERIAL_8250_RT288X is not set
-CONFIG_SERIAL_8250_MT6577=y
-CONFIG_SERIAL_8250_TEGRA=y
-CONFIG_SERIAL_OF_PLATFORM=y
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_AMBA_PL010=y
-CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
-# CONFIG_SERIAL_KGDB_NMI is not set
-CONFIG_SERIAL_MESON=y
-CONFIG_SERIAL_MESON_CONSOLE=y
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_UARTS_4=y
-CONFIG_SERIAL_SAMSUNG_UARTS=4
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_SERIAL_TEGRA_TCU=m
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_MAX310X is not set
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_SERIAL_IMX_EARLYCON=y
-# CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_CONSOLE_POLL=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_MSM=y
-CONFIG_SERIAL_MSM_CONSOLE=y
-CONFIG_SERIAL_QCOM_GENI=y
-CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
-# CONFIG_SERIAL_SIFIVE is not set
-# CONFIG_SERIAL_QE is not set
-# CONFIG_SERIAL_SCCNXP is not set
-CONFIG_SERIAL_SC16IS7XX_CORE=m
-CONFIG_SERIAL_SC16IS7XX=m
-CONFIG_SERIAL_SC16IS7XX_I2C=y
-CONFIG_SERIAL_SC16IS7XX_SPI=y
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_IFX6X60 is not set
-CONFIG_SERIAL_XILINX_PS_UART=y
-CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
-# CONFIG_SERIAL_ARC is not set
-CONFIG_SERIAL_RP2=m
-CONFIG_SERIAL_RP2_NR_UARTS=32
-CONFIG_SERIAL_FSL_LPUART=m
-CONFIG_SERIAL_FSL_LINFLEXUART=y
-CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE=y
-# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-CONFIG_SERIAL_SPRD=y
-CONFIG_SERIAL_SPRD_CONSOLE=y
-CONFIG_SERIAL_MVEBU_UART=y
-CONFIG_SERIAL_MVEBU_CONSOLE=y
-CONFIG_SERIAL_OWL=y
-CONFIG_SERIAL_OWL_CONSOLE=y
-# end of Serial drivers
-
-CONFIG_SERIAL_MCTRL_GPIO=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_SYNCLINKMP=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_ISI=m
-CONFIG_N_HDLC=m
-CONFIG_N_GSM=m
-CONFIG_NOZOMI=m
-CONFIG_NULL_TTY=m
-CONFIG_TRACE_ROUTER=m
-CONFIG_TRACE_SINK=m
-CONFIG_HVC_DRIVER=y
-# CONFIG_HVC_DCC is not set
-CONFIG_SERIAL_DEV_BUS=y
-CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
-# CONFIG_TTY_PRINTK is not set
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_DMI_DECODE=y
-CONFIG_IPMI_PLAT_DATA=y
-CONFIG_IPMI_PANIC_EVENT=y
-# CONFIG_IPMI_PANIC_STRING is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_SSIF=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_IPMB_DEVICE_INTERFACE=m
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_BA431=m
-CONFIG_HW_RANDOM_BCM2835=m
-CONFIG_HW_RANDOM_IPROC_RNG200=m
-CONFIG_HW_RANDOM_OMAP=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_HISI=m
-CONFIG_HW_RANDOM_HISI_V2=m
-CONFIG_HW_RANDOM_XGENE=m
-CONFIG_HW_RANDOM_MESON=m
-CONFIG_HW_RANDOM_CAVIUM=m
-CONFIG_HW_RANDOM_MTK=m
-CONFIG_HW_RANDOM_EXYNOS=m
-CONFIG_HW_RANDOM_CCTRNG=m
-CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_SCR24X=m
-CONFIG_IPWIRELESS=m
-# end of PCMCIA character devices
-
-CONFIG_DEVMEM=y
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=4096
-CONFIG_DEVPORT=y
-CONFIG_TCG_TPM=y
-CONFIG_HW_RANDOM_TPM=y
-CONFIG_TCG_TIS_CORE=y
-CONFIG_TCG_TIS=y
-CONFIG_TCG_TIS_SPI=m
-CONFIG_TCG_TIS_SPI_CR50=y
-CONFIG_TCG_TIS_I2C_ATMEL=m
-CONFIG_TCG_TIS_I2C_INFINEON=m
-CONFIG_TCG_TIS_I2C_NUVOTON=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-CONFIG_TCG_CRB=y
-CONFIG_TCG_VTPM_PROXY=m
-CONFIG_TCG_TIS_ST33ZP24=m
-CONFIG_TCG_TIS_ST33ZP24_I2C=m
-CONFIG_TCG_TIS_ST33ZP24_SPI=m
-CONFIG_XILLYBUS=m
-CONFIG_XILLYBUS_PCIE=m
-CONFIG_XILLYBUS_OF=m
-# end of Character devices
-
-CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-CONFIG_ACPI_I2C_OPREGION=y
-CONFIG_I2C_BOARDINFO=y
-# CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-CONFIG_I2C_MUX_GPIO=m
-CONFIG_I2C_MUX_GPMUX=m
-CONFIG_I2C_MUX_LTC4306=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-# CONFIG_I2C_MUX_PINCTRL is not set
-CONFIG_I2C_MUX_REG=m
-CONFIG_I2C_DEMUX_PINCTRL=m
-CONFIG_I2C_MUX_MLXCPLD=m
-# end of Multiplexer I2C Chip support
-
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD8111=m
-# CONFIG_I2C_AMD_MP2 is not set
-CONFIG_I2C_HIX5HD2=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NVIDIA_GPU=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-# CONFIG_I2C_VIA is not set
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-# CONFIG_I2C_SCMI is not set
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_BCM2835=m
-CONFIG_I2C_BCM_IPROC=m
-CONFIG_I2C_BRCMSTB=m
-CONFIG_I2C_CADENCE=m
-CONFIG_I2C_CBUS_GPIO=m
-CONFIG_I2C_DESIGNWARE_CORE=y
-CONFIG_I2C_DESIGNWARE_SLAVE=y
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
-CONFIG_I2C_DESIGNWARE_PCI=m
-# CONFIG_I2C_EMEV2 is not set
-# CONFIG_I2C_EXYNOS5 is not set
-CONFIG_I2C_GPIO=m
-# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
-CONFIG_I2C_IMX=m
-CONFIG_I2C_IMX_LPI2C=m
-CONFIG_I2C_KEMPLD=m
-CONFIG_I2C_MESON=m
-CONFIG_I2C_MT65XX=m
-CONFIG_I2C_MV64XXX=m
-# CONFIG_I2C_NOMADIK is not set
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_OWL=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_PXA=m
-# CONFIG_I2C_PXA_SLAVE is not set
-CONFIG_I2C_QCOM_CCI=m
-CONFIG_I2C_QCOM_GENI=m
-CONFIG_I2C_QUP=m
-CONFIG_I2C_RK3X=m
-# CONFIG_I2C_SIMTEC is not set
-CONFIG_I2C_SPRD=y
-CONFIG_I2C_SYNQUACER=m
-CONFIG_I2C_TEGRA=m
-CONFIG_I2C_TEGRA_BPMP=m
-# CONFIG_I2C_VERSATILE is not set
-CONFIG_I2C_THUNDERX=m
-CONFIG_I2C_XILINX=m
-CONFIG_I2C_XLP9XX=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_DLN2=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_ROBOTFUZZ_OSIF=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIPERBOARD=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_CROS_EC_TUNNEL=m
-CONFIG_I2C_XGENE_SLIMPRO=m
-CONFIG_I2C_ZX2967=m
-# end of I2C Hardware Bus support
-
-CONFIG_I2C_STUB=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SLAVE_EEPROM=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-CONFIG_I3C=m
-CONFIG_CDNS_I3C_MASTER=m
-CONFIG_DW_I3C_MASTER=m
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_MEM=y
-
-#
-# SPI Master Controller Drivers
-#
-# CONFIG_SPI_ALTERA is not set
-CONFIG_SPI_ARMADA_3700=m
-# CONFIG_SPI_AXI_SPI_ENGINE is not set
-CONFIG_SPI_BCM2835=m
-CONFIG_SPI_BCM2835AUX=m
-CONFIG_SPI_BCM_QSPI=m
-CONFIG_SPI_BITBANG=m
-# CONFIG_SPI_BUTTERFLY is not set
-CONFIG_SPI_CADENCE=m
-CONFIG_SPI_CADENCE_QUADSPI=m
-CONFIG_SPI_DESIGNWARE=m
-CONFIG_SPI_DW_DMA=y
-CONFIG_SPI_DW_PCI=m
-CONFIG_SPI_DW_MMIO=m
-CONFIG_SPI_DLN2=m
-CONFIG_SPI_FSL_LPSPI=m
-CONFIG_SPI_FSL_QUADSPI=m
-CONFIG_SPI_HISI_SFC_V3XX=m
-CONFIG_SPI_NXP_FLEXSPI=m
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_IMX=m
-# CONFIG_SPI_LM70_LLP is not set
-CONFIG_SPI_FSL_LIB=y
-CONFIG_SPI_FSL_SPI=y
-CONFIG_SPI_FSL_DSPI=m
-CONFIG_SPI_MESON_SPICC=m
-# CONFIG_SPI_MESON_SPIFC is not set
-CONFIG_SPI_MT65XX=m
-CONFIG_SPI_MTK_NOR=m
-CONFIG_SPI_OC_TINY=m
-CONFIG_SPI_ORION=m
-CONFIG_SPI_PL022=m
-# CONFIG_SPI_PXA2XX is not set
-CONFIG_SPI_ROCKCHIP=m
-CONFIG_SPI_QCOM_QSPI=m
-CONFIG_SPI_QUP=m
-CONFIG_SPI_QCOM_GENI=m
-CONFIG_SPI_S3C64XX=m
-CONFIG_SPI_SC18IS602=m
-CONFIG_SPI_SIFIVE=m
-CONFIG_SPI_SLAVE_MT27XX=m
-CONFIG_SPI_SPRD=m
-CONFIG_SPI_SPRD_ADI=m
-CONFIG_SPI_SUN4I=m
-CONFIG_SPI_SUN6I=m
-CONFIG_SPI_SYNQUACER=m
-CONFIG_SPI_MXIC=m
-CONFIG_SPI_TEGRA20_SFLASH=m
-CONFIG_SPI_THUNDERX=m
-CONFIG_SPI_XCOMM=m
-CONFIG_SPI_XILINX=m
-CONFIG_SPI_XLP=m
-CONFIG_SPI_ZYNQMP_GQSPI=m
-CONFIG_SPI_AMD=m
-
-#
-# SPI Multiplexer support
-#
-CONFIG_SPI_MUX=m
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_LOOPBACK_TEST=m
-# CONFIG_SPI_TLE62X0 is not set
-CONFIG_SPI_SLAVE=y
-CONFIG_SPI_SLAVE_TIME=m
-CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
-CONFIG_SPI_DYNAMIC=y
-CONFIG_SPMI=m
-CONFIG_SPMI_MSM_PMIC_ARB=m
-CONFIG_HSI=m
-CONFIG_HSI_BOARDINFO=y
-
-#
-# HSI controllers
-#
-
-#
-# HSI clients
-#
-CONFIG_HSI_CHAR=m
-CONFIG_PPS=y
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
-CONFIG_PPS_CLIENT_GPIO=m
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=y
-CONFIG_PTP_1588_CLOCK_DTE=m
-CONFIG_PTP_1588_CLOCK_QORIQ=m
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-CONFIG_PTP_1588_CLOCK_IDT82P33=m
-CONFIG_PTP_1588_CLOCK_IDTCM=m
-# end of PTP clock support
-
-CONFIG_PINCTRL=y
-CONFIG_GENERIC_PINCTRL_GROUPS=y
-CONFIG_PINMUX=y
-CONFIG_GENERIC_PINMUX_FUNCTIONS=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
-CONFIG_PINCTRL_AXP209=m
-CONFIG_PINCTRL_AMD=m
-CONFIG_PINCTRL_BM1880=y
-CONFIG_PINCTRL_MCP23S08_I2C=m
-CONFIG_PINCTRL_MCP23S08_SPI=m
-CONFIG_PINCTRL_MCP23S08=m
-CONFIG_PINCTRL_ROCKCHIP=y
-CONFIG_PINCTRL_SINGLE=y
-CONFIG_PINCTRL_SX150X=y
-CONFIG_PINCTRL_STMFX=m
-CONFIG_PINCTRL_MAX77620=m
-CONFIG_PINCTRL_RK805=m
-# CONFIG_PINCTRL_OCELOT is not set
-CONFIG_PINCTRL_OWL=y
-CONFIG_PINCTRL_S700=y
-CONFIG_PINCTRL_S900=y
-CONFIG_PINCTRL_BCM2835=y
-CONFIG_PINCTRL_IPROC_GPIO=y
-CONFIG_PINCTRL_NS2_MUX=y
-CONFIG_PINCTRL_BERLIN=y
-CONFIG_PINCTRL_AS370=y
-CONFIG_PINCTRL_BERLIN_BG4CT=y
-CONFIG_PINCTRL_IMX=y
-CONFIG_PINCTRL_IMX_SCU=y
-CONFIG_PINCTRL_IMX8MM=y
-CONFIG_PINCTRL_IMX8MN=y
-CONFIG_PINCTRL_IMX8MP=y
-CONFIG_PINCTRL_IMX8MQ=y
-CONFIG_PINCTRL_IMX8QM=y
-CONFIG_PINCTRL_IMX8QXP=y
-CONFIG_PINCTRL_IMX8DXL=y
-CONFIG_PINCTRL_MVEBU=y
-CONFIG_PINCTRL_ARMADA_AP806=y
-CONFIG_PINCTRL_ARMADA_CP110=y
-CONFIG_PINCTRL_ARMADA_37XX=y
-CONFIG_PINCTRL_MSM=y
-# CONFIG_PINCTRL_APQ8064 is not set
-# CONFIG_PINCTRL_APQ8084 is not set
-# CONFIG_PINCTRL_IPQ4019 is not set
-# CONFIG_PINCTRL_IPQ8064 is not set
-# CONFIG_PINCTRL_IPQ8074 is not set
-CONFIG_PINCTRL_IPQ6018=m
-# CONFIG_PINCTRL_MSM8660 is not set
-# CONFIG_PINCTRL_MSM8960 is not set
-# CONFIG_PINCTRL_MDM9615 is not set
-# CONFIG_PINCTRL_MSM8X74 is not set
-CONFIG_PINCTRL_MSM8916=m
-CONFIG_PINCTRL_MSM8976=m
-# CONFIG_PINCTRL_MSM8994 is not set
-# CONFIG_PINCTRL_MSM8996 is not set
-CONFIG_PINCTRL_MSM8998=m
-# CONFIG_PINCTRL_QCS404 is not set
-CONFIG_PINCTRL_QDF2XXX=m
-CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
-CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
-CONFIG_PINCTRL_SC7180=m
-# CONFIG_PINCTRL_SDM660 is not set
-CONFIG_PINCTRL_SDM845=m
-CONFIG_PINCTRL_SM8150=m
-CONFIG_PINCTRL_SM8250=m
-CONFIG_PINCTRL_SAMSUNG=y
-CONFIG_PINCTRL_EXYNOS=y
-CONFIG_PINCTRL_EXYNOS_ARM64=y
-CONFIG_PINCTRL_SPRD=y
-CONFIG_PINCTRL_SPRD_SC9860=y
-CONFIG_PINCTRL_SUNXI=y
-# CONFIG_PINCTRL_SUN4I_A10 is not set
-# CONFIG_PINCTRL_SUN5I is not set
-# CONFIG_PINCTRL_SUN6I_A31 is not set
-# CONFIG_PINCTRL_SUN6I_A31_R is not set
-# CONFIG_PINCTRL_SUN8I_A23 is not set
-# CONFIG_PINCTRL_SUN8I_A33 is not set
-# CONFIG_PINCTRL_SUN8I_A83T is not set
-# CONFIG_PINCTRL_SUN8I_A83T_R is not set
-# CONFIG_PINCTRL_SUN8I_A23_R is not set
-# CONFIG_PINCTRL_SUN8I_H3 is not set
-CONFIG_PINCTRL_SUN8I_H3_R=y
-# CONFIG_PINCTRL_SUN8I_V3S is not set
-# CONFIG_PINCTRL_SUN9I_A80 is not set
-# CONFIG_PINCTRL_SUN9I_A80_R is not set
-CONFIG_PINCTRL_SUN50I_A64=y
-CONFIG_PINCTRL_SUN50I_A64_R=y
-CONFIG_PINCTRL_SUN50I_H5=y
-CONFIG_PINCTRL_SUN50I_H6=y
-CONFIG_PINCTRL_SUN50I_H6_R=y
-CONFIG_PINCTRL_TEGRA=y
-CONFIG_PINCTRL_TEGRA124=y
-CONFIG_PINCTRL_TEGRA210=y
-CONFIG_PINCTRL_TEGRA194=y
-CONFIG_PINCTRL_TEGRA_XUSB=y
-
-#
-# MediaTek pinctrl drivers
-#
-CONFIG_EINT_MTK=y
-CONFIG_PINCTRL_MTK=y
-CONFIG_PINCTRL_MTK_V2=y
-CONFIG_PINCTRL_MTK_MOORE=y
-CONFIG_PINCTRL_MTK_PARIS=y
-CONFIG_PINCTRL_MT2712=y
-CONFIG_PINCTRL_MT6765=y
-CONFIG_PINCTRL_MT6779=m
-CONFIG_PINCTRL_MT6797=y
-CONFIG_PINCTRL_MT7622=y
-CONFIG_PINCTRL_MT8173=y
-CONFIG_PINCTRL_MT8183=y
-CONFIG_PINCTRL_MT8516=y
-# end of MediaTek pinctrl drivers
-
-CONFIG_PINCTRL_ZX=y
-CONFIG_PINCTRL_ZX296718=y
-CONFIG_PINCTRL_MESON=y
-CONFIG_PINCTRL_MESON_GXBB=y
-CONFIG_PINCTRL_MESON_GXL=y
-CONFIG_PINCTRL_MESON8_PMX=y
-CONFIG_PINCTRL_MESON_AXG=y
-CONFIG_PINCTRL_MESON_AXG_PMX=y
-CONFIG_PINCTRL_MESON_G12A=y
-CONFIG_PINCTRL_MESON_A1=y
-CONFIG_PINCTRL_LOCHNAGAR=m
-CONFIG_PINCTRL_MADERA=m
-CONFIG_PINCTRL_CS47L15=y
-CONFIG_PINCTRL_CS47L35=y
-CONFIG_PINCTRL_CS47L85=y
-CONFIG_PINCTRL_CS47L90=y
-CONFIG_PINCTRL_CS47L92=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIOLIB_FASTPATH_LIMIT=512
-CONFIG_OF_GPIO=y
-CONFIG_GPIO_ACPI=y
-CONFIG_GPIOLIB_IRQCHIP=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO drivers
-#
-CONFIG_GPIO_74XX_MMIO=m
-# CONFIG_GPIO_ALTERA is not set
-# CONFIG_GPIO_AMDPT is not set
-CONFIG_GPIO_RASPBERRYPI_EXP=m
-CONFIG_GPIO_BCM_XGS_IPROC=m
-CONFIG_GPIO_BRCMSTB=m
-CONFIG_GPIO_CADENCE=m
-CONFIG_GPIO_DWAPB=m
-CONFIG_GPIO_EIC_SPRD=m
-# CONFIG_GPIO_EXAR is not set
-CONFIG_GPIO_FTGPIO010=y
-CONFIG_GPIO_GENERIC_PLATFORM=y
-CONFIG_GPIO_GRGPIO=m
-# CONFIG_GPIO_HLWD is not set
-# CONFIG_GPIO_LOGICVC is not set
-CONFIG_GPIO_MB86S7X=m
-CONFIG_GPIO_MPC8XXX=y
-CONFIG_GPIO_MVEBU=y
-CONFIG_GPIO_MXC=y
-CONFIG_GPIO_PL061=y
-CONFIG_GPIO_PMIC_EIC_SPRD=m
-# CONFIG_GPIO_SAMA5D2_PIOBU is not set
-# CONFIG_GPIO_SIFIVE is not set
-CONFIG_GPIO_SPRD=m
-CONFIG_GPIO_SYSCON=m
-CONFIG_GPIO_TEGRA=y
-CONFIG_GPIO_TEGRA186=m
-CONFIG_GPIO_THUNDERX=m
-CONFIG_GPIO_XGENE=y
-CONFIG_GPIO_XGENE_SB=m
-CONFIG_GPIO_XILINX=m
-CONFIG_GPIO_XLP=m
-CONFIG_GPIO_ZYNQ=m
-# CONFIG_GPIO_ZX is not set
-# CONFIG_GPIO_AMD_FCH is not set
-# end of Memory mapped GPIO drivers
-
-#
-# I2C GPIO expanders
-#
-CONFIG_GPIO_ADP5588=m
-# CONFIG_GPIO_ADNP is not set
-CONFIG_GPIO_GW_PLD=m
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCA953X_IRQ=y
-CONFIG_GPIO_PCA9570=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_TPIC2810=m
-# end of I2C GPIO expanders
-
-#
-# MFD GPIO expanders
-#
-CONFIG_GPIO_BD70528=m
-CONFIG_GPIO_BD71828=m
-CONFIG_GPIO_BD9571MWV=m
-CONFIG_GPIO_DLN2=m
-CONFIG_GPIO_KEMPLD=m
-CONFIG_GPIO_LP3943=m
-CONFIG_GPIO_LP873X=m
-CONFIG_GPIO_LP87565=m
-CONFIG_GPIO_MADERA=m
-CONFIG_GPIO_MAX77620=m
-CONFIG_GPIO_MAX77650=m
-CONFIG_GPIO_TPS68470=y
-CONFIG_GPIO_TQMX86=m
-# CONFIG_GPIO_WM8994 is not set
-# end of MFD GPIO expanders
-
-#
-# PCI GPIO expanders
-#
-CONFIG_GPIO_MLXBF=m
-CONFIG_GPIO_MLXBF2=m
-CONFIG_GPIO_PCI_IDIO_16=m
-CONFIG_GPIO_PCIE_IDIO_24=m
-# CONFIG_GPIO_RDC321X is not set
-# end of PCI GPIO expanders
-
-#
-# SPI GPIO expanders
-#
-# CONFIG_GPIO_74X164 is not set
-CONFIG_GPIO_MAX3191X=m
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MC33880 is not set
-CONFIG_GPIO_PISOSR=m
-CONFIG_GPIO_XRA1403=m
-CONFIG_GPIO_MOXTET=m
-# end of SPI GPIO expanders
-
-#
-# USB GPIO expanders
-#
-CONFIG_GPIO_VIPERBOARD=m
-# end of USB GPIO expanders
-
-CONFIG_GPIO_AGGREGATOR=m
-CONFIG_GPIO_MOCKUP=m
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_MXC=m
-CONFIG_W1_MASTER_DS1WM=m
-CONFIG_W1_MASTER_GPIO=m
-# CONFIG_W1_MASTER_SGI is not set
-# end of 1-wire Bus Masters
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2405=m
-CONFIG_W1_SLAVE_DS2408=m
-CONFIG_W1_SLAVE_DS2408_READBACK=y
-CONFIG_W1_SLAVE_DS2413=m
-CONFIG_W1_SLAVE_DS2406=m
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2805=m
-CONFIG_W1_SLAVE_DS2430=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-CONFIG_W1_SLAVE_DS2433_CRC=y
-CONFIG_W1_SLAVE_DS2438=m
-CONFIG_W1_SLAVE_DS250X=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_DS2781=m
-CONFIG_W1_SLAVE_DS28E04=m
-CONFIG_W1_SLAVE_DS28E17=m
-# end of 1-wire Slaves
-
-CONFIG_POWER_AVS=y
-CONFIG_QCOM_CPR=m
-CONFIG_ROCKCHIP_IODOMAIN=m
-CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_BRCMSTB=y
-CONFIG_POWER_RESET_GPIO=y
-CONFIG_POWER_RESET_GPIO_RESTART=y
-CONFIG_POWER_RESET_HISI=y
-CONFIG_POWER_RESET_LINKSTATION=m
-CONFIG_POWER_RESET_MSM=y
-CONFIG_POWER_RESET_QCOM_PON=m
-CONFIG_POWER_RESET_LTC2952=y
-CONFIG_POWER_RESET_RESTART=y
-CONFIG_POWER_RESET_VEXPRESS=y
-CONFIG_POWER_RESET_XGENE=y
-CONFIG_POWER_RESET_SYSCON=y
-CONFIG_POWER_RESET_SYSCON_POWEROFF=y
-CONFIG_POWER_RESET_ZX=m
-CONFIG_REBOOT_MODE=m
-CONFIG_SYSCON_REBOOT_MODE=m
-CONFIG_POWER_RESET_SC27XX=m
-CONFIG_NVMEM_REBOOT_MODE=m
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_POWER_SUPPLY_HWMON=y
-CONFIG_PDA_POWER=m
-# CONFIG_GENERIC_ADC_BATTERY is not set
-# CONFIG_TEST_POWER is not set
-CONFIG_CHARGER_ADP5061=m
-CONFIG_BATTERY_CPCAP=m
-CONFIG_BATTERY_CW2015=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2780=m
-CONFIG_BATTERY_DS2781=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_LEGO_EV3=m
-CONFIG_BATTERY_SBS=m
-CONFIG_CHARGER_SBS=m
-CONFIG_MANAGER_SBS=m
-CONFIG_BATTERY_BQ27XXX=m
-CONFIG_BATTERY_BQ27XXX_I2C=m
-CONFIG_BATTERY_BQ27XXX_HDQ=m
-# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
-CONFIG_CHARGER_AXP20X=m
-CONFIG_BATTERY_AXP20X=m
-CONFIG_AXP20X_POWER=m
-CONFIG_AXP288_FUEL_GAUGE=m
-CONFIG_BATTERY_MAX17040=m
-CONFIG_BATTERY_MAX17042=m
-CONFIG_BATTERY_MAX1721X=m
-CONFIG_CHARGER_ISP1704=m
-CONFIG_CHARGER_MAX8903=m
-CONFIG_CHARGER_LP8727=m
-CONFIG_CHARGER_GPIO=m
-# CONFIG_CHARGER_MANAGER is not set
-CONFIG_CHARGER_LT3651=m
-CONFIG_CHARGER_DETECTOR_MAX14656=m
-CONFIG_CHARGER_MAX77650=m
-CONFIG_CHARGER_MP2629=m
-CONFIG_CHARGER_QCOM_SMBB=m
-# CONFIG_CHARGER_BQ2415X is not set
-CONFIG_CHARGER_BQ24190=m
-CONFIG_CHARGER_BQ24257=m
-CONFIG_CHARGER_BQ24735=m
-CONFIG_CHARGER_BQ2515X=m
-CONFIG_CHARGER_BQ25890=m
-CONFIG_CHARGER_SMB347=m
-# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-CONFIG_CHARGER_RT9455=m
-CONFIG_CHARGER_CROS_USBPD=m
-CONFIG_CHARGER_SC2731=m
-CONFIG_FUEL_GAUGE_SC27XX=m
-CONFIG_CHARGER_UCS1002=m
-CONFIG_CHARGER_BD70528=m
-CONFIG_CHARGER_BD99954=m
-CONFIG_HWMON=y
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-# CONFIG_SENSORS_AD7314 is not set
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM1177=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7X10=m
-# CONFIG_SENSORS_ADT7310 is not set
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_AS370=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_AXI_FAN_CONTROL=m
-CONFIG_SENSORS_ARM_SCMI=m
-CONFIG_SENSORS_ARM_SCPI=m
-CONFIG_SENSORS_ASPEED=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_CORSAIR_CPRO=m
-CONFIG_SENSORS_DRIVETEMP=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_SPARX5=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_GSC=m
-CONFIG_SENSORS_FTSTEUTATES=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_HIH6130=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-# CONFIG_SENSORS_IIO_HWMON is not set
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LOCHNAGAR=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC2947=m
-CONFIG_SENSORS_LTC2947_I2C=m
-CONFIG_SENSORS_LTC2947_SPI=m
-CONFIG_SENSORS_LTC2990=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-# CONFIG_SENSORS_MAX1111 is not set
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-# CONFIG_SENSORS_MAX197 is not set
-CONFIG_SENSORS_MAX31722=m
-CONFIG_SENSORS_MAX31730=m
-CONFIG_SENSORS_MAX6621=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_MLXREG_FAN=m
-CONFIG_SENSORS_TC654=m
-# CONFIG_SENSORS_MENF21BMC_HWMON is not set
-# CONFIG_SENSORS_ADCXX is not set
-CONFIG_SENSORS_LM63=m
-# CONFIG_SENSORS_LM70 is not set
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-# CONFIG_SENSORS_NTC_THERMISTOR is not set
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_NPCM7XX=m
-# CONFIG_SENSORS_OCC_P8_I2C is not set
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_BEL_PFE=m
-# CONFIG_SENSORS_IBM_CFFPS is not set
-CONFIG_SENSORS_INSPUR_IPSPS=m
-CONFIG_SENSORS_IR35221=m
-CONFIG_SENSORS_IR38064=m
-CONFIG_SENSORS_IRPS5401=m
-CONFIG_SENSORS_ISL68137=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-# CONFIG_SENSORS_LTC2978_REGULATOR is not set
-CONFIG_SENSORS_LTC3815=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX16601=m
-CONFIG_SENSORS_MAX20730=m
-CONFIG_SENSORS_MAX20751=m
-CONFIG_SENSORS_MAX31785=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_PXE1610=m
-CONFIG_SENSORS_TPS40422=m
-CONFIG_SENSORS_TPS53679=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_XDPE122=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_PWM_FAN=m
-CONFIG_SENSORS_RASPBERRYPI_HWMON=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHT3x=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_STTS751=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADS7828=m
-# CONFIG_SENSORS_ADS7871 is not set
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_INA209=m
-CONFIG_SENSORS_INA2XX=m
-CONFIG_SENSORS_INA3221=m
-CONFIG_SENSORS_TC74=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-CONFIG_SENSORS_TMP108=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_TMP513=m
-CONFIG_SENSORS_VEXPRESS=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83773G=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_XGENE=m
-
-#
-# ACPI drivers
-#
-# CONFIG_SENSORS_ACPI_POWER is not set
-CONFIG_THERMAL=y
-CONFIG_THERMAL_NETLINK=y
-CONFIG_THERMAL_STATISTICS=y
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_OF=y
-# CONFIG_THERMAL_WRITABLE_TRIPS is not set
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-CONFIG_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
-CONFIG_CPU_THERMAL=y
-CONFIG_CPU_FREQ_THERMAL=y
-# CONFIG_CPU_IDLE_THERMAL is not set
-CONFIG_DEVFREQ_THERMAL=y
-# CONFIG_THERMAL_EMULATION is not set
-CONFIG_THERMAL_MMIO=m
-CONFIG_HISI_THERMAL=m
-CONFIG_IMX_THERMAL=m
-CONFIG_IMX_SC_THERMAL=m
-CONFIG_IMX8MM_THERMAL=m
-CONFIG_MAX77620_THERMAL=m
-CONFIG_QORIQ_THERMAL=m
-CONFIG_SUN8I_THERMAL=m
-CONFIG_ROCKCHIP_THERMAL=m
-CONFIG_ARMADA_THERMAL=m
-CONFIG_MTK_THERMAL=m
-CONFIG_AMLOGIC_THERMAL=m
-
-#
-# Broadcom thermal drivers
-#
-CONFIG_BCM2711_THERMAL=m
-CONFIG_BCM2835_THERMAL=m
-CONFIG_BRCMSTB_THERMAL=m
-CONFIG_BCM_NS_THERMAL=m
-CONFIG_BCM_SR_THERMAL=m
-# end of Broadcom thermal drivers
-
-#
-# Samsung thermal drivers
-#
-CONFIG_EXYNOS_THERMAL=m
-# end of Samsung thermal drivers
-
-#
-# NVIDIA Tegra thermal drivers
-#
-CONFIG_TEGRA_SOCTHERM=m
-CONFIG_TEGRA_BPMP_THERMAL=m
-# end of NVIDIA Tegra thermal drivers
-
-CONFIG_GENERIC_ADC_THERMAL=m
-
-#
-# Qualcomm thermal drivers
-#
-CONFIG_QCOM_TSENS=m
-# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
-# end of Qualcomm thermal drivers
-
-CONFIG_ZX2967_THERMAL=m
-CONFIG_SPRD_THERMAL=m
-CONFIG_KHADAS_MCU_FAN_THERMAL=m
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
-CONFIG_WATCHDOG_OPEN_TIMEOUT=0
-# CONFIG_WATCHDOG_SYSFS is not set
-
-#
-# Watchdog Pretimeout Governors
-#
-CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
-CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
-CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=y
-CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=m
-CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP=y
-# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
-CONFIG_BD70528_WATCHDOG=m
-# CONFIG_GPIO_WATCHDOG is not set
-# CONFIG_MENF21BMC_WATCHDOG is not set
-CONFIG_WDAT_WDT=m
-CONFIG_XILINX_WATCHDOG=m
-CONFIG_ZIIRAVE_WATCHDOG=m
-CONFIG_MLX_WDT=m
-# CONFIG_ARM_SP805_WATCHDOG is not set
-CONFIG_ARM_SBSA_WATCHDOG=m
-CONFIG_ARMADA_37XX_WATCHDOG=m
-CONFIG_CADENCE_WATCHDOG=m
-CONFIG_HAVE_S3C2410_WATCHDOG=y
-CONFIG_S3C2410_WATCHDOG=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_SUNXI_WATCHDOG=m
-# CONFIG_MAX63XX_WATCHDOG is not set
-CONFIG_MAX77620_WATCHDOG=m
-CONFIG_IMX2_WDT=m
-CONFIG_IMX_SC_WDT=m
-CONFIG_IMX7ULP_WDT=m
-CONFIG_TEGRA_WATCHDOG=m
-# CONFIG_QCOM_WDT is not set
-CONFIG_MESON_GXBB_WATCHDOG=m
-CONFIG_MESON_WATCHDOG=m
-CONFIG_MEDIATEK_WATCHDOG=m
-CONFIG_ARM_SMC_WATCHDOG=m
-CONFIG_ZX2967_WATCHDOG=m
-CONFIG_STPMIC1_WATCHDOG=m
-CONFIG_RTD119X_WATCHDOG=y
-CONFIG_SPRD_WATCHDOG=m
-CONFIG_PM8916_WATCHDOG=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_KEMPLD_WDT=m
-CONFIG_BCM2835_WDT=m
-CONFIG_BCM7038_WDT=m
-CONFIG_MEN_A21_WDT=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_DRIVER_GPIO=y
-CONFIG_BCMA_POSSIBLE=y
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_SOC=y
-CONFIG_BCMA_DRIVER_PCI=y
-CONFIG_BCMA_SFLASH=y
-CONFIG_BCMA_DRIVER_GMAC_CMN=y
-CONFIG_BCMA_DRIVER_GPIO=y
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-CONFIG_MFD_ALTERA_SYSMGR=y
-# CONFIG_MFD_ACT8945A is not set
-CONFIG_MFD_SUN4I_GPADC=m
-# CONFIG_MFD_AS3711 is not set
-# CONFIG_MFD_AS3722 is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-CONFIG_MFD_ATMEL_HLCDC=m
-# CONFIG_MFD_BCM590XX is not set
-CONFIG_MFD_BD9571MWV=m
-CONFIG_MFD_AC100=m
-CONFIG_MFD_AXP20X=m
-CONFIG_MFD_AXP20X_I2C=m
-CONFIG_MFD_AXP20X_RSB=m
-CONFIG_MFD_CROS_EC_DEV=m
-CONFIG_MFD_MADERA=m
-CONFIG_MFD_MADERA_I2C=m
-CONFIG_MFD_MADERA_SPI=m
-CONFIG_MFD_CS47L15=y
-CONFIG_MFD_CS47L35=y
-CONFIG_MFD_CS47L85=y
-CONFIG_MFD_CS47L90=y
-CONFIG_MFD_CS47L92=y
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_DA9052_I2C is not set
-# CONFIG_MFD_DA9055 is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-CONFIG_MFD_DLN2=m
-CONFIG_MFD_EXYNOS_LPASS=m
-CONFIG_MFD_GATEWORKS_GSC=m
-# CONFIG_MFD_MC13XXX_SPI is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-CONFIG_MFD_MP2629=m
-CONFIG_MFD_HI6421_PMIC=m
-CONFIG_MFD_HI655X_PMIC=m
-CONFIG_HTC_PASIC3=m
-# CONFIG_HTC_I2CPLD is not set
-CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
-CONFIG_MFD_IQS62X=m
-# CONFIG_MFD_JANZ_CMODIO is not set
-CONFIG_MFD_KEMPLD=m
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_MAX14577 is not set
-CONFIG_MFD_MAX77620=y
-CONFIG_MFD_MAX77650=m
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX77843 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_MAX8997 is not set
-# CONFIG_MFD_MAX8998 is not set
-# CONFIG_MFD_MT6360 is not set
-# CONFIG_MFD_MT6397 is not set
-CONFIG_MFD_MENF21BMC=m
-# CONFIG_EZX_PCAP is not set
-CONFIG_MFD_CPCAP=m
-CONFIG_MFD_VIPERBOARD=m
-# CONFIG_MFD_RETU is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_UCB1400_CORE is not set
-CONFIG_MFD_QCOM_RPM=m
-CONFIG_MFD_SPMI_PMIC=m
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_RC5T583 is not set
-CONFIG_MFD_RK808=m
-# CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_SEC_CORE is not set
-# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SM501 is not set
-CONFIG_MFD_SKY81452=m
-CONFIG_MFD_SC27XX_PMIC=m
-# CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN6I_PRCM=y
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_MFD_LP3943=m
-# CONFIG_MFD_LP8788 is not set
-CONFIG_MFD_TI_LMU=m
-# CONFIG_MFD_PALMAS is not set
-# CONFIG_TPS6105X is not set
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TPS65090 is not set
-# CONFIG_MFD_TPS65217 is not set
-CONFIG_MFD_TPS68470=y
-CONFIG_MFD_TI_LP873X=m
-CONFIG_MFD_TI_LP87565=m
-# CONFIG_MFD_TPS65218 is not set
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_MFD_TPS65910 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-# CONFIG_MFD_TPS80031 is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_TWL6040_CORE is not set
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MFD_LM3533=m
-# CONFIG_MFD_TC3589X is not set
-CONFIG_MFD_TQMX86=m
-CONFIG_MFD_VX855=m
-CONFIG_MFD_LOCHNAGAR=y
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM831X_I2C is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_MFD_WM8350_I2C is not set
-CONFIG_MFD_WM8994=m
-CONFIG_MFD_ROHM_BD718XX=m
-CONFIG_MFD_ROHM_BD70528=m
-CONFIG_MFD_ROHM_BD71828=m
-CONFIG_MFD_STPMIC1=m
-CONFIG_MFD_STMFX=m
-CONFIG_MFD_KHADAS_MCU=m
-CONFIG_MFD_VEXPRESS_SYSREG=y
-# CONFIG_RAVE_SP_CORE is not set
-# end of Multifunction device drivers
-
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-CONFIG_REGULATOR_88PG86X=m
-# CONFIG_REGULATOR_ACT8865 is not set
-# CONFIG_REGULATOR_AD5398 is not set
-# CONFIG_REGULATOR_ANATOP is not set
-CONFIG_REGULATOR_ARIZONA_LDO1=m
-CONFIG_REGULATOR_ARIZONA_MICSUPP=m
-CONFIG_REGULATOR_AXP20X=m
-CONFIG_REGULATOR_BD70528=m
-CONFIG_REGULATOR_BD71828=m
-CONFIG_REGULATOR_BD718XX=m
-CONFIG_REGULATOR_BD9571MWV=m
-CONFIG_REGULATOR_CPCAP=m
-CONFIG_REGULATOR_CROS_EC=m
-# CONFIG_REGULATOR_DA9210 is not set
-# CONFIG_REGULATOR_DA9211 is not set
-CONFIG_REGULATOR_FAN53555=m
-CONFIG_REGULATOR_FAN53880=m
-CONFIG_REGULATOR_GPIO=m
-CONFIG_REGULATOR_HI6421=m
-CONFIG_REGULATOR_HI6421V530=m
-CONFIG_REGULATOR_HI655X=m
-CONFIG_REGULATOR_ISL9305=m
-# CONFIG_REGULATOR_ISL6271A is not set
-CONFIG_REGULATOR_LM363X=m
-CONFIG_REGULATOR_LOCHNAGAR=m
-# CONFIG_REGULATOR_LP3971 is not set
-# CONFIG_REGULATOR_LP3972 is not set
-# CONFIG_REGULATOR_LP872X is not set
-CONFIG_REGULATOR_LP873X=m
-# CONFIG_REGULATOR_LP8755 is not set
-CONFIG_REGULATOR_LP87565=m
-CONFIG_REGULATOR_LTC3589=m
-CONFIG_REGULATOR_LTC3676=m
-# CONFIG_REGULATOR_MAX1586 is not set
-CONFIG_REGULATOR_MAX77620=m
-CONFIG_REGULATOR_MAX77650=m
-# CONFIG_REGULATOR_MAX8649 is not set
-# CONFIG_REGULATOR_MAX8660 is not set
-# CONFIG_REGULATOR_MAX8952 is not set
-# CONFIG_REGULATOR_MAX8973 is not set
-# CONFIG_REGULATOR_MAX77826 is not set
-CONFIG_REGULATOR_MCP16502=m
-CONFIG_REGULATOR_MP5416=m
-CONFIG_REGULATOR_MP8859=m
-CONFIG_REGULATOR_MP886X=m
-CONFIG_REGULATOR_MPQ7920=m
-# CONFIG_REGULATOR_MT6311 is not set
-CONFIG_REGULATOR_MT6380=m
-CONFIG_REGULATOR_PCA9450=m
-# CONFIG_REGULATOR_PFUZE100 is not set
-# CONFIG_REGULATOR_PV88060 is not set
-# CONFIG_REGULATOR_PV88080 is not set
-# CONFIG_REGULATOR_PV88090 is not set
-CONFIG_REGULATOR_PWM=m
-CONFIG_REGULATOR_QCOM_RPM=m
-CONFIG_REGULATOR_QCOM_RPMH=m
-CONFIG_REGULATOR_QCOM_SMD_RPM=m
-CONFIG_REGULATOR_QCOM_SPMI=m
-CONFIG_REGULATOR_QCOM_USB_VBUS=m
-CONFIG_REGULATOR_RK808=m
-CONFIG_REGULATOR_ROHM=m
-CONFIG_REGULATOR_SC2731=m
-CONFIG_REGULATOR_SKY81452=m
-CONFIG_REGULATOR_SLG51000=m
-CONFIG_REGULATOR_STPMIC1=m
-CONFIG_REGULATOR_SY8106A=m
-CONFIG_REGULATOR_SY8824X=m
-CONFIG_REGULATOR_SY8827N=m
-# CONFIG_REGULATOR_TPS51632 is not set
-# CONFIG_REGULATOR_TPS62360 is not set
-# CONFIG_REGULATOR_TPS65023 is not set
-# CONFIG_REGULATOR_TPS6507X is not set
-CONFIG_REGULATOR_TPS65132=m
-# CONFIG_REGULATOR_TPS6524X is not set
-CONFIG_REGULATOR_VCTRL=m
-CONFIG_REGULATOR_VEXPRESS=m
-CONFIG_REGULATOR_VQMMC_IPQ4019=m
-CONFIG_REGULATOR_WM8994=m
-CONFIG_REGULATOR_QCOM_LABIBB=m
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_LIRC=y
-CONFIG_RC_DECODERS=y
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_SHARP_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_XMP_DECODER=m
-CONFIG_IR_IMON_DECODER=m
-CONFIG_IR_RCMM_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-# CONFIG_IR_ENE is not set
-CONFIG_IR_HIX5HD2=m
-CONFIG_IR_IMON=m
-CONFIG_IR_IMON_RAW=m
-CONFIG_IR_MCEUSB=m
-# CONFIG_IR_ITE_CIR is not set
-# CONFIG_IR_FINTEK is not set
-CONFIG_IR_MESON=m
-CONFIG_IR_MTK=m
-# CONFIG_IR_NUVOTON is not set
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_SPI=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_IGORPLUGUSB=m
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_IR_GPIO_TX=m
-CONFIG_IR_PWM_TX=m
-CONFIG_IR_SUNXI=m
-CONFIG_IR_SERIAL=m
-CONFIG_IR_SERIAL_TRANSMITTER=y
-CONFIG_IR_SIR=m
-CONFIG_RC_XBOX_DVD=m
-CONFIG_IR_ZX=m
-CONFIG_IR_TOY=m
-CONFIG_CEC_CORE=m
-CONFIG_CEC_NOTIFIER=y
-CONFIG_CEC_PIN=y
-CONFIG_MEDIA_CEC_RC=y
-# CONFIG_CEC_PIN_ERROR_INJ is not set
-CONFIG_MEDIA_CEC_SUPPORT=y
-CONFIG_CEC_CH7322=m
-CONFIG_CEC_CROS_EC=m
-CONFIG_CEC_MESON_AO=m
-CONFIG_CEC_MESON_G12A_AO=m
-CONFIG_CEC_SAMSUNG_S5P=m
-CONFIG_CEC_TEGRA=m
-CONFIG_USB_PULSE8_CEC=m
-CONFIG_USB_RAINSHADOW_CEC=m
-CONFIG_MEDIA_SUPPORT=m
-# CONFIG_MEDIA_SUPPORT_FILTER is not set
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-
-#
-# Media device types
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_PLATFORM_SUPPORT=y
-CONFIG_MEDIA_TEST_SUPPORT=y
-# end of Media device types
-
-#
-# Media core support
-#
-CONFIG_VIDEO_DEV=m
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_DVB_CORE=m
-# end of Media core support
-
-#
-# Video4Linux options
-#
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L2_I2C=y
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_JPEG_HELPER=m
-CONFIG_V4L2_H264=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_V4L2_FLASH_LED_CLASS=m
-CONFIG_V4L2_FWNODE=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-# end of Video4Linux options
-
-#
-# Media controller options
-#
-CONFIG_MEDIA_CONTROLLER_DVB=y
-CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
-
-#
-# Please notice that the enabled Media controller Request API is EXPERIMENTAL
-#
-# end of Media controller options
-
-#
-# Digital TV options
-#
-# CONFIG_DVB_MMAP is not set
-CONFIG_DVB_NET=y
-CONFIG_DVB_MAX_ADAPTERS=8
-CONFIG_DVB_DYNAMIC_MINORS=y
-# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
-# CONFIG_DVB_ULE_DEBUG is not set
-# end of Digital TV options
-
-#
-# Media drivers
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_VIDEO_USBTV=m
-
-#
-# Analog TV USB devices
-#
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_LOADER=m
-CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-
-#
-# Analog/digital TV USB devices
-#
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_AU0828_RC=y
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_DIB3000MC=m
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_CXUSB_ANALOG=y
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_USB_ZD1301=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-CONFIG_DVB_AS102=m
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-
-#
-# Software defined radio USB devices
-#
-CONFIG_USB_AIRSPY=m
-CONFIG_USB_HACKRF=m
-CONFIG_USB_MSI2500=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_TW5864=m
-CONFIG_VIDEO_TW68=m
-CONFIG_VIDEO_TW686X=m
-
-#
-# Media capture/analog TV support
-#
-CONFIG_VIDEO_IVTV=m
-# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
-CONFIG_VIDEO_IVTV_ALSA=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DT3155=m
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_ENABLE_VP3054=y
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_BT848=m
-CONFIG_DVB_BT8XX=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7134_GO7007=m
-CONFIG_VIDEO_SAA7164=m
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-CONFIG_DVB_PT3=m
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_DDBRIDGE=m
-# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
-CONFIG_DVB_SMIPCIE=m
-CONFIG_DVB_NETUP_UNIDVB=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_TEA575X=m
-CONFIG_RADIO_SI470X=m
-CONFIG_USB_SI470X=m
-# CONFIG_I2C_SI470X is not set
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_SI4713=m
-CONFIG_PLATFORM_SI4713=m
-CONFIG_I2C_SI4713=m
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_SHARK=m
-CONFIG_RADIO_SHARK2=m
-CONFIG_USB_KEENE=m
-CONFIG_USB_RAREMONO=m
-CONFIG_USB_MA901=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_WL1273=m
-CONFIG_RADIO_WL128X=m
-CONFIG_MEDIA_COMMON_OPTIONS=y
-
-#
-# common driver options
-#
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_V4L2=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-CONFIG_VIDEO_V4L2_TPG=m
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_CADENCE=y
-CONFIG_VIDEO_CADENCE_CSI2RX=m
-CONFIG_VIDEO_CADENCE_CSI2TX=m
-CONFIG_VIDEO_ASPEED=m
-CONFIG_VIDEO_MUX=m
-CONFIG_VIDEO_QCOM_CAMSS=m
-CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m
-CONFIG_VIDEO_EXYNOS4_IS_COMMON=m
-CONFIG_VIDEO_S5P_FIMC=m
-CONFIG_VIDEO_S5P_MIPI_CSIS=m
-CONFIG_VIDEO_EXYNOS4_FIMC_IS=m
-CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE=y
-CONFIG_VIDEO_XILINX=m
-CONFIG_VIDEO_XILINX_CSI2RXSS=m
-CONFIG_VIDEO_XILINX_TPG=m
-CONFIG_VIDEO_XILINX_VTC=m
-CONFIG_VIDEO_SUN4I_CSI=m
-CONFIG_VIDEO_SUN6I_CSI=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_CODA=m
-CONFIG_VIDEO_IMX_PXP=m
-CONFIG_VIDEO_MEDIATEK_JPEG=m
-CONFIG_VIDEO_MEDIATEK_VPU=m
-CONFIG_VIDEO_MEDIATEK_MDP=m
-CONFIG_VIDEO_MEDIATEK_VCODEC=m
-CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
-CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
-CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
-CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
-CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
-CONFIG_VIDEO_ROCKCHIP_RGA=m
-CONFIG_VIDEO_QCOM_VENUS=m
-CONFIG_VIDEO_SUN8I_DEINTERLACE=m
-CONFIG_VIDEO_SUN8I_ROTATE=m
-CONFIG_DVB_PLATFORM_DRIVERS=y
-CONFIG_SDR_PLATFORM_DRIVERS=y
-
-#
-# MMC/SDIO DVB adapters
-#
-CONFIG_SMS_SDIO_DRV=m
-CONFIG_V4L_TEST_DRIVERS=y
-CONFIG_VIDEO_VIMC=m
-CONFIG_VIDEO_VIVID=m
-CONFIG_VIDEO_VIVID_CEC=y
-CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VIM2M=m
-CONFIG_VIDEO_VICODEC=m
-
-#
-# FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-# end of Media drivers
-
-#
-# Media ancillary drivers
-#
-CONFIG_MEDIA_ATTACH=y
-
-#
-# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
-#
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TDA1997X=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS3308=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-# end of Audio decoders, processors and mixers
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-# end of RDS decoders
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_ADV7183=m
-CONFIG_VIDEO_ADV748X=m
-CONFIG_VIDEO_ADV7604=m
-CONFIG_VIDEO_ADV7604_CEC=y
-CONFIG_VIDEO_ADV7842=m
-CONFIG_VIDEO_ADV7842_CEC=y
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_ML86V7667=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TC358743=m
-CONFIG_VIDEO_TC358743_CEC=y
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=m
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_TW9910=m
-CONFIG_VIDEO_VPX3220=m
-CONFIG_VIDEO_MAX9286=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-# end of Video decoders
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_ADV7393=m
-CONFIG_VIDEO_AD9389B=m
-CONFIG_VIDEO_AK881X=m
-CONFIG_VIDEO_THS8200=m
-# end of Video encoders
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-# end of Video improvement chips
-
-#
-# Audio/Video compression chips
-#
-CONFIG_VIDEO_SAA6752HS=m
-# end of Audio/Video compression chips
-
-#
-# SDR tuner chips
-#
-CONFIG_SDR_MAX2175=m
-# end of SDR tuner chips
-
-#
-# Miscellaneous helper chips
-#
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_I2C=m
-CONFIG_VIDEO_ST_MIPID02=m
-# end of Miscellaneous helper chips
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_APTINA_PLL=m
-CONFIG_VIDEO_SMIAPP_PLL=m
-CONFIG_VIDEO_HI556=m
-CONFIG_VIDEO_IMX214=m
-CONFIG_VIDEO_IMX219=m
-CONFIG_VIDEO_IMX258=m
-CONFIG_VIDEO_IMX274=m
-CONFIG_VIDEO_IMX290=m
-CONFIG_VIDEO_IMX319=m
-CONFIG_VIDEO_IMX355=m
-CONFIG_VIDEO_OV2640=m
-CONFIG_VIDEO_OV2659=m
-CONFIG_VIDEO_OV2680=m
-CONFIG_VIDEO_OV2685=m
-CONFIG_VIDEO_OV2740=m
-CONFIG_VIDEO_OV5640=m
-CONFIG_VIDEO_OV5645=m
-CONFIG_VIDEO_OV5647=m
-CONFIG_VIDEO_OV6650=m
-CONFIG_VIDEO_OV5670=m
-CONFIG_VIDEO_OV5675=m
-CONFIG_VIDEO_OV5695=m
-CONFIG_VIDEO_OV7251=m
-CONFIG_VIDEO_OV772X=m
-CONFIG_VIDEO_OV7640=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_OV7740=m
-CONFIG_VIDEO_OV8856=m
-CONFIG_VIDEO_OV9640=m
-CONFIG_VIDEO_OV9650=m
-CONFIG_VIDEO_OV13858=m
-CONFIG_VIDEO_VS6624=m
-CONFIG_VIDEO_MT9M001=m
-CONFIG_VIDEO_MT9M032=m
-CONFIG_VIDEO_MT9M111=m
-CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
-CONFIG_VIDEO_MT9T112=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_MT9V111=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=m
-CONFIG_VIDEO_RDACM20=m
-CONFIG_VIDEO_RJ54N1=m
-CONFIG_VIDEO_S5K6AA=m
-CONFIG_VIDEO_S5K6A3=m
-CONFIG_VIDEO_S5K4ECGX=m
-CONFIG_VIDEO_S5K5BAF=m
-CONFIG_VIDEO_SMIAPP=m
-CONFIG_VIDEO_ET8EK8=m
-CONFIG_VIDEO_S5C73M3=m
-# end of Camera sensor devices
-
-#
-# Lens drivers
-#
-CONFIG_VIDEO_AD5820=m
-CONFIG_VIDEO_AK7375=m
-CONFIG_VIDEO_DW9714=m
-CONFIG_VIDEO_DW9768=m
-CONFIG_VIDEO_DW9807_VCM=m
-# end of Lens drivers
-
-#
-# Flash devices
-#
-CONFIG_VIDEO_ADP1653=m
-CONFIG_VIDEO_LM3560=m
-CONFIG_VIDEO_LM3646=m
-# end of Flash devices
-
-#
-# SPI helper chips
-#
-CONFIG_VIDEO_GS1662=m
-# end of SPI helper chips
-
-#
-# Media SPI Adapters
-#
-CONFIG_CXD2880_SPI_DRV=m
-# end of Media SPI Adapters
-
-CONFIG_MEDIA_TUNER=m
-
-#
-# Customize TV tuners
-#
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA18250=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MSI001=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_M88RS6000T=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_MXL301RF=m
-CONFIG_MEDIA_TUNER_QM1D1C0042=m
-CONFIG_MEDIA_TUNER_QM1D1B0004=m
-# end of Customize TV tuners
-
-#
-# Customise DVB Frontends
-#
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV0910=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_STV6111=m
-CONFIG_DVB_MXL5XX=m
-CONFIG_DVB_M88DS3103=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_SI2165=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24117=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_S5H1432=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_DIB9000=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_CXD2841ER=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_RTL2832_SDR=m
-CONFIG_DVB_SI2168=m
-CONFIG_DVB_AS102_FE=m
-CONFIG_DVB_ZD1301_DEMOD=m
-CONFIG_DVB_GP8PSK_FE=m
-CONFIG_DVB_CXD2880=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT3306A=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_TC90522=m
-CONFIG_DVB_MN88443X=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_LNBH25=m
-CONFIG_DVB_LNBH29=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_LGS8GL5=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_HORUS3A=m
-CONFIG_DVB_ASCOT2E=m
-CONFIG_DVB_HELENE=m
-
-#
-# Common Interface (EN50221) controller drivers
-#
-CONFIG_DVB_CXD2099=m
-CONFIG_DVB_SP2=m
-# end of Customise DVB Frontends
-
-#
-# Tools to develop new frontends
-#
-CONFIG_DVB_DUMMY_FE=m
-# end of Media ancillary drivers
-
-#
-# Graphics support
-#
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_TEGRA_HOST1X=m
-CONFIG_TEGRA_HOST1X_FIREWALL=y
-CONFIG_DRM=m
-CONFIG_DRM_MIPI_DBI=m
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
-CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_DP_CEC=y
-CONFIG_DRM_TTM=m
-CONFIG_DRM_TTM_DMA_PAGE_POOL=y
-CONFIG_DRM_VRAM_HELPER=m
-CONFIG_DRM_TTM_HELPER=m
-CONFIG_DRM_GEM_CMA_HELPER=y
-CONFIG_DRM_KMS_CMA_HELPER=y
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_SCHED=m
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_I2C_NXP_TDA9950=m
-# end of I2C encoder or helper chips
-
-#
-# ARM devices
-#
-CONFIG_DRM_HDLCD=m
-# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
-CONFIG_DRM_MALI_DISPLAY=m
-CONFIG_DRM_KOMEDA=m
-# end of ARM devices
-
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_USERPTR=y
-CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_AMDGPU_SI=y
-CONFIG_DRM_AMDGPU_CIK=y
-CONFIG_DRM_AMDGPU_USERPTR=y
-# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
-
-#
-# ACP (Audio CoProcessor) Configuration
-#
-CONFIG_DRM_AMD_ACP=y
-# end of ACP (Audio CoProcessor) Configuration
-
-#
-# Display Engine Configuration
-#
-CONFIG_DRM_AMD_DC=y
-CONFIG_DRM_AMD_DC_DCN=y
-# CONFIG_DRM_AMD_DC_HDCP is not set
-# CONFIG_DEBUG_KERNEL_DC is not set
-# end of Display Engine Configuration
-
-CONFIG_HSA_AMD=y
-CONFIG_DRM_NOUVEAU=m
-# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
-CONFIG_NOUVEAU_PLATFORM_DRIVER=y
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-# CONFIG_NOUVEAU_DEBUG_MMU is not set
-# CONFIG_NOUVEAU_DEBUG_PUSH is not set
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_SVM=y
-# CONFIG_DRM_VGEM is not set
-CONFIG_DRM_VKMS=m
-# CONFIG_DRM_EXYNOS is not set
-CONFIG_DRM_ROCKCHIP=m
-CONFIG_ROCKCHIP_ANALOGIX_DP=y
-CONFIG_ROCKCHIP_CDN_DP=y
-CONFIG_ROCKCHIP_DW_HDMI=y
-CONFIG_ROCKCHIP_DW_MIPI_DSI=y
-CONFIG_ROCKCHIP_INNO_HDMI=y
-CONFIG_ROCKCHIP_LVDS=y
-CONFIG_ROCKCHIP_RGB=y
-CONFIG_ROCKCHIP_RK3066_HDMI=y
-CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_RCAR_DW_HDMI=m
-CONFIG_DRM_RCAR_LVDS=m
-CONFIG_DRM_RCAR_WRITEBACK=y
-CONFIG_DRM_SUN4I=m
-CONFIG_DRM_SUN4I_HDMI=m
-CONFIG_DRM_SUN4I_HDMI_CEC=y
-CONFIG_DRM_SUN4I_BACKEND=m
-CONFIG_DRM_SUN6I_DSI=m
-CONFIG_DRM_SUN8I_DW_HDMI=m
-CONFIG_DRM_SUN8I_MIXER=m
-CONFIG_DRM_SUN8I_TCON_TOP=m
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_MSM=m
-CONFIG_DRM_MSM_GPU_STATE=y
-# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
-# CONFIG_DRM_MSM_GPU_SUDO is not set
-CONFIG_DRM_MSM_HDMI_HDCP=y
-CONFIG_DRM_MSM_DSI=y
-CONFIG_DRM_MSM_DSI_PLL=y
-CONFIG_DRM_MSM_DSI_28NM_PHY=y
-CONFIG_DRM_MSM_DSI_20NM_PHY=y
-CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
-CONFIG_DRM_MSM_DSI_14NM_PHY=y
-CONFIG_DRM_MSM_DSI_10NM_PHY=y
-CONFIG_DRM_TEGRA=m
-# CONFIG_DRM_TEGRA_DEBUG is not set
-# CONFIG_DRM_TEGRA_STAGING is not set
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-CONFIG_DRM_PANEL_ARM_VERSATILE=m
-CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596=m
-CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
-CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
-CONFIG_DRM_PANEL_LVDS=m
-CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_PANEL_ELIDA_KD35T133=m
-CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
-CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
-CONFIG_DRM_PANEL_ILITEK_IL9322=m
-CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
-CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
-CONFIG_DRM_PANEL_JDI_LT070ME05000=m
-CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
-CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W=m
-CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m
-CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
-CONFIG_DRM_PANEL_LG_LB035Q02=m
-CONFIG_DRM_PANEL_LG_LG4573=m
-CONFIG_DRM_PANEL_NEC_NL8048HL11=m
-CONFIG_DRM_PANEL_NOVATEK_NT35510=m
-CONFIG_DRM_PANEL_NOVATEK_NT39016=m
-CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
-CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
-CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=m
-CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
-CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
-CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
-CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
-CONFIG_DRM_PANEL_RONBO_RB070D30=m
-CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
-CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
-CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
-CONFIG_DRM_PANEL_SAMSUNG_S6E63M0=m
-CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
-CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
-CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
-CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
-CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m
-CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
-CONFIG_DRM_PANEL_SITRONIX_ST7701=m
-CONFIG_DRM_PANEL_SITRONIX_ST7703=m
-CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
-CONFIG_DRM_PANEL_SONY_ACX424AKP=m
-CONFIG_DRM_PANEL_SONY_ACX565AKM=m
-CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
-CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
-CONFIG_DRM_PANEL_TPO_TPG110=m
-CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
-CONFIG_DRM_PANEL_VISIONOX_RM69299=m
-CONFIG_DRM_PANEL_XINPENG_XPP055C272=m
-# end of Display Panels
-
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-CONFIG_DRM_CDNS_DSI=m
-CONFIG_DRM_CHRONTEL_CH7033=m
-CONFIG_DRM_DISPLAY_CONNECTOR=m
-CONFIG_DRM_LVDS_CODEC=m
-CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW=m
-CONFIG_DRM_NWL_MIPI_DSI=m
-CONFIG_DRM_NXP_PTN3460=m
-CONFIG_DRM_PARADE_PS8622=m
-CONFIG_DRM_PARADE_PS8640=m
-CONFIG_DRM_SIL_SII8620=m
-CONFIG_DRM_SII902X=m
-CONFIG_DRM_SII9234=m
-CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_THINE_THC63LVD1024=m
-CONFIG_DRM_TOSHIBA_TC358764=m
-CONFIG_DRM_TOSHIBA_TC358767=m
-CONFIG_DRM_TOSHIBA_TC358768=m
-CONFIG_DRM_TI_TFP410=m
-CONFIG_DRM_TI_SN65DSI86=m
-CONFIG_DRM_TI_TPD12S015=m
-CONFIG_DRM_ANALOGIX_ANX6345=m
-CONFIG_DRM_ANALOGIX_ANX78XX=m
-CONFIG_DRM_ANALOGIX_DP=m
-CONFIG_DRM_I2C_ADV7511=m
-CONFIG_DRM_I2C_ADV7511_AUDIO=y
-CONFIG_DRM_I2C_ADV7511_CEC=y
-CONFIG_DRM_DW_HDMI=m
-CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
-CONFIG_DRM_DW_HDMI_CEC=m
-CONFIG_DRM_DW_MIPI_DSI=m
-# end of Display Interface Bridges
-
-CONFIG_DRM_VC4=m
-CONFIG_DRM_VC4_HDMI_CEC=y
-CONFIG_DRM_ETNAVIV=m
-CONFIG_DRM_ETNAVIV_THERMAL=y
-# CONFIG_DRM_ARCPGU is not set
-CONFIG_DRM_HISI_HIBMC=m
-CONFIG_DRM_HISI_KIRIN=m
-CONFIG_DRM_MEDIATEK=m
-CONFIG_DRM_MEDIATEK_HDMI=m
-CONFIG_DRM_ZTE=m
-# CONFIG_DRM_MXSFB is not set
-CONFIG_DRM_MESON=m
-CONFIG_DRM_MESON_DW_HDMI=m
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_GM12U320=m
-CONFIG_TINYDRM_HX8357D=m
-CONFIG_TINYDRM_ILI9225=m
-CONFIG_TINYDRM_ILI9341=m
-CONFIG_TINYDRM_ILI9486=m
-CONFIG_TINYDRM_MI0283QT=m
-CONFIG_TINYDRM_REPAPER=m
-CONFIG_TINYDRM_ST7586=m
-CONFIG_TINYDRM_ST7735R=m
-CONFIG_DRM_PL111=m
-CONFIG_DRM_LIMA=m
-CONFIG_DRM_PANFROST=m
-CONFIG_DRM_TIDSS=m
-CONFIG_DRM_ZYNQMP_DPSUB=m
-# CONFIG_DRM_LEGACY is not set
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DDC=m
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_BACKLIGHT=m
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_ARMCLCD is not set
-CONFIG_FB_IMX=m
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_UVESA=m
-CONFIG_FB_EFI=y
-# CONFIG_FB_OPENCORES is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-CONFIG_FB_I740=m
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-CONFIG_FB_SMSCUFX=m
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-CONFIG_FB_XILINX=m
-CONFIG_FB_VIRTUAL=m
-CONFIG_FB_METRONOME=m
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_MB862XX_I2C=y
-CONFIG_FB_MX3=y
-# CONFIG_FB_SIMPLE is not set
-# CONFIG_FB_SSD1307 is not set
-# CONFIG_FB_SM712 is not set
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_ILI922X is not set
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-CONFIG_LCD_PLATFORM=m
-# CONFIG_LCD_AMS369FG06 is not set
-# CONFIG_LCD_LMS501KF03 is not set
-# CONFIG_LCD_HX8357 is not set
-CONFIG_LCD_OTM3225A=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_PWM=m
-CONFIG_BACKLIGHT_QCOM_WLED=m
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_LM3630A=m
-CONFIG_BACKLIGHT_LM3639=m
-CONFIG_BACKLIGHT_LP855X=m
-CONFIG_BACKLIGHT_SKY81452=m
-CONFIG_BACKLIGHT_GPIO=m
-CONFIG_BACKLIGHT_LV5207LP=m
-CONFIG_BACKLIGHT_BD6107=m
-CONFIG_BACKLIGHT_ARCXCNN=m
-CONFIG_BACKLIGHT_LED=m
-# end of Backlight & LCD device support
-
-CONFIG_VGASTATE=m
-CONFIG_VIDEOMODE_HELPERS=y
-CONFIG_HDMI=y
-
-#
-# Console display driver support
-#
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
-# end of Console display driver support
-
-# CONFIG_LOGO is not set
-# end of Graphics support
-
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_PCM_ELD=y
-CONFIG_SND_PCM_IEC958=y
-CONFIG_SND_DMAENGINE_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_SEQ_DEVICE=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_COMPRESS_OFFLOAD=m
-CONFIG_SND_JACK=y
-CONFIG_SND_JACK_INPUT_DEV=y
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_PCM_TIMER=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_PROC_FS=y
-CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VERBOSE_PRINTK=y
-CONFIG_SND_DEBUG=y
-# CONFIG_SND_DEBUG_VERBOSE is not set
-CONFIG_SND_PCM_XRUN_DEBUG=y
-# CONFIG_SND_CTL_VALIDATION is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_SEQUENCER_OSS=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_SEQ_MIDI_EVENT=m
-CONFIG_SND_SEQ_MIDI=m
-CONFIG_SND_SEQ_MIDI_EMUL=m
-CONFIG_SND_SEQ_VIRMIDI=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALI5451 is not set
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-# CONFIG_SND_AZT3328 is not set
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-# CONFIG_SND_ICE1712 is not set
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-# CONFIG_SND_MAESTRO3 is not set
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_TRIDENT is not set
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-
-#
-# HD-Audio
-#
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_GENERIC_LEDS=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_TEGRA=m
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
-# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
-# end of HD-Audio
-
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_ALIGNED_MMIO=y
-CONFIG_SND_HDA_COMPONENT=y
-CONFIG_SND_HDA_PREALLOC_SIZE=1024
-CONFIG_SND_INTEL_NHLT=y
-CONFIG_SND_INTEL_DSP_CONFIG=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_DICE=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_BEBOB=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREFACE=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_AC97_BUS=y
-CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
-CONFIG_SND_SOC_COMPRESS=y
-CONFIG_SND_SOC_TOPOLOGY=y
-CONFIG_SND_SOC_ACPI=m
-CONFIG_SND_SOC_AMD_ACP=m
-CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
-CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-# CONFIG_SND_ATMEL_SOC is not set
-CONFIG_SND_BCM2835_SOC_I2S=m
-CONFIG_SND_BCM63XX_I2S_WHISTLER=m
-CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=y
-
-#
-# SoC Audio for Freescale CPUs
-#
-
-#
-# Common SoC Audio options for Freescale CPUs:
-#
-CONFIG_SND_SOC_FSL_ASRC=m
-CONFIG_SND_SOC_FSL_SAI=m
-CONFIG_SND_SOC_FSL_MQS=m
-CONFIG_SND_SOC_FSL_AUDMIX=m
-CONFIG_SND_SOC_FSL_SSI=m
-CONFIG_SND_SOC_FSL_SPDIF=m
-CONFIG_SND_SOC_FSL_ESAI=m
-CONFIG_SND_SOC_FSL_MICFIL=m
-CONFIG_SND_SOC_FSL_EASRC=m
-CONFIG_SND_SOC_IMX_PCM_DMA=m
-CONFIG_SND_SOC_IMX_AUDMUX=m
-CONFIG_SND_IMX_SOC=m
-
-#
-# SoC Audio support for Freescale i.MX boards:
-#
-CONFIG_SND_SOC_IMX_ES8328=m
-CONFIG_SND_SOC_IMX_SGTL5000=m
-CONFIG_SND_SOC_IMX_SPDIF=m
-CONFIG_SND_SOC_FSL_ASOC_CARD=m
-CONFIG_SND_SOC_IMX_AUDMIX=m
-# end of SoC Audio for Freescale CPUs
-
-CONFIG_SND_I2S_HI6210_I2S=m
-CONFIG_SND_KIRKWOOD_SOC=m
-CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
-# CONFIG_SND_SOC_IMG is not set
-# CONFIG_SND_SOC_INTEL_KEEMBAY is not set
-CONFIG_SND_SOC_MEDIATEK=m
-# CONFIG_SND_SOC_MT2701 is not set
-CONFIG_SND_SOC_MT6797=m
-CONFIG_SND_SOC_MT6797_MT6351=m
-# CONFIG_SND_SOC_MT8173 is not set
-CONFIG_SND_SOC_MT8183=m
-CONFIG_SND_SOC_MT8183_MT6358_TS3A227E_MAX98357A=m
-CONFIG_SND_SOC_MT8183_DA7219_MAX98357A=m
-CONFIG_SND_SOC_MTK_BTCVSD=m
-
-#
-# ASoC support for Amlogic platforms
-#
-CONFIG_SND_MESON_AIU=m
-CONFIG_SND_MESON_AXG_FIFO=m
-CONFIG_SND_MESON_AXG_FRDDR=m
-CONFIG_SND_MESON_AXG_TODDR=m
-CONFIG_SND_MESON_AXG_TDM_FORMATTER=m
-CONFIG_SND_MESON_AXG_TDM_INTERFACE=m
-CONFIG_SND_MESON_AXG_TDMIN=m
-CONFIG_SND_MESON_AXG_TDMOUT=m
-CONFIG_SND_MESON_AXG_SOUND_CARD=m
-CONFIG_SND_MESON_AXG_SPDIFOUT=m
-CONFIG_SND_MESON_AXG_SPDIFIN=m
-CONFIG_SND_MESON_AXG_PDM=m
-CONFIG_SND_MESON_CARD_UTILS=m
-CONFIG_SND_MESON_CODEC_GLUE=m
-CONFIG_SND_MESON_GX_SOUND_CARD=m
-CONFIG_SND_MESON_G12A_TOACODEC=m
-CONFIG_SND_MESON_G12A_TOHDMITX=m
-CONFIG_SND_SOC_MESON_T9015=m
-# end of ASoC support for Amlogic platforms
-
-CONFIG_SND_SOC_QCOM=m
-CONFIG_SND_SOC_LPASS_CPU=m
-CONFIG_SND_SOC_LPASS_PLATFORM=m
-CONFIG_SND_SOC_LPASS_IPQ806X=m
-CONFIG_SND_SOC_LPASS_APQ8016=m
-CONFIG_SND_SOC_STORM=m
-CONFIG_SND_SOC_APQ8016_SBC=m
-CONFIG_SND_SOC_QCOM_COMMON=m
-CONFIG_SND_SOC_QDSP6_COMMON=m
-CONFIG_SND_SOC_QDSP6_CORE=m
-CONFIG_SND_SOC_QDSP6_AFE=m
-CONFIG_SND_SOC_QDSP6_AFE_DAI=m
-CONFIG_SND_SOC_QDSP6_ADM=m
-CONFIG_SND_SOC_QDSP6_ROUTING=m
-CONFIG_SND_SOC_QDSP6_ASM=m
-CONFIG_SND_SOC_QDSP6_ASM_DAI=m
-CONFIG_SND_SOC_QDSP6=m
-CONFIG_SND_SOC_MSM8996=m
-CONFIG_SND_SOC_SDM845=m
-CONFIG_SND_SOC_ROCKCHIP=m
-CONFIG_SND_SOC_ROCKCHIP_I2S=m
-CONFIG_SND_SOC_ROCKCHIP_PDM=m
-CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
-CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
-CONFIG_SND_SOC_ROCKCHIP_RT5645=m
-CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m
-CONFIG_SND_SOC_RK3399_GRU_SOUND=m
-CONFIG_SND_SOC_SAMSUNG=m
-CONFIG_SND_SAMSUNG_PCM=m
-CONFIG_SND_SAMSUNG_SPDIF=m
-CONFIG_SND_SAMSUNG_I2S=m
-CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
-CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
-CONFIG_SND_SOC_SMDK_WM8994_PCM=m
-CONFIG_SND_SOC_SNOW=m
-# CONFIG_SND_SOC_ODROID is not set
-# CONFIG_SND_SOC_ARNDALE is not set
-CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994=m
-CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
-CONFIG_SND_SOC_SOF_TOPLEVEL=y
-CONFIG_SND_SOC_SOF_PCI=m
-CONFIG_SND_SOC_SOF_ACPI=m
-CONFIG_SND_SOC_SOF_OF=m
-# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set
-# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set
-CONFIG_SND_SOC_SOF=m
-CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y
-CONFIG_SND_SOC_SOF_IMX_OF=m
-CONFIG_SND_SOC_SOF_IMX8_SUPPORT=y
-CONFIG_SND_SOC_SOF_IMX8=m
-CONFIG_SND_SOC_SOF_IMX8M_SUPPORT=y
-CONFIG_SND_SOC_SOF_IMX8M=m
-CONFIG_SND_SOC_SPRD=m
-CONFIG_SND_SOC_SPRD_MCDT=m
-
-#
-# STMicroelectronics STM32 SOC audio support
-#
-# end of STMicroelectronics STM32 SOC audio support
-
-#
-# Allwinner SoC Audio support
-#
-CONFIG_SND_SUN4I_CODEC=m
-CONFIG_SND_SUN8I_CODEC=m
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
-CONFIG_SND_SUN50I_CODEC_ANALOG=m
-CONFIG_SND_SUN4I_I2S=m
-CONFIG_SND_SUN4I_SPDIF=m
-CONFIG_SND_SUN8I_ADDA_PR_REGMAP=m
-# end of Allwinner SoC Audio support
-
-CONFIG_SND_SOC_XILINX_I2S=m
-CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
-CONFIG_SND_SOC_XILINX_SPDIF=m
-CONFIG_SND_SOC_XTFPGA_I2S=m
-# CONFIG_ZX_SPDIF is not set
-# CONFIG_ZX_I2S is not set
-CONFIG_ZX_TDM=m
-CONFIG_SND_SOC_I2C_AND_SPI=m
-
-#
-# CODEC drivers
-#
-CONFIG_SND_SOC_WM_HUBS=m
-CONFIG_SND_SOC_AC97_CODEC=m
-CONFIG_SND_SOC_ADAU_UTILS=m
-CONFIG_SND_SOC_ADAU1701=m
-CONFIG_SND_SOC_ADAU17X1=m
-CONFIG_SND_SOC_ADAU1761=m
-CONFIG_SND_SOC_ADAU1761_I2C=m
-CONFIG_SND_SOC_ADAU1761_SPI=m
-CONFIG_SND_SOC_ADAU7002=m
-CONFIG_SND_SOC_ADAU7118=m
-CONFIG_SND_SOC_ADAU7118_HW=m
-CONFIG_SND_SOC_ADAU7118_I2C=m
-CONFIG_SND_SOC_AK4104=m
-CONFIG_SND_SOC_AK4118=m
-CONFIG_SND_SOC_AK4458=m
-CONFIG_SND_SOC_AK4554=m
-CONFIG_SND_SOC_AK4613=m
-CONFIG_SND_SOC_AK4642=m
-CONFIG_SND_SOC_AK5386=m
-CONFIG_SND_SOC_AK5558=m
-CONFIG_SND_SOC_ALC5623=m
-CONFIG_SND_SOC_BD28623=m
-CONFIG_SND_SOC_BT_SCO=m
-CONFIG_SND_SOC_CPCAP=m
-CONFIG_SND_SOC_CROS_EC_CODEC=m
-CONFIG_SND_SOC_CS35L32=m
-CONFIG_SND_SOC_CS35L33=m
-CONFIG_SND_SOC_CS35L34=m
-CONFIG_SND_SOC_CS35L35=m
-CONFIG_SND_SOC_CS35L36=m
-CONFIG_SND_SOC_CS42L42=m
-CONFIG_SND_SOC_CS42L51=m
-CONFIG_SND_SOC_CS42L51_I2C=m
-CONFIG_SND_SOC_CS42L52=m
-CONFIG_SND_SOC_CS42L56=m
-CONFIG_SND_SOC_CS42L73=m
-CONFIG_SND_SOC_CS4265=m
-CONFIG_SND_SOC_CS4270=m
-CONFIG_SND_SOC_CS4271=m
-CONFIG_SND_SOC_CS4271_I2C=m
-CONFIG_SND_SOC_CS4271_SPI=m
-CONFIG_SND_SOC_CS42XX8=m
-CONFIG_SND_SOC_CS42XX8_I2C=m
-CONFIG_SND_SOC_CS43130=m
-CONFIG_SND_SOC_CS4341=m
-CONFIG_SND_SOC_CS4349=m
-CONFIG_SND_SOC_CS53L30=m
-CONFIG_SND_SOC_CX2072X=m
-CONFIG_SND_SOC_DA7213=m
-CONFIG_SND_SOC_DA7219=m
-CONFIG_SND_SOC_DMIC=m
-CONFIG_SND_SOC_HDMI_CODEC=m
-CONFIG_SND_SOC_ES7134=m
-CONFIG_SND_SOC_ES7241=m
-CONFIG_SND_SOC_ES8316=m
-CONFIG_SND_SOC_ES8328=m
-CONFIG_SND_SOC_ES8328_I2C=m
-CONFIG_SND_SOC_ES8328_SPI=m
-CONFIG_SND_SOC_GTM601=m
-# CONFIG_SND_SOC_INNO_RK3036 is not set
-CONFIG_SND_SOC_LOCHNAGAR_SC=m
-CONFIG_SND_SOC_MAX98088=m
-CONFIG_SND_SOC_MAX98090=m
-CONFIG_SND_SOC_MAX98095=m
-CONFIG_SND_SOC_MAX98357A=m
-CONFIG_SND_SOC_MAX98504=m
-CONFIG_SND_SOC_MAX9867=m
-CONFIG_SND_SOC_MAX98927=m
-CONFIG_SND_SOC_MAX98373=m
-CONFIG_SND_SOC_MAX98373_I2C=m
-CONFIG_SND_SOC_MAX98373_SDW=m
-CONFIG_SND_SOC_MAX98390=m
-CONFIG_SND_SOC_MAX9860=m
-# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
-# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
-CONFIG_SND_SOC_PCM1681=m
-CONFIG_SND_SOC_PCM1789=m
-CONFIG_SND_SOC_PCM1789_I2C=m
-CONFIG_SND_SOC_PCM179X=m
-CONFIG_SND_SOC_PCM179X_I2C=m
-CONFIG_SND_SOC_PCM179X_SPI=m
-CONFIG_SND_SOC_PCM186X=m
-CONFIG_SND_SOC_PCM186X_I2C=m
-CONFIG_SND_SOC_PCM186X_SPI=m
-CONFIG_SND_SOC_PCM3060=m
-CONFIG_SND_SOC_PCM3060_I2C=m
-CONFIG_SND_SOC_PCM3060_SPI=m
-# CONFIG_SND_SOC_PCM3168A_I2C is not set
-# CONFIG_SND_SOC_PCM3168A_SPI is not set
-CONFIG_SND_SOC_PCM512x=m
-CONFIG_SND_SOC_PCM512x_I2C=m
-CONFIG_SND_SOC_PCM512x_SPI=m
-CONFIG_SND_SOC_RK3328=m
-CONFIG_SND_SOC_RL6231=m
-CONFIG_SND_SOC_RT1015=m
-CONFIG_SND_SOC_RT1308_SDW=m
-CONFIG_SND_SOC_RT5514=m
-CONFIG_SND_SOC_RT5514_SPI=m
-CONFIG_SND_SOC_RT5616=m
-CONFIG_SND_SOC_RT5631=m
-CONFIG_SND_SOC_RT5645=m
-CONFIG_SND_SOC_RT5663=m
-CONFIG_SND_SOC_RT5682=m
-CONFIG_SND_SOC_RT5682_SDW=m
-CONFIG_SND_SOC_RT700=m
-CONFIG_SND_SOC_RT700_SDW=m
-CONFIG_SND_SOC_RT711=m
-CONFIG_SND_SOC_RT711_SDW=m
-CONFIG_SND_SOC_RT715=m
-CONFIG_SND_SOC_RT715_SDW=m
-CONFIG_SND_SOC_SGTL5000=m
-CONFIG_SND_SOC_SIGMADSP=m
-CONFIG_SND_SOC_SIGMADSP_I2C=m
-CONFIG_SND_SOC_SIGMADSP_REGMAP=m
-CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
-CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m
-CONFIG_SND_SOC_SPDIF=m
-CONFIG_SND_SOC_SSM2305=m
-CONFIG_SND_SOC_SSM2602=m
-CONFIG_SND_SOC_SSM2602_SPI=m
-CONFIG_SND_SOC_SSM2602_I2C=m
-CONFIG_SND_SOC_SSM4567=m
-CONFIG_SND_SOC_STA32X=m
-CONFIG_SND_SOC_STA350=m
-CONFIG_SND_SOC_STI_SAS=m
-CONFIG_SND_SOC_TAS2552=m
-CONFIG_SND_SOC_TAS2562=m
-CONFIG_SND_SOC_TAS2770=m
-CONFIG_SND_SOC_TAS5086=m
-CONFIG_SND_SOC_TAS571X=m
-CONFIG_SND_SOC_TAS5720=m
-CONFIG_SND_SOC_TAS6424=m
-CONFIG_SND_SOC_TDA7419=m
-CONFIG_SND_SOC_TFA9879=m
-CONFIG_SND_SOC_TLV320AIC23=m
-CONFIG_SND_SOC_TLV320AIC23_I2C=m
-CONFIG_SND_SOC_TLV320AIC23_SPI=m
-CONFIG_SND_SOC_TLV320AIC31XX=m
-CONFIG_SND_SOC_TLV320AIC32X4=m
-CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
-CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
-CONFIG_SND_SOC_TLV320AIC3X=m
-CONFIG_SND_SOC_TLV320ADCX140=m
-CONFIG_SND_SOC_TS3A227E=m
-CONFIG_SND_SOC_TSCS42XX=m
-CONFIG_SND_SOC_TSCS454=m
-CONFIG_SND_SOC_UDA1334=m
-CONFIG_SND_SOC_WM8510=m
-CONFIG_SND_SOC_WM8523=m
-CONFIG_SND_SOC_WM8524=m
-CONFIG_SND_SOC_WM8580=m
-CONFIG_SND_SOC_WM8711=m
-CONFIG_SND_SOC_WM8728=m
-CONFIG_SND_SOC_WM8731=m
-CONFIG_SND_SOC_WM8737=m
-CONFIG_SND_SOC_WM8741=m
-CONFIG_SND_SOC_WM8750=m
-CONFIG_SND_SOC_WM8753=m
-CONFIG_SND_SOC_WM8770=m
-CONFIG_SND_SOC_WM8776=m
-CONFIG_SND_SOC_WM8782=m
-CONFIG_SND_SOC_WM8804=m
-CONFIG_SND_SOC_WM8804_I2C=m
-CONFIG_SND_SOC_WM8804_SPI=m
-CONFIG_SND_SOC_WM8903=m
-CONFIG_SND_SOC_WM8904=m
-CONFIG_SND_SOC_WM8960=m
-CONFIG_SND_SOC_WM8962=m
-CONFIG_SND_SOC_WM8974=m
-CONFIG_SND_SOC_WM8978=m
-CONFIG_SND_SOC_WM8985=m
-CONFIG_SND_SOC_WM8994=m
-CONFIG_SND_SOC_WSA881X=m
-CONFIG_SND_SOC_ZL38060=m
-CONFIG_SND_SOC_ZX_AUD96P22=m
-CONFIG_SND_SOC_MAX9759=m
-CONFIG_SND_SOC_MT6351=m
-CONFIG_SND_SOC_MT6358=m
-CONFIG_SND_SOC_MT6660=m
-CONFIG_SND_SOC_NAU8540=m
-CONFIG_SND_SOC_NAU8810=m
-CONFIG_SND_SOC_NAU8822=m
-CONFIG_SND_SOC_NAU8824=m
-CONFIG_SND_SOC_TPA6130A2=m
-# end of CODEC drivers
-
-CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_CARD=m
-CONFIG_SND_AUDIO_GRAPH_CARD=m
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=y
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACCUTOUCH=m
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_APPLEIR=m
-CONFIG_HID_ASUS=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_BETOP_FF=m
-CONFIG_HID_BIGBEN_FF=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CORSAIR=m
-CONFIG_HID_COUGAR=m
-CONFIG_HID_MACALLY=m
-CONFIG_HID_PRODIKEYS=m
-# CONFIG_HID_CMEDIA is not set
-CONFIG_HID_CP2112=m
-CONFIG_HID_CREATIVE_SB0540=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELAN=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_GEMBIRD=m
-CONFIG_HID_GFRM=m
-CONFIG_HID_GLORIOUS=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HID_GOOGLE_HAMMER=m
-CONFIG_HID_GT683R=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_VIEWSONIC=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_ITE=m
-CONFIG_HID_JABRA=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LED=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MALTRON=m
-CONFIG_HID_MAYFLASH=m
-CONFIG_HID_REDRAGON=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTI=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PLANTRONICS=m
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_RETRODE=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_SONY_FF=y
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEAM=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_UDRAW_PS3=m
-CONFIG_HID_U2FZERO=m
-CONFIG_HID_WACOM=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-CONFIG_HID_ALPS=m
-CONFIG_HID_MCP2221=m
-# end of Special HID drivers
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# end of USB HID Boot Protocol drivers
-# end of USB HID support
-
-#
-# I2C HID support
-#
-CONFIG_I2C_HID=m
-# end of I2C HID support
-# end of HID support
-
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_LED_TRIG=y
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_CONN_GPIO=m
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-CONFIG_USB_PCI=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_PRODUCTLIST is not set
-# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
-CONFIG_USB_OTG_FSM=m
-CONFIG_USB_LEDS_TRIGGER_USBPORT=m
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=m
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PCI_RENESAS=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_XHCI_HISTB=m
-CONFIG_USB_XHCI_MTK=m
-CONFIG_USB_XHCI_MVEBU=m
-CONFIG_USB_XHCI_TEGRA=m
-CONFIG_USB_EHCI_BRCMSTB=m
-CONFIG_USB_BRCMSTB=m
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=m
-CONFIG_USB_EHCI_FSL=m
-CONFIG_USB_EHCI_MXC=m
-CONFIG_USB_EHCI_HCD_ORION=m
-CONFIG_USB_EHCI_TEGRA=m
-CONFIG_USB_EHCI_EXYNOS=m
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_FOTG210_HCD=m
-CONFIG_USB_MAX3421_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_SSB=y
-CONFIG_USB_OHCI_EXYNOS=m
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_HCD_BCMA=m
-CONFIG_USB_HCD_SSB=m
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_VHCI_HC_PORTS=8
-CONFIG_USBIP_VHCI_NR_HCS=1
-CONFIG_USBIP_HOST=m
-CONFIG_USBIP_VUDC=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_USB_CDNS3=m
-CONFIG_USB_CDNS3_GADGET=y
-CONFIG_USB_CDNS3_HOST=y
-CONFIG_USB_CDNS3_PCI_WRAP=m
-CONFIG_USB_CDNS3_IMX=m
-CONFIG_USB_MTU3=m
-CONFIG_USB_MTU3_HOST=y
-# CONFIG_USB_MTU3_GADGET is not set
-# CONFIG_USB_MTU3_DUAL_ROLE is not set
-# CONFIG_USB_MTU3_DEBUG is not set
-CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_MUSB_HOST=y
-# CONFIG_USB_MUSB_GADGET is not set
-# CONFIG_USB_MUSB_DUAL_ROLE is not set
-
-#
-# Platform Glue Layer
-#
-CONFIG_USB_MUSB_SUNXI=m
-CONFIG_USB_MUSB_MEDIATEK=m
-
-#
-# MUSB DMA mode
-#
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_DWC3=m
-CONFIG_USB_DWC3_ULPI=y
-# CONFIG_USB_DWC3_HOST is not set
-# CONFIG_USB_DWC3_GADGET is not set
-CONFIG_USB_DWC3_DUAL_ROLE=y
-
-#
-# Platform Glue Driver Support
-#
-CONFIG_USB_DWC3_EXYNOS=m
-CONFIG_USB_DWC3_PCI=m
-CONFIG_USB_DWC3_HAPS=m
-CONFIG_USB_DWC3_MESON_G12A=m
-CONFIG_USB_DWC3_OF_SIMPLE=m
-CONFIG_USB_DWC3_QCOM=m
-CONFIG_USB_DWC2=m
-# CONFIG_USB_DWC2_HOST is not set
-
-#
-# Gadget/Dual-role mode requires USB Gadget support to be enabled
-#
-# CONFIG_USB_DWC2_PERIPHERAL is not set
-CONFIG_USB_DWC2_DUAL_ROLE=y
-CONFIG_USB_DWC2_PCI=m
-# CONFIG_USB_DWC2_DEBUG is not set
-# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
-# CONFIG_USB_CHIPIDEA is not set
-CONFIG_USB_ISP1760=m
-CONFIG_USB_ISP1760_HCD=y
-CONFIG_USB_ISP1760_HOST_ROLE=y
-# CONFIG_USB_ISP1760_GADGET_ROLE is not set
-# CONFIG_USB_ISP1760_DUAL_ROLE is not set
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_F8153X=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MXUPORT=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_UPD78F0730=m
-CONFIG_USB_SERIAL_DEBUG=m
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_APPLE_MFI_FASTCHARGE=m
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-# CONFIG_USB_TEST is not set
-CONFIG_USB_EHSET_TEST_FIXTURE=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_HSIC_USB4604=m
-CONFIG_USB_LINK_LAYER_TEST=m
-# CONFIG_USB_CHAOSKEY is not set
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-
-#
-# USB Physical Layer drivers
-#
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=m
-# CONFIG_USB_GPIO_VBUS is not set
-CONFIG_USB_ISP1301=m
-CONFIG_USB_MXS_PHY=m
-CONFIG_USB_TEGRA_PHY=m
-CONFIG_USB_ULPI=y
-CONFIG_USB_ULPI_VIEWPORT=y
-# end of USB Physical Layer drivers
-
-CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_U_SERIAL_CONSOLE=y
-
-#
-# USB Peripheral Controller
-#
-CONFIG_USB_FSL_USB2=m
-# CONFIG_USB_FOTG210_UDC is not set
-# CONFIG_USB_GR_UDC is not set
-# CONFIG_USB_R8A66597 is not set
-# CONFIG_USB_PXA27X is not set
-# CONFIG_USB_MV_UDC is not set
-# CONFIG_USB_MV_U3D is not set
-CONFIG_USB_SNP_CORE=m
-CONFIG_USB_SNP_UDC_PLAT=m
-# CONFIG_USB_M66592 is not set
-CONFIG_USB_BDC_UDC=m
-
-#
-# Platform Support
-#
-CONFIG_USB_BDC_PCI=m
-# CONFIG_USB_AMD5536UDC is not set
-# CONFIG_USB_NET2272 is not set
-# CONFIG_USB_NET2280 is not set
-# CONFIG_USB_GOKU is not set
-# CONFIG_USB_EG20T is not set
-CONFIG_USB_GADGET_XILINX=m
-CONFIG_USB_MAX3420_UDC=m
-CONFIG_USB_TEGRA_XUDC=m
-# CONFIG_USB_DUMMY_HCD is not set
-# end of USB Peripheral Controller
-
-CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_F_ACM=m
-CONFIG_USB_F_SS_LB=m
-CONFIG_USB_U_SERIAL=m
-CONFIG_USB_U_ETHER=m
-CONFIG_USB_U_AUDIO=m
-CONFIG_USB_F_SERIAL=m
-CONFIG_USB_F_OBEX=m
-CONFIG_USB_F_NCM=m
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_PHONET=m
-CONFIG_USB_F_EEM=m
-CONFIG_USB_F_SUBSET=m
-CONFIG_USB_F_RNDIS=m
-CONFIG_USB_F_MASS_STORAGE=m
-CONFIG_USB_F_FS=m
-CONFIG_USB_F_UAC1=m
-CONFIG_USB_F_UAC2=m
-CONFIG_USB_F_UVC=m
-CONFIG_USB_F_MIDI=m
-CONFIG_USB_F_HID=m
-CONFIG_USB_F_PRINTER=m
-CONFIG_USB_F_TCM=m
-CONFIG_USB_CONFIGFS=m
-CONFIG_USB_CONFIGFS_SERIAL=y
-CONFIG_USB_CONFIGFS_ACM=y
-CONFIG_USB_CONFIGFS_OBEX=y
-CONFIG_USB_CONFIGFS_NCM=y
-CONFIG_USB_CONFIGFS_ECM=y
-CONFIG_USB_CONFIGFS_ECM_SUBSET=y
-CONFIG_USB_CONFIGFS_RNDIS=y
-CONFIG_USB_CONFIGFS_EEM=y
-CONFIG_USB_CONFIGFS_PHONET=y
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-CONFIG_USB_CONFIGFS_F_LB_SS=y
-CONFIG_USB_CONFIGFS_F_FS=y
-CONFIG_USB_CONFIGFS_F_UAC1=y
-# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
-CONFIG_USB_CONFIGFS_F_UAC2=y
-CONFIG_USB_CONFIGFS_F_MIDI=y
-CONFIG_USB_CONFIGFS_F_HID=y
-CONFIG_USB_CONFIGFS_F_UVC=y
-CONFIG_USB_CONFIGFS_F_PRINTER=y
-CONFIG_USB_CONFIGFS_F_TCM=y
-
-#
-# USB Gadget precomposed configurations
-#
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-# CONFIG_GADGET_UAC1 is not set
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_ETH_EEM=y
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FUNCTIONFS=m
-CONFIG_USB_FUNCTIONFS_ETH=y
-CONFIG_USB_FUNCTIONFS_RNDIS=y
-CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_GADGET_TARGET=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MIDI_GADGET=m
-CONFIG_USB_G_PRINTER=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_USB_G_NOKIA=m
-CONFIG_USB_G_ACM_MS=m
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_MULTI_RNDIS=y
-CONFIG_USB_G_MULTI_CDC=y
-CONFIG_USB_G_HID=m
-CONFIG_USB_G_DBGP=m
-# CONFIG_USB_G_DBGP_PRINTK is not set
-CONFIG_USB_G_DBGP_SERIAL=y
-CONFIG_USB_G_WEBCAM=m
-CONFIG_USB_RAW_GADGET=m
-# end of USB Gadget precomposed configurations
-
-CONFIG_TYPEC=m
-CONFIG_TYPEC_TCPM=m
-CONFIG_TYPEC_TCPCI=m
-CONFIG_TYPEC_RT1711H=m
-CONFIG_TYPEC_FUSB302=m
-CONFIG_TYPEC_UCSI=m
-CONFIG_UCSI_CCG=m
-CONFIG_UCSI_ACPI=m
-CONFIG_TYPEC_HD3SS3220=m
-CONFIG_TYPEC_TPS6598X=m
-
-#
-# USB Type-C Multiplexer/DeMultiplexer Switch support
-#
-CONFIG_TYPEC_MUX_PI3USB30532=m
-# end of USB Type-C Multiplexer/DeMultiplexer Switch support
-
-#
-# USB Type-C Alternate Mode drivers
-#
-CONFIG_TYPEC_DP_ALTMODE=m
-CONFIG_TYPEC_NVIDIA_ALTMODE=m
-# end of USB Type-C Alternate Mode drivers
-
-CONFIG_USB_ROLE_SWITCH=m
-CONFIG_MMC=m
-CONFIG_PWRSEQ_EMMC=m
-CONFIG_PWRSEQ_SD8787=m
-CONFIG_PWRSEQ_SIMPLE=m
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_ARMMMCI=m
-CONFIG_MMC_QCOM_DML=y
-CONFIG_MMC_STM32_SDMMC=y
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_SDHCI_OF_ARASAN=m
-# CONFIG_MMC_SDHCI_OF_ASPEED is not set
-# CONFIG_MMC_SDHCI_OF_AT91 is not set
-CONFIG_MMC_SDHCI_OF_ESDHC=m
-CONFIG_MMC_SDHCI_OF_DWCMSHC=m
-CONFIG_MMC_SDHCI_CADENCE=m
-CONFIG_MMC_SDHCI_ESDHC_IMX=m
-CONFIG_MMC_SDHCI_TEGRA=m
-CONFIG_MMC_SDHCI_PXAV3=m
-CONFIG_MMC_SDHCI_F_SDH30=m
-# CONFIG_MMC_SDHCI_MILBEAUT is not set
-CONFIG_MMC_SDHCI_IPROC=m
-CONFIG_MMC_MESON_GX=m
-# CONFIG_MMC_MESON_MX_SDIO is not set
-CONFIG_MMC_ALCOR=m
-CONFIG_MMC_SDHCI_MSM=m
-# CONFIG_MMC_MXC is not set
-CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_SPI is not set
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_SDHCI_SPRD=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_CAVIUM_THUNDERX=m
-CONFIG_MMC_DW=m
-CONFIG_MMC_DW_PLTFM=m
-CONFIG_MMC_DW_BLUEFIELD=m
-CONFIG_MMC_DW_EXYNOS=m
-CONFIG_MMC_DW_HI3798CV200=m
-CONFIG_MMC_DW_K3=m
-CONFIG_MMC_DW_PCI=m
-CONFIG_MMC_DW_ROCKCHIP=m
-CONFIG_MMC_DW_ZX=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-CONFIG_MMC_USDHI6ROL0=m
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_SUNXI=m
-CONFIG_MMC_CQHCI=m
-CONFIG_MMC_HSQ=m
-CONFIG_MMC_TOSHIBA_PCI=m
-CONFIG_MMC_BCM2835=m
-CONFIG_MMC_MTK=m
-CONFIG_MMC_SDHCI_BRCMSTB=m
-CONFIG_MMC_SDHCI_XENON=m
-# CONFIG_MMC_SDHCI_OMAP is not set
-CONFIG_MMC_SDHCI_AM654=m
-CONFIG_MMC_OWL=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-CONFIG_MS_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_CLASS_FLASH=m
-CONFIG_LEDS_CLASS_MULTICOLOR=m
-CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
-
-#
-# LED drivers
-#
-# CONFIG_LEDS_AAT1290 is not set
-CONFIG_LEDS_AN30259A=m
-CONFIG_LEDS_AS3645A=m
-CONFIG_LEDS_AW2013=m
-# CONFIG_LEDS_BCM6328 is not set
-# CONFIG_LEDS_BCM6358 is not set
-CONFIG_LEDS_CPCAP=m
-CONFIG_LEDS_CR0014114=m
-CONFIG_LEDS_EL15203000=m
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM3532=m
-CONFIG_LEDS_LM3533=m
-CONFIG_LEDS_LM3642=m
-CONFIG_LEDS_LM3692X=m
-CONFIG_LEDS_LM3601X=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA9532_GPIO=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP3952=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-CONFIG_LEDS_LP8501=m
-CONFIG_LEDS_LP8860=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA955X_GPIO=y
-CONFIG_LEDS_PCA963X=m
-# CONFIG_LEDS_DAC124S085 is not set
-CONFIG_LEDS_PWM=m
-# CONFIG_LEDS_REGULATOR is not set
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_TCA6507=m
-# CONFIG_LEDS_TLC591XX is not set
-CONFIG_LEDS_MAX77650=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_MENF21BMC=m
-# CONFIG_LEDS_KTD2692 is not set
-CONFIG_LEDS_IS31FL319X=m
-CONFIG_LEDS_IS31FL32XX=m
-CONFIG_LEDS_SC27XX_BLTC=m
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_MLXREG=m
-CONFIG_LEDS_USER=m
-CONFIG_LEDS_SPI_BYTE=m
-CONFIG_LEDS_TI_LMU_COMMON=m
-CONFIG_LEDS_LM3697=m
-CONFIG_LEDS_LM36274=m
-CONFIG_LEDS_SGM3140=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_DISK=y
-CONFIG_LEDS_TRIGGER_MTD=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_ACTIVITY=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_PANIC=y
-CONFIG_LEDS_TRIGGER_NETDEV=m
-CONFIG_LEDS_TRIGGER_PATTERN=m
-CONFIG_LEDS_TRIGGER_AUDIO=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-# end of Speakup console speech
-
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_CXGB4=m
-CONFIG_INFINIBAND_EFA=m
-CONFIG_INFINIBAND_I40IW=m
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_OCRDMA=m
-# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
-CONFIG_INFINIBAND_HNS=m
-CONFIG_INFINIBAND_HNS_HIP06=y
-CONFIG_INFINIBAND_HNS_HIP08=y
-CONFIG_INFINIBAND_BNXT_RE=m
-CONFIG_INFINIBAND_QEDR=m
-CONFIG_RDMA_RXE=m
-CONFIG_RDMA_SIW=m
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SRPT=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_ISERT=m
-CONFIG_INFINIBAND_RTRS=m
-CONFIG_INFINIBAND_RTRS_CLIENT=m
-CONFIG_INFINIBAND_RTRS_SERVER=m
-CONFIG_EDAC_SUPPORT=y
-CONFIG_EDAC=y
-CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_DEBUG=y
-CONFIG_EDAC_GHES=y
-CONFIG_EDAC_LAYERSCAPE=m
-CONFIG_EDAC_THUNDERX=m
-CONFIG_EDAC_ALTERA=y
-CONFIG_EDAC_ALTERA_SDRAM=y
-CONFIG_EDAC_ALTERA_OCRAM=y
-CONFIG_EDAC_ALTERA_ETHERNET=y
-CONFIG_EDAC_ALTERA_NAND=y
-CONFIG_EDAC_ALTERA_USB=y
-CONFIG_EDAC_ALTERA_QSPI=y
-CONFIG_EDAC_ALTERA_SDMMC=y
-CONFIG_EDAC_SYNOPSYS=m
-CONFIG_EDAC_XGENE=m
-CONFIG_EDAC_QCOM=m
-CONFIG_EDAC_BLUEFIELD=m
-CONFIG_EDAC_DMC520=m
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_NVMEM=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-# CONFIG_RTC_DRV_TEST is not set
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_ABB5ZES3=m
-CONFIG_RTC_DRV_ABEOZ9=m
-CONFIG_RTC_DRV_ABX80X=m
-CONFIG_RTC_DRV_AC100=m
-CONFIG_RTC_DRV_BRCMSTB=m
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1307_CENTURY=y
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1374_WDT=y
-CONFIG_RTC_DRV_DS1672=m
-# CONFIG_RTC_DRV_HYM8563 is not set
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_MAX77686=m
-CONFIG_RTC_DRV_RK808=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-# CONFIG_RTC_DRV_ISL12022 is not set
-CONFIG_RTC_DRV_ISL12026=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF85063=m
-CONFIG_RTC_DRV_PCF85363=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BD70528=m
-# CONFIG_RTC_DRV_BQ32K is not set
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8010=m
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_EM3027 is not set
-CONFIG_RTC_DRV_RV3028=m
-CONFIG_RTC_DRV_RV8803=y
-CONFIG_RTC_DRV_SD3078=m
-
-#
-# SPI RTC drivers
-#
-# CONFIG_RTC_DRV_M41T93 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_DS1302 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1343 is not set
-# CONFIG_RTC_DRV_DS1347 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-CONFIG_RTC_DRV_MAX6916=m
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RX4581 is not set
-# CONFIG_RTC_DRV_RX6110 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_PCF2123 is not set
-# CONFIG_RTC_DRV_MCP795 is not set
-CONFIG_RTC_I2C_AND_SPI=y
-
-#
-# SPI and I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_DS3232_HWMON=y
-CONFIG_RTC_DRV_PCF2127=m
-# CONFIG_RTC_DRV_RV3029C2 is not set
-
-#
-# Platform RTC drivers
-#
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-CONFIG_RTC_DRV_DS1685_FAMILY=m
-CONFIG_RTC_DRV_DS1685=y
-# CONFIG_RTC_DRV_DS1689 is not set
-# CONFIG_RTC_DRV_DS17285 is not set
-# CONFIG_RTC_DRV_DS17485 is not set
-# CONFIG_RTC_DRV_DS17885 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS2404 is not set
-CONFIG_RTC_DRV_EFI=y
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_V3020 is not set
-CONFIG_RTC_DRV_SC27XX=m
-CONFIG_RTC_DRV_ZYNQMP=y
-CONFIG_RTC_DRV_CROS_EC=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_IMXDI=m
-CONFIG_RTC_DRV_FSL_FTM_ALARM=m
-CONFIG_RTC_DRV_MESON_VRTC=m
-CONFIG_HAVE_S3C_RTC=y
-CONFIG_RTC_DRV_S3C=m
-CONFIG_RTC_DRV_PL030=y
-CONFIG_RTC_DRV_PL031=y
-CONFIG_RTC_DRV_SUN6I=y
-CONFIG_RTC_DRV_MV=y
-CONFIG_RTC_DRV_ARMADA38X=m
-CONFIG_RTC_DRV_CADENCE=m
-CONFIG_RTC_DRV_FTRTC010=m
-CONFIG_RTC_DRV_PM8XXX=m
-CONFIG_RTC_DRV_TEGRA=m
-CONFIG_RTC_DRV_MXC=m
-CONFIG_RTC_DRV_MXC_V2=m
-# CONFIG_RTC_DRV_SNVS is not set
-CONFIG_RTC_DRV_IMX_SC=y
-CONFIG_RTC_DRV_MT2712=y
-CONFIG_RTC_DRV_MT7622=m
-CONFIG_RTC_DRV_XGENE=y
-CONFIG_RTC_DRV_R7301=m
-CONFIG_RTC_DRV_CPCAP=m
-CONFIG_RTC_DRV_RTD119X=y
-
-#
-# HID Sensor RTC drivers
-#
-CONFIG_RTC_DRV_HID_SENSOR_TIME=m
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_VIRTUAL_CHANNELS=y
-CONFIG_DMA_ACPI=y
-CONFIG_DMA_OF=y
-CONFIG_ALTERA_MSGDMA=m
-# CONFIG_AMBA_PL08X is not set
-CONFIG_AXI_DMAC=m
-CONFIG_BCM_SBA_RAID=m
-CONFIG_DMA_BCM2835=m
-CONFIG_DMA_SUN6I=m
-CONFIG_DW_AXI_DMAC=m
-CONFIG_FSL_EDMA=m
-CONFIG_FSL_QDMA=m
-CONFIG_HISI_DMA=m
-CONFIG_IMX_DMA=m
-CONFIG_IMX_SDMA=m
-# CONFIG_INTEL_IDMA64 is not set
-CONFIG_K3_DMA=m
-CONFIG_MV_XOR=y
-CONFIG_MV_XOR_V2=y
-CONFIG_MXS_DMA=y
-CONFIG_MX3_IPU=y
-CONFIG_MX3_IPU_IRQS=4
-CONFIG_OWL_DMA=m
-# CONFIG_PL330_DMA is not set
-CONFIG_PLX_DMA=m
-CONFIG_SPRD_DMA=m
-# CONFIG_TEGRA20_APB_DMA is not set
-CONFIG_TEGRA210_ADMA=y
-CONFIG_XGENE_DMA=m
-CONFIG_XILINX_DMA=m
-CONFIG_XILINX_ZYNQMP_DMA=m
-CONFIG_XILINX_ZYNQMP_DPDMA=m
-CONFIG_ZX_DMA=m
-CONFIG_MTK_HSDMA=m
-CONFIG_MTK_CQDMA=m
-CONFIG_MTK_UART_APDMA=m
-CONFIG_QCOM_BAM_DMA=m
-CONFIG_QCOM_HIDMA_MGMT=m
-CONFIG_QCOM_HIDMA=m
-CONFIG_DW_DMAC_CORE=m
-# CONFIG_DW_DMAC is not set
-CONFIG_DW_DMAC_PCI=m
-CONFIG_DW_EDMA=m
-CONFIG_DW_EDMA_PCIE=m
-# CONFIG_SF_PDMA is not set
-CONFIG_FSL_DPAA2_QDMA=m
-
-#
-# DMA Clients
-#
-CONFIG_ASYNC_TX_DMA=y
-# CONFIG_DMATEST is not set
-CONFIG_DMA_ENGINE_RAID=y
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-CONFIG_SW_SYNC=y
-CONFIG_UDMABUF=y
-# CONFIG_DMABUF_MOVE_NOTIFY is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-# CONFIG_DMABUF_HEAPS is not set
-# end of DMABUF options
-
-CONFIG_AUXDISPLAY=y
-CONFIG_HD44780=m
-# CONFIG_IMG_ASCII_LCD is not set
-CONFIG_HT16K33=m
-CONFIG_PARPORT_PANEL=m
-CONFIG_PANEL_PARPORT=0
-CONFIG_PANEL_PROFILE=5
-# CONFIG_PANEL_CHANGE_MESSAGE is not set
-# CONFIG_CHARLCD_BL_OFF is not set
-# CONFIG_CHARLCD_BL_ON is not set
-CONFIG_CHARLCD_BL_FLASH=y
-CONFIG_PANEL=m
-CONFIG_CHARLCD=m
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_DMEM_GENIRQ=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-# CONFIG_UIO_PRUSS is not set
-CONFIG_UIO_MF624=m
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO_VIRQFD=m
-CONFIG_VFIO=m
-# CONFIG_VFIO_NOIOMMU is not set
-CONFIG_VFIO_PCI=m
-CONFIG_VFIO_PCI_MMAP=y
-CONFIG_VFIO_PCI_INTX=y
-# CONFIG_VFIO_PLATFORM is not set
-CONFIG_VFIO_MDEV=m
-CONFIG_VFIO_MDEV_DEVICE=m
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_VDPA=m
-CONFIG_VIRTIO_PMEM=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-CONFIG_VDPA=m
-CONFIG_VDPA_SIM=m
-CONFIG_IFCVF=m
-CONFIG_MLX5_VDPA=y
-CONFIG_MLX5_VDPA_NET=m
-CONFIG_VHOST_IOTLB=m
-CONFIG_VHOST_RING=m
-CONFIG_VHOST=m
-CONFIG_VHOST_MENU=y
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_VSOCK=m
-CONFIG_VHOST_VDPA=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-# end of Microsoft Hyper-V guest support
-
-# CONFIG_GREYBUS is not set
-CONFIG_STAGING=y
-CONFIG_PRISM2_USB=m
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
-CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
-# CONFIG_COMEDI_MISC_DRIVERS is not set
-# CONFIG_COMEDI_ISA_DRIVERS is not set
-# CONFIG_COMEDI_PCI_DRIVERS is not set
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
-CONFIG_COMEDI_CB_DAS16_CS=m
-CONFIG_COMEDI_DAS08_CS=m
-CONFIG_COMEDI_NI_DAQ_700_CS=m
-CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
-CONFIG_COMEDI_NI_LABPC_CS=m
-CONFIG_COMEDI_NI_MIO_CS=m
-CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=m
-CONFIG_COMEDI_DT9812=m
-CONFIG_COMEDI_NI_USB6501=m
-CONFIG_COMEDI_USBDUX=m
-CONFIG_COMEDI_USBDUXFAST=m
-CONFIG_COMEDI_USBDUXSIGMA=m
-CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_8254=m
-CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_8255_SA=m
-CONFIG_COMEDI_KCOMEDILIB=m
-CONFIG_COMEDI_DAS08=m
-CONFIG_COMEDI_NI_LABPC=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_ROUTING=m
-CONFIG_RTL8192U=m
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_RTL8723BS=m
-CONFIG_R8712U=m
-CONFIG_R8188EU=m
-CONFIG_88EU_AP_MODE=y
-CONFIG_RTS5208=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-
-#
-# IIO staging drivers
-#
-
-#
-# Accelerometers
-#
-# CONFIG_ADIS16203 is not set
-# CONFIG_ADIS16240 is not set
-# end of Accelerometers
-
-#
-# Analog to digital converters
-#
-# CONFIG_AD7816 is not set
-# CONFIG_AD7280 is not set
-# end of Analog to digital converters
-
-#
-# Analog digital bi-direction converters
-#
-# CONFIG_ADT7316 is not set
-# end of Analog digital bi-direction converters
-
-#
-# Capacitance to digital converters
-#
-# CONFIG_AD7150 is not set
-# CONFIG_AD7746 is not set
-# end of Capacitance to digital converters
-
-#
-# Direct Digital Synthesis
-#
-# CONFIG_AD9832 is not set
-# CONFIG_AD9834 is not set
-# end of Direct Digital Synthesis
-
-#
-# Network Analyzer, Impedance Converters
-#
-# CONFIG_AD5933 is not set
-# end of Network Analyzer, Impedance Converters
-
-#
-# Active energy metering IC
-#
-# CONFIG_ADE7854 is not set
-# end of Active energy metering IC
-
-#
-# Resolver to digital converters
-#
-# CONFIG_AD2S1210 is not set
-# end of Resolver to digital converters
-# end of IIO staging drivers
-
-CONFIG_FB_SM750=m
-CONFIG_MFD_NVEC=m
-CONFIG_KEYBOARD_NVEC=m
-CONFIG_SERIO_NVEC_PS2=m
-CONFIG_NVEC_POWER=m
-CONFIG_NVEC_PAZ00=m
-CONFIG_STAGING_MEDIA=y
-CONFIG_VIDEO_ALLEGRO_DVT=m
-CONFIG_VIDEO_HANTRO=m
-CONFIG_VIDEO_HANTRO_IMX8M=y
-CONFIG_VIDEO_HANTRO_ROCKCHIP=y
-CONFIG_VIDEO_MESON_VDEC=m
-CONFIG_VIDEO_ROCKCHIP_VDEC=m
-CONFIG_VIDEO_SUNXI=y
-CONFIG_VIDEO_SUNXI_CEDRUS=m
-CONFIG_TEGRA_VDE=m
-CONFIG_VIDEO_TEGRA=m
-CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
-CONFIG_VIDEO_ROCKCHIP_ISP1=m
-CONFIG_VIDEO_USBVISION=m
-
-#
-# Android
-#
-# end of Android
-
-# CONFIG_STAGING_BOARD is not set
-CONFIG_LTE_GDM724X=m
-CONFIG_FIREWIRE_SERIAL=m
-CONFIG_FWTTY_MAX_TOTAL_PORTS=64
-CONFIG_FWTTY_MAX_CARD_PORTS=32
-# CONFIG_GS_FPGABOOT is not set
-# CONFIG_UNISYSSPAR is not set
-CONFIG_FB_TFT=m
-CONFIG_FB_TFT_AGM1264K_FL=m
-CONFIG_FB_TFT_BD663474=m
-CONFIG_FB_TFT_HX8340BN=m
-CONFIG_FB_TFT_HX8347D=m
-CONFIG_FB_TFT_HX8353D=m
-CONFIG_FB_TFT_HX8357D=m
-CONFIG_FB_TFT_ILI9163=m
-CONFIG_FB_TFT_ILI9320=m
-CONFIG_FB_TFT_ILI9325=m
-CONFIG_FB_TFT_ILI9340=m
-CONFIG_FB_TFT_ILI9341=m
-CONFIG_FB_TFT_ILI9481=m
-CONFIG_FB_TFT_ILI9486=m
-CONFIG_FB_TFT_PCD8544=m
-CONFIG_FB_TFT_RA8875=m
-CONFIG_FB_TFT_S6D02A1=m
-CONFIG_FB_TFT_S6D1121=m
-CONFIG_FB_TFT_SEPS525=m
-CONFIG_FB_TFT_SH1106=m
-CONFIG_FB_TFT_SSD1289=m
-CONFIG_FB_TFT_SSD1305=m
-CONFIG_FB_TFT_SSD1306=m
-CONFIG_FB_TFT_SSD1331=m
-CONFIG_FB_TFT_SSD1351=m
-CONFIG_FB_TFT_ST7735R=m
-CONFIG_FB_TFT_ST7789V=m
-CONFIG_FB_TFT_TINYLCD=m
-CONFIG_FB_TFT_TLS8204=m
-CONFIG_FB_TFT_UC1611=m
-CONFIG_FB_TFT_UC1701=m
-CONFIG_FB_TFT_UPD161704=m
-CONFIG_FB_TFT_WATTEROTT=m
-CONFIG_FSL_DPAA2=y
-CONFIG_FSL_DPAA2_ETHSW=m
-CONFIG_KS7010=m
-CONFIG_BCM_VIDEOCORE=m
-CONFIG_BCM2835_VCHIQ=m
-CONFIG_SND_BCM2835=m
-CONFIG_VIDEO_BCM2835=m
-CONFIG_BCM2835_VCHIQ_MMAL=m
-CONFIG_PI433=m
-
-#
-# Gasket devices
-#
-CONFIG_STAGING_GASKET_FRAMEWORK=m
-CONFIG_STAGING_APEX_DRIVER=m
-# end of Gasket devices
-
-CONFIG_XIL_AXIS_FIFO=m
-CONFIG_FIELDBUS_DEV=m
-CONFIG_HMS_ANYBUSS_BUS=m
-CONFIG_ARCX_ANYBUS_CONTROLLER=m
-CONFIG_HMS_PROFINET=m
-# CONFIG_KPC2000 is not set
-CONFIG_QLGE=m
-CONFIG_WFX=m
-# CONFIG_GOLDFISH is not set
-CONFIG_MFD_CROS_EC=m
-CONFIG_CHROME_PLATFORMS=y
-CONFIG_CHROMEOS_TBMC=m
-CONFIG_CROS_EC=m
-CONFIG_CROS_EC_I2C=m
-CONFIG_CROS_EC_RPMSG=m
-CONFIG_CROS_EC_SPI=m
-CONFIG_CROS_EC_PROTO=y
-CONFIG_CROS_KBD_LED_BACKLIGHT=m
-CONFIG_CROS_EC_CHARDEV=m
-CONFIG_CROS_EC_LIGHTBAR=m
-CONFIG_CROS_EC_VBC=m
-# CONFIG_CROS_EC_DEBUGFS is not set
-CONFIG_CROS_EC_SENSORHUB=m
-CONFIG_CROS_EC_SYSFS=m
-CONFIG_CROS_EC_TYPEC=m
-CONFIG_CROS_USBPD_LOGGER=m
-CONFIG_CROS_USBPD_NOTIFY=m
-CONFIG_MELLANOX_PLATFORM=y
-CONFIG_MLXREG_HOTPLUG=m
-CONFIG_MLXREG_IO=m
-CONFIG_MLXBF_TMFIFO=m
-CONFIG_MLXBF_BOOTCTL=m
-CONFIG_HAVE_CLK=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# Clock driver for ARM Reference designs
-#
-CONFIG_ICST=y
-CONFIG_CLK_SP810=y
-CONFIG_CLK_VEXPRESS_OSC=y
-# end of Clock driver for ARM Reference designs
-
-# CONFIG_CLK_HSDK is not set
-CONFIG_COMMON_CLK_MAX77686=m
-CONFIG_COMMON_CLK_MAX9485=m
-CONFIG_COMMON_CLK_RK808=m
-CONFIG_COMMON_CLK_HI655X=m
-CONFIG_COMMON_CLK_SCMI=m
-CONFIG_COMMON_CLK_SCPI=m
-CONFIG_COMMON_CLK_SI5341=m
-# CONFIG_COMMON_CLK_SI5351 is not set
-CONFIG_COMMON_CLK_SI514=m
-CONFIG_COMMON_CLK_SI544=m
-# CONFIG_COMMON_CLK_SI570 is not set
-CONFIG_COMMON_CLK_BM1880=y
-CONFIG_COMMON_CLK_CDCE706=m
-CONFIG_COMMON_CLK_CDCE925=m
-CONFIG_COMMON_CLK_CS2000_CP=m
-CONFIG_COMMON_CLK_FSL_SAI=y
-CONFIG_CLK_QORIQ=y
-CONFIG_CLK_LS1028A_PLLDIG=m
-CONFIG_COMMON_CLK_XGENE=y
-CONFIG_COMMON_CLK_LOCHNAGAR=m
-CONFIG_COMMON_CLK_PWM=m
-CONFIG_COMMON_CLK_VC5=m
-CONFIG_COMMON_CLK_BD718XX=m
-CONFIG_COMMON_CLK_FIXED_MMIO=y
-CONFIG_CLK_ACTIONS=y
-# CONFIG_CLK_OWL_S500 is not set
-CONFIG_CLK_OWL_S700=y
-CONFIG_CLK_OWL_S900=y
-CONFIG_CLK_BCM2711_DVP=m
-CONFIG_CLK_BCM2835=y
-CONFIG_COMMON_CLK_IPROC=y
-CONFIG_CLK_BCM_NS2=y
-CONFIG_CLK_BCM_SR=y
-CONFIG_CLK_RASPBERRYPI=m
-# CONFIG_COMMON_CLK_HI3516CV300 is not set
-CONFIG_COMMON_CLK_HI3519=m
-CONFIG_COMMON_CLK_HI3660=y
-CONFIG_COMMON_CLK_HI3670=y
-CONFIG_COMMON_CLK_HI3798CV200=m
-CONFIG_COMMON_CLK_HI6220=y
-CONFIG_RESET_HISI=y
-CONFIG_STUB_CLK_HI6220=y
-CONFIG_STUB_CLK_HI3660=y
-CONFIG_MXC_CLK=y
-CONFIG_MXC_CLK_SCU=y
-CONFIG_CLK_IMX8MM=y
-CONFIG_CLK_IMX8MN=y
-CONFIG_CLK_IMX8MP=y
-CONFIG_CLK_IMX8MQ=y
-CONFIG_CLK_IMX8QXP=y
-
-#
-# Clock driver for MediaTek SoC
-#
-CONFIG_COMMON_CLK_MEDIATEK=y
-CONFIG_COMMON_CLK_MT2712=y
-CONFIG_COMMON_CLK_MT2712_BDPSYS=y
-CONFIG_COMMON_CLK_MT2712_IMGSYS=y
-CONFIG_COMMON_CLK_MT2712_JPGDECSYS=y
-CONFIG_COMMON_CLK_MT2712_MFGCFG=y
-CONFIG_COMMON_CLK_MT2712_MMSYS=y
-CONFIG_COMMON_CLK_MT2712_VDECSYS=y
-CONFIG_COMMON_CLK_MT2712_VENCSYS=y
-CONFIG_COMMON_CLK_MT6765=y
-CONFIG_COMMON_CLK_MT6765_AUDIOSYS=y
-CONFIG_COMMON_CLK_MT6765_CAMSYS=y
-CONFIG_COMMON_CLK_MT6765_GCESYS=y
-CONFIG_COMMON_CLK_MT6765_MMSYS=y
-CONFIG_COMMON_CLK_MT6765_IMGSYS=y
-CONFIG_COMMON_CLK_MT6765_VCODECSYS=y
-CONFIG_COMMON_CLK_MT6765_MFGSYS=y
-CONFIG_COMMON_CLK_MT6765_MIPI0ASYS=y
-CONFIG_COMMON_CLK_MT6765_MIPI0BSYS=y
-CONFIG_COMMON_CLK_MT6765_MIPI1ASYS=y
-CONFIG_COMMON_CLK_MT6765_MIPI1BSYS=y
-CONFIG_COMMON_CLK_MT6765_MIPI2ASYS=y
-CONFIG_COMMON_CLK_MT6765_MIPI2BSYS=y
-CONFIG_COMMON_CLK_MT6779=y
-CONFIG_COMMON_CLK_MT6779_MMSYS=y
-CONFIG_COMMON_CLK_MT6779_IMGSYS=y
-CONFIG_COMMON_CLK_MT6779_IPESYS=y
-CONFIG_COMMON_CLK_MT6779_CAMSYS=y
-CONFIG_COMMON_CLK_MT6779_VDECSYS=y
-CONFIG_COMMON_CLK_MT6779_VENCSYS=y
-CONFIG_COMMON_CLK_MT6779_MFGCFG=y
-CONFIG_COMMON_CLK_MT6779_AUDSYS=y
-CONFIG_COMMON_CLK_MT6797=y
-CONFIG_COMMON_CLK_MT6797_MMSYS=y
-CONFIG_COMMON_CLK_MT6797_IMGSYS=y
-CONFIG_COMMON_CLK_MT6797_VDECSYS=y
-CONFIG_COMMON_CLK_MT6797_VENCSYS=y
-CONFIG_COMMON_CLK_MT7622=y
-CONFIG_COMMON_CLK_MT7622_ETHSYS=y
-CONFIG_COMMON_CLK_MT7622_HIFSYS=y
-CONFIG_COMMON_CLK_MT7622_AUDSYS=y
-CONFIG_COMMON_CLK_MT8173=y
-CONFIG_COMMON_CLK_MT8173_MMSYS=y
-CONFIG_COMMON_CLK_MT8183=y
-CONFIG_COMMON_CLK_MT8183_AUDIOSYS=y
-CONFIG_COMMON_CLK_MT8183_CAMSYS=y
-CONFIG_COMMON_CLK_MT8183_IMGSYS=y
-CONFIG_COMMON_CLK_MT8183_IPU_CORE0=y
-CONFIG_COMMON_CLK_MT8183_IPU_CORE1=y
-CONFIG_COMMON_CLK_MT8183_IPU_ADL=y
-CONFIG_COMMON_CLK_MT8183_IPU_CONN=y
-CONFIG_COMMON_CLK_MT8183_MFGCFG=y
-CONFIG_COMMON_CLK_MT8183_MMSYS=y
-CONFIG_COMMON_CLK_MT8183_VDECSYS=y
-CONFIG_COMMON_CLK_MT8183_VENCSYS=y
-CONFIG_COMMON_CLK_MT8516=y
-CONFIG_COMMON_CLK_MT8516_AUDSYS=y
-# end of Clock driver for MediaTek SoC
-
-CONFIG_COMMON_CLK_MESON_REGMAP=y
-CONFIG_COMMON_CLK_MESON_DUALDIV=y
-CONFIG_COMMON_CLK_MESON_MPLL=y
-CONFIG_COMMON_CLK_MESON_PHASE=m
-CONFIG_COMMON_CLK_MESON_PLL=y
-CONFIG_COMMON_CLK_MESON_SCLK_DIV=m
-CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y
-CONFIG_COMMON_CLK_MESON_AO_CLKC=y
-CONFIG_COMMON_CLK_MESON_EE_CLKC=y
-CONFIG_COMMON_CLK_MESON_CPU_DYNDIV=y
-CONFIG_COMMON_CLK_GXBB=y
-CONFIG_COMMON_CLK_AXG=y
-CONFIG_COMMON_CLK_AXG_AUDIO=m
-CONFIG_COMMON_CLK_G12A=y
-CONFIG_ARMADA_AP_CP_HELPER=y
-CONFIG_ARMADA_37XX_CLK=y
-CONFIG_ARMADA_AP806_SYSCON=y
-CONFIG_ARMADA_AP_CPU_CLK=y
-CONFIG_ARMADA_CP110_SYSCON=y
-CONFIG_QCOM_GDSC=y
-CONFIG_QCOM_RPMCC=y
-CONFIG_COMMON_CLK_QCOM=m
-CONFIG_QCOM_A53PLL=m
-CONFIG_QCOM_CLK_APCS_MSM8916=m
-CONFIG_QCOM_CLK_APCC_MSM8996=m
-CONFIG_QCOM_CLK_RPM=m
-CONFIG_QCOM_CLK_SMD_RPM=m
-CONFIG_QCOM_CLK_RPMH=m
-# CONFIG_APQ_GCC_8084 is not set
-# CONFIG_APQ_MMCC_8084 is not set
-CONFIG_IPQ_APSS_PLL=m
-CONFIG_IPQ_APSS_6018=m
-# CONFIG_IPQ_GCC_4019 is not set
-CONFIG_IPQ_GCC_6018=m
-# CONFIG_IPQ_GCC_806X is not set
-# CONFIG_IPQ_LCC_806X is not set
-# CONFIG_IPQ_GCC_8074 is not set
-# CONFIG_MSM_GCC_8660 is not set
-CONFIG_MSM_GCC_8916=m
-CONFIG_MSM_GCC_8939=m
-# CONFIG_MSM_GCC_8960 is not set
-# CONFIG_MSM_LCC_8960 is not set
-# CONFIG_MDM_GCC_9615 is not set
-# CONFIG_MDM_LCC_9615 is not set
-# CONFIG_MSM_MMCC_8960 is not set
-# CONFIG_MSM_GCC_8974 is not set
-# CONFIG_MSM_MMCC_8974 is not set
-# CONFIG_MSM_GCC_8994 is not set
-# CONFIG_MSM_GCC_8996 is not set
-# CONFIG_MSM_MMCC_8996 is not set
-CONFIG_MSM_GCC_8998=m
-CONFIG_MSM_GPUCC_8998=m
-CONFIG_MSM_MMCC_8998=m
-CONFIG_QCS_GCC_404=m
-CONFIG_SC_DISPCC_7180=m
-CONFIG_SC_GCC_7180=m
-CONFIG_SC_LPASS_CORECC_7180=m
-CONFIG_SC_GPUCC_7180=m
-CONFIG_SC_MSS_7180=m
-CONFIG_SC_VIDEOCC_7180=m
-CONFIG_SDM_CAMCC_845=m
-# CONFIG_SDM_GCC_660 is not set
-CONFIG_QCS_TURING_404=m
-CONFIG_QCS_Q6SSTOP_404=m
-CONFIG_SDM_GCC_845=m
-CONFIG_SDM_GPUCC_845=m
-CONFIG_SDM_VIDEOCC_845=m
-CONFIG_SDM_DISPCC_845=m
-CONFIG_SDM_LPASSCC_845=m
-CONFIG_SM_GCC_8150=m
-CONFIG_SM_GCC_8250=m
-CONFIG_SM_GPUCC_8150=m
-CONFIG_SM_GPUCC_8250=m
-CONFIG_SPMI_PMIC_CLKDIV=m
-CONFIG_QCOM_HFPLL=m
-# CONFIG_KPSS_XCC is not set
-CONFIG_COMMON_CLK_SAMSUNG=y
-CONFIG_EXYNOS_ARM64_COMMON_CLK=y
-CONFIG_EXYNOS_AUDSS_CLK_CON=m
-CONFIG_SPRD_COMMON_CLK=m
-CONFIG_SPRD_SC9860_CLK=m
-CONFIG_SPRD_SC9863A_CLK=m
-CONFIG_CLK_SUNXI=y
-CONFIG_CLK_SUNXI_CLOCKS=y
-CONFIG_CLK_SUNXI_PRCM_SUN6I=y
-CONFIG_CLK_SUNXI_PRCM_SUN8I=y
-CONFIG_CLK_SUNXI_PRCM_SUN9I=y
-CONFIG_SUNXI_CCU=y
-CONFIG_SUN50I_A64_CCU=y
-CONFIG_SUN50I_H6_CCU=y
-CONFIG_SUN50I_H6_R_CCU=y
-# CONFIG_SUN8I_A83T_CCU is not set
-CONFIG_SUN8I_H3_CCU=y
-CONFIG_SUN8I_DE2_CCU=y
-CONFIG_SUN8I_R_CCU=y
-CONFIG_CLK_TEGRA_BPMP=y
-CONFIG_TEGRA_CLK_DFLL=y
-CONFIG_COMMON_CLK_ZYNQMP=y
-CONFIG_HWSPINLOCK=y
-CONFIG_HWSPINLOCK_QCOM=m
-CONFIG_HWSPINLOCK_SPRD=m
-
-#
-# Clock Source drivers
-#
-CONFIG_TIMER_OF=y
-CONFIG_TIMER_ACPI=y
-CONFIG_TIMER_PROBE=y
-CONFIG_CLKSRC_MMIO=y
-CONFIG_DW_APB_TIMER=y
-CONFIG_DW_APB_TIMER_OF=y
-CONFIG_ROCKCHIP_TIMER=y
-CONFIG_OWL_TIMER=y
-CONFIG_TEGRA_TIMER=y
-CONFIG_ARM_ARCH_TIMER=y
-CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
-CONFIG_FSL_ERRATUM_A008585=y
-CONFIG_HISILICON_ERRATUM_161010101=y
-CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
-CONFIG_ARM_TIMER_SP804=y
-CONFIG_MTK_TIMER=y
-CONFIG_SPRD_TIMER=y
-CONFIG_TIMER_IMX_SYS_CTR=y
-# CONFIG_MICROCHIP_PIT64B is not set
-# end of Clock Source drivers
-
-CONFIG_MAILBOX=y
-# CONFIG_ARM_MHU is not set
-CONFIG_IMX_MBOX=m
-CONFIG_PLATFORM_MHU=m
-# CONFIG_PL320_MBOX is not set
-CONFIG_ARMADA_37XX_RWTM_MBOX=m
-CONFIG_ROCKCHIP_MBOX=y
-CONFIG_PCC=y
-# CONFIG_ALTERA_MBOX is not set
-CONFIG_BCM2835_MBOX=y
-CONFIG_HI3660_MBOX=m
-CONFIG_HI6220_MBOX=m
-# CONFIG_MAILBOX_TEST is not set
-CONFIG_QCOM_APCS_IPC=m
-CONFIG_TEGRA_HSP_MBOX=y
-CONFIG_XGENE_SLIMPRO_MBOX=m
-CONFIG_BCM_PDC_MBOX=m
-CONFIG_BCM_FLEXRM_MBOX=m
-CONFIG_MTK_CMDQ_MBOX=m
-CONFIG_ZYNQMP_IPI_MBOX=y
-CONFIG_SUN6I_MSGBOX=m
-CONFIG_SPRD_MBOX=m
-CONFIG_QCOM_IPCC=y
-CONFIG_IOMMU_IOVA=y
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-CONFIG_IOMMU_IO_PGTABLE=y
-CONFIG_IOMMU_IO_PGTABLE_LPAE=y
-# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
-CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
-# CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set
-# end of Generic IOMMU Pagetable Support
-
-# CONFIG_IOMMU_DEBUGFS is not set
-CONFIG_IOMMU_DEFAULT_PASSTHROUGH=y
-CONFIG_OF_IOMMU=y
-CONFIG_IOMMU_DMA=y
-CONFIG_ROCKCHIP_IOMMU=y
-CONFIG_SUN50I_IOMMU=y
-CONFIG_TEGRA_IOMMU_SMMU=y
-CONFIG_EXYNOS_IOMMU=y
-# CONFIG_EXYNOS_IOMMU_DEBUG is not set
-CONFIG_ARM_SMMU=y
-# CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
-# CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT is not set
-CONFIG_ARM_SMMU_V3=y
-CONFIG_MTK_IOMMU=y
-CONFIG_QCOM_IOMMU=y
-CONFIG_VIRTIO_IOMMU=y
-
-#
-# Remoteproc drivers
-#
-CONFIG_REMOTEPROC=y
-CONFIG_REMOTEPROC_CDEV=y
-CONFIG_IMX_REMOTEPROC=m
-CONFIG_MTK_SCP=m
-CONFIG_QCOM_PIL_INFO=m
-CONFIG_QCOM_RPROC_COMMON=m
-CONFIG_QCOM_Q6V5_COMMON=m
-CONFIG_QCOM_Q6V5_ADSP=m
-CONFIG_QCOM_Q6V5_MSS=m
-CONFIG_QCOM_Q6V5_PAS=m
-CONFIG_QCOM_Q6V5_WCSS=m
-CONFIG_QCOM_SYSMON=m
-# CONFIG_QCOM_WCNSS_PIL is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-CONFIG_RPMSG=m
-CONFIG_RPMSG_CHAR=m
-CONFIG_RPMSG_MTK_SCP=m
-CONFIG_RPMSG_QCOM_GLINK=m
-CONFIG_RPMSG_QCOM_GLINK_RPM=m
-CONFIG_RPMSG_QCOM_GLINK_SMEM=m
-CONFIG_RPMSG_QCOM_SMD=m
-CONFIG_RPMSG_VIRTIO=m
-# end of Rpmsg drivers
-
-CONFIG_SOUNDWIRE=y
-
-#
-# SoundWire Devices
-#
-# CONFIG_SOUNDWIRE_INTEL is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-CONFIG_OWL_PM_DOMAINS_HELPER=y
-CONFIG_OWL_PM_DOMAINS=y
-
-#
-# Amlogic SoC drivers
-#
-CONFIG_MESON_CANVAS=m
-CONFIG_MESON_CLK_MEASURE=y
-CONFIG_MESON_GX_SOCINFO=y
-CONFIG_MESON_GX_PM_DOMAINS=y
-CONFIG_MESON_EE_PM_DOMAINS=y
-CONFIG_MESON_SECURE_PM_DOMAINS=y
-# CONFIG_MESON_MX_SOCINFO is not set
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-CONFIG_BCM2835_POWER=y
-CONFIG_RASPBERRYPI_POWER=y
-CONFIG_SOC_BRCMSTB=y
-CONFIG_BRCMSTB_PM=y
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-CONFIG_FSL_DPAA=y
-# CONFIG_FSL_DPAA_CHECKING is not set
-# CONFIG_FSL_BMAN_TEST is not set
-# CONFIG_FSL_QMAN_TEST is not set
-CONFIG_QUICC_ENGINE=y
-CONFIG_FSL_GUTS=y
-CONFIG_FSL_MC_DPIO=m
-CONFIG_DPAA2_CONSOLE=m
-CONFIG_FSL_RCPM=y
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-CONFIG_IMX_GPCV2_PM_DOMAINS=y
-CONFIG_SOC_IMX8M=y
-# end of i.MX SoC drivers
-
-#
-# MediaTek SoC drivers
-#
-CONFIG_MTK_CMDQ=m
-CONFIG_MTK_INFRACFG=y
-CONFIG_MTK_PMIC_WRAP=m
-CONFIG_MTK_SCPSYS=y
-CONFIG_MTK_MMSYS=y
-# end of MediaTek SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-CONFIG_QCOM_AOSS_QMP=m
-CONFIG_QCOM_COMMAND_DB=y
-CONFIG_QCOM_GENI_SE=y
-CONFIG_QCOM_GSBI=m
-CONFIG_QCOM_LLCC=m
-CONFIG_QCOM_KRYO_L2_ACCESSORS=y
-CONFIG_QCOM_MDT_LOADER=m
-CONFIG_QCOM_OCMEM=m
-CONFIG_QCOM_PDR_HELPERS=m
-CONFIG_QCOM_QMI_HELPERS=m
-CONFIG_QCOM_RMTFS_MEM=m
-CONFIG_QCOM_RPMH=y
-CONFIG_QCOM_RPMHPD=y
-CONFIG_QCOM_RPMPD=m
-CONFIG_QCOM_SMEM=m
-CONFIG_QCOM_SMD_RPM=m
-CONFIG_QCOM_SMEM_STATE=y
-CONFIG_QCOM_SMP2P=m
-CONFIG_QCOM_SMSM=m
-CONFIG_QCOM_SOCINFO=m
-CONFIG_QCOM_WCNSS_CTRL=m
-CONFIG_QCOM_APR=m
-# end of Qualcomm SoC drivers
-
-CONFIG_ROCKCHIP_GRF=y
-CONFIG_ROCKCHIP_PM_DOMAINS=y
-CONFIG_SOC_SAMSUNG=y
-CONFIG_EXYNOS_CHIPID=y
-CONFIG_EXYNOS_PMU=y
-CONFIG_EXYNOS_PM_DOMAINS=y
-CONFIG_SUNXI_SRAM=y
-CONFIG_ARCH_TEGRA_132_SOC=y
-CONFIG_ARCH_TEGRA_210_SOC=y
-CONFIG_ARCH_TEGRA_186_SOC=y
-CONFIG_ARCH_TEGRA_194_SOC=y
-CONFIG_SOC_TEGRA_FUSE=y
-CONFIG_SOC_TEGRA_FLOWCTRL=y
-CONFIG_SOC_TEGRA_PMC=y
-CONFIG_SOC_TEGRA_POWERGATE_BPMP=y
-CONFIG_SOC_TI=y
-
-#
-# Xilinx SoC drivers
-#
-CONFIG_XILINX_VCU=m
-CONFIG_ZYNQMP_POWER=y
-CONFIG_ZYNQMP_PM_DOMAINS=y
-# end of Xilinx SoC drivers
-
-CONFIG_SOC_ZTE=y
-CONFIG_ZX2967_PM_DOMAINS=y
-# end of SOC (System On Chip) specific Drivers
-
-CONFIG_PM_DEVFREQ=y
-
-#
-# DEVFREQ Governors
-#
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
-CONFIG_DEVFREQ_GOV_PERFORMANCE=m
-CONFIG_DEVFREQ_GOV_POWERSAVE=m
-CONFIG_DEVFREQ_GOV_USERSPACE=m
-CONFIG_DEVFREQ_GOV_PASSIVE=y
-
-#
-# DEVFREQ Drivers
-#
-CONFIG_ARM_EXYNOS_BUS_DEVFREQ=y
-CONFIG_ARM_IMX_BUS_DEVFREQ=m
-CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
-CONFIG_ARM_TEGRA_DEVFREQ=m
-CONFIG_ARM_RK3399_DMC_DEVFREQ=m
-CONFIG_PM_DEVFREQ_EVENT=y
-CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=y
-CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
-CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
-CONFIG_EXTCON=y
-
-#
-# Extcon Device Drivers
-#
-# CONFIG_EXTCON_ADC_JACK is not set
-CONFIG_EXTCON_FSA9480=m
-CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_MAX3355=m
-CONFIG_EXTCON_PTN5150=m
-CONFIG_EXTCON_QCOM_SPMI_MISC=m
-# CONFIG_EXTCON_RT8973A is not set
-CONFIG_EXTCON_SM5502=m
-# CONFIG_EXTCON_USB_GPIO is not set
-CONFIG_EXTCON_USBC_CROS_EC=m
-CONFIG_MEMORY=y
-CONFIG_ARM_PL172_MPMC=m
-CONFIG_FSL_IFC=y
-CONFIG_MTK_SMI=y
-CONFIG_TEGRA_MC=y
-CONFIG_TEGRA210_EMC_TABLE=y
-CONFIG_TEGRA210_EMC=m
-CONFIG_IIO=m
-CONFIG_IIO_BUFFER=y
-CONFIG_IIO_BUFFER_CB=m
-CONFIG_IIO_BUFFER_DMA=m
-CONFIG_IIO_BUFFER_DMAENGINE=m
-CONFIG_IIO_BUFFER_HW_CONSUMER=m
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-CONFIG_IIO_CONFIGFS=m
-CONFIG_IIO_TRIGGER=y
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-CONFIG_IIO_SW_DEVICE=m
-CONFIG_IIO_SW_TRIGGER=m
-CONFIG_IIO_TRIGGERED_EVENT=m
-
-#
-# Accelerometers
-#
-# CONFIG_ADIS16201 is not set
-# CONFIG_ADIS16209 is not set
-CONFIG_ADXL372=m
-CONFIG_ADXL372_SPI=m
-CONFIG_ADXL372_I2C=m
-CONFIG_BMA220=m
-CONFIG_BMA400=m
-CONFIG_BMA400_I2C=m
-CONFIG_BMA400_SPI=m
-CONFIG_BMC150_ACCEL=m
-CONFIG_BMC150_ACCEL_I2C=m
-CONFIG_BMC150_ACCEL_SPI=m
-CONFIG_DA280=m
-CONFIG_DA311=m
-CONFIG_DMARD06=m
-CONFIG_DMARD09=m
-CONFIG_DMARD10=m
-CONFIG_HID_SENSOR_ACCEL_3D=m
-CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
-# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_KXSD9 is not set
-# CONFIG_KXCJK1013 is not set
-CONFIG_MC3230=m
-CONFIG_MMA7455=m
-CONFIG_MMA7455_I2C=m
-CONFIG_MMA7455_SPI=m
-CONFIG_MMA7660=m
-# CONFIG_MMA8452 is not set
-CONFIG_MMA9551_CORE=m
-CONFIG_MMA9551=m
-CONFIG_MMA9553=m
-CONFIG_MXC4005=m
-CONFIG_MXC6255=m
-# CONFIG_SCA3000 is not set
-CONFIG_STK8312=m
-CONFIG_STK8BA50=m
-# end of Accelerometers
-
-#
-# Analog to digital converters
-#
-CONFIG_AD_SIGMA_DELTA=m
-CONFIG_AD7091R5=m
-CONFIG_AD7124=m
-# CONFIG_AD7192 is not set
-# CONFIG_AD7266 is not set
-# CONFIG_AD7291 is not set
-CONFIG_AD7292=m
-# CONFIG_AD7298 is not set
-# CONFIG_AD7476 is not set
-CONFIG_AD7606=m
-CONFIG_AD7606_IFACE_PARALLEL=m
-CONFIG_AD7606_IFACE_SPI=m
-CONFIG_AD7766=m
-CONFIG_AD7768_1=m
-# CONFIG_AD7780 is not set
-# CONFIG_AD7791 is not set
-# CONFIG_AD7793 is not set
-# CONFIG_AD7887 is not set
-# CONFIG_AD7923 is not set
-CONFIG_AD7949=m
-# CONFIG_AD799X is not set
-CONFIG_AD9467=m
-CONFIG_ADI_AXI_ADC=m
-CONFIG_AXP20X_ADC=m
-CONFIG_AXP288_ADC=m
-CONFIG_BCM_IPROC_ADC=m
-# CONFIG_BERLIN2_ADC is not set
-# CONFIG_CC10001_ADC is not set
-CONFIG_CPCAP_ADC=m
-CONFIG_DLN2_ADC=m
-CONFIG_ENVELOPE_DETECTOR=m
-# CONFIG_EXYNOS_ADC is not set
-CONFIG_HI8435=m
-CONFIG_HX711=m
-CONFIG_INA2XX_ADC=m
-# CONFIG_IMX7D_ADC is not set
-CONFIG_LTC2471=m
-CONFIG_LTC2485=m
-CONFIG_LTC2496=m
-CONFIG_LTC2497=m
-# CONFIG_MAX1027 is not set
-CONFIG_MAX11100=m
-CONFIG_MAX1118=m
-CONFIG_MAX1241=m
-# CONFIG_MAX1363 is not set
-CONFIG_MAX9611=m
-# CONFIG_MCP320X is not set
-# CONFIG_MCP3422 is not set
-CONFIG_MCP3911=m
-CONFIG_MEDIATEK_MT6577_AUXADC=m
-CONFIG_MESON_SARADC=m
-CONFIG_MP2629_ADC=m
-# CONFIG_NAU7802 is not set
-CONFIG_QCOM_VADC_COMMON=m
-# CONFIG_QCOM_SPMI_IADC is not set
-# CONFIG_QCOM_SPMI_VADC is not set
-CONFIG_QCOM_SPMI_ADC5=m
-# CONFIG_ROCKCHIP_SARADC is not set
-CONFIG_SC27XX_ADC=m
-CONFIG_SD_ADC_MODULATOR=m
-CONFIG_SUN4I_GPADC=m
-# CONFIG_TI_ADC081C is not set
-CONFIG_TI_ADC0832=m
-CONFIG_TI_ADC084S021=m
-CONFIG_TI_ADC12138=m
-CONFIG_TI_ADC108S102=m
-# CONFIG_TI_ADC128S052 is not set
-CONFIG_TI_ADC161S626=m
-CONFIG_TI_ADS1015=m
-CONFIG_TI_ADS7950=m
-CONFIG_TI_ADS8344=m
-# CONFIG_TI_ADS8688 is not set
-CONFIG_TI_ADS124S08=m
-# CONFIG_TI_AM335X_ADC is not set
-CONFIG_TI_TLC4541=m
-# CONFIG_VF610_ADC is not set
-# CONFIG_VIPERBOARD_ADC is not set
-CONFIG_XILINX_XADC=m
-# end of Analog to digital converters
-
-#
-# Analog Front Ends
-#
-CONFIG_IIO_RESCALE=m
-# end of Analog Front Ends
-
-#
-# Amplifiers
-#
-# CONFIG_AD8366 is not set
-CONFIG_HMC425=m
-# end of Amplifiers
-
-#
-# Chemical Sensors
-#
-CONFIG_ATLAS_PH_SENSOR=m
-CONFIG_ATLAS_EZO_SENSOR=m
-CONFIG_BME680=m
-CONFIG_BME680_I2C=m
-CONFIG_BME680_SPI=m
-CONFIG_CCS811=m
-CONFIG_IAQCORE=m
-CONFIG_PMS7003=m
-CONFIG_SCD30_CORE=m
-CONFIG_SCD30_I2C=m
-CONFIG_SCD30_SERIAL=m
-# CONFIG_SENSIRION_SGP30 is not set
-CONFIG_SPS30=m
-CONFIG_VZ89X=m
-# end of Chemical Sensors
-
-CONFIG_IIO_CROS_EC_SENSORS_CORE=m
-CONFIG_IIO_CROS_EC_SENSORS=m
-CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m
-
-#
-# Hid Sensor IIO Common
-#
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-# end of Hid Sensor IIO Common
-
-CONFIG_IIO_MS_SENSORS_I2C=m
-
-#
-# SSP Sensor Common
-#
-# CONFIG_IIO_SSP_SENSORHUB is not set
-# end of SSP Sensor Common
-
-CONFIG_IIO_ST_SENSORS_I2C=m
-CONFIG_IIO_ST_SENSORS_SPI=m
-CONFIG_IIO_ST_SENSORS_CORE=m
-
-#
-# Digital to analog converters
-#
-# CONFIG_AD5064 is not set
-# CONFIG_AD5360 is not set
-# CONFIG_AD5380 is not set
-# CONFIG_AD5421 is not set
-# CONFIG_AD5446 is not set
-# CONFIG_AD5449 is not set
-CONFIG_AD5592R_BASE=m
-CONFIG_AD5592R=m
-# CONFIG_AD5593R is not set
-# CONFIG_AD5504 is not set
-# CONFIG_AD5624R_SPI is not set
-CONFIG_AD5686=m
-CONFIG_AD5686_SPI=m
-CONFIG_AD5696_I2C=m
-# CONFIG_AD5755 is not set
-CONFIG_AD5758=m
-CONFIG_AD5761=m
-# CONFIG_AD5764 is not set
-CONFIG_AD5770R=m
-# CONFIG_AD5791 is not set
-# CONFIG_AD7303 is not set
-CONFIG_AD8801=m
-CONFIG_DPOT_DAC=m
-CONFIG_DS4424=m
-CONFIG_LTC1660=m
-CONFIG_LTC2632=m
-CONFIG_M62332=m
-# CONFIG_MAX517 is not set
-# CONFIG_MAX5821 is not set
-# CONFIG_MCP4725 is not set
-# CONFIG_MCP4922 is not set
-CONFIG_TI_DAC082S085=m
-CONFIG_TI_DAC5571=m
-CONFIG_TI_DAC7311=m
-CONFIG_TI_DAC7612=m
-# CONFIG_VF610_DAC is not set
-# end of Digital to analog converters
-
-#
-# IIO dummy driver
-#
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-# end of IIO dummy driver
-
-#
-# Frequency Synthesizers DDS/PLL
-#
-
-#
-# Clock Generator/Distribution
-#
-# CONFIG_AD9523 is not set
-# end of Clock Generator/Distribution
-
-#
-# Phase-Locked Loop (PLL) frequency synthesizers
-#
-# CONFIG_ADF4350 is not set
-CONFIG_ADF4371=m
-# end of Phase-Locked Loop (PLL) frequency synthesizers
-# end of Frequency Synthesizers DDS/PLL
-
-#
-# Digital gyroscope sensors
-#
-# CONFIG_ADIS16080 is not set
-# CONFIG_ADIS16130 is not set
-# CONFIG_ADIS16136 is not set
-# CONFIG_ADIS16260 is not set
-# CONFIG_ADXRS450 is not set
-# CONFIG_BMG160 is not set
-CONFIG_FXAS21002C=m
-CONFIG_FXAS21002C_I2C=m
-CONFIG_FXAS21002C_SPI=m
-CONFIG_HID_SENSOR_GYRO_3D=m
-CONFIG_MPU3050=m
-CONFIG_MPU3050_I2C=m
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_ITG3200 is not set
-# end of Digital gyroscope sensors
-
-#
-# Health Sensors
-#
-
-#
-# Heart Rate Monitors
-#
-CONFIG_AFE4403=m
-CONFIG_AFE4404=m
-CONFIG_MAX30100=m
-CONFIG_MAX30102=m
-# end of Heart Rate Monitors
-# end of Health Sensors
-
-#
-# Humidity sensors
-#
-CONFIG_AM2315=m
-# CONFIG_DHT11 is not set
-CONFIG_HDC100X=m
-CONFIG_HID_SENSOR_HUMIDITY=m
-CONFIG_HTS221=m
-CONFIG_HTS221_I2C=m
-CONFIG_HTS221_SPI=m
-CONFIG_HTU21=m
-# CONFIG_SI7005 is not set
-# CONFIG_SI7020 is not set
-# end of Humidity sensors
-
-#
-# Inertial measurement units
-#
-# CONFIG_ADIS16400 is not set
-CONFIG_ADIS16460=m
-CONFIG_ADIS16475=m
-# CONFIG_ADIS16480 is not set
-CONFIG_BMI160=m
-CONFIG_BMI160_I2C=m
-CONFIG_BMI160_SPI=m
-CONFIG_FXOS8700=m
-CONFIG_FXOS8700_I2C=m
-CONFIG_FXOS8700_SPI=m
-CONFIG_KMX61=m
-CONFIG_INV_ICM42600=m
-CONFIG_INV_ICM42600_I2C=m
-CONFIG_INV_ICM42600_SPI=m
-CONFIG_INV_MPU6050_IIO=m
-CONFIG_INV_MPU6050_I2C=m
-CONFIG_INV_MPU6050_SPI=m
-CONFIG_IIO_ST_LSM6DSX=m
-CONFIG_IIO_ST_LSM6DSX_I2C=m
-CONFIG_IIO_ST_LSM6DSX_SPI=m
-CONFIG_IIO_ST_LSM6DSX_I3C=m
-# end of Inertial measurement units
-
-CONFIG_IIO_ADIS_LIB=m
-CONFIG_IIO_ADIS_LIB_BUFFER=y
-
-#
-# Light sensors
-#
-# CONFIG_ACPI_ALS is not set
-# CONFIG_ADJD_S311 is not set
-CONFIG_ADUX1020=m
-CONFIG_AL3010=m
-# CONFIG_AL3320A is not set
-# CONFIG_APDS9300 is not set
-CONFIG_APDS9960=m
-# CONFIG_BH1750 is not set
-# CONFIG_BH1780 is not set
-# CONFIG_CM32181 is not set
-CONFIG_CM3232=m
-CONFIG_CM3323=m
-CONFIG_CM3605=m
-# CONFIG_CM36651 is not set
-CONFIG_IIO_CROS_EC_LIGHT_PROX=m
-CONFIG_GP2AP002=m
-# CONFIG_GP2AP020A00F is not set
-CONFIG_IQS621_ALS=m
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-# CONFIG_ISL29125 is not set
-CONFIG_HID_SENSOR_ALS=m
-CONFIG_HID_SENSOR_PROX=m
-CONFIG_JSA1212=m
-CONFIG_RPR0521=m
-# CONFIG_SENSORS_LM3533 is not set
-# CONFIG_LTR501 is not set
-CONFIG_LV0104CS=m
-# CONFIG_MAX44000 is not set
-CONFIG_MAX44009=m
-CONFIG_NOA1305=m
-CONFIG_OPT3001=m
-CONFIG_PA12203001=m
-CONFIG_SI1133=m
-CONFIG_SI1145=m
-# CONFIG_STK3310 is not set
-CONFIG_ST_UVIS25=m
-CONFIG_ST_UVIS25_I2C=m
-CONFIG_ST_UVIS25_SPI=m
-# CONFIG_TCS3414 is not set
-# CONFIG_TCS3472 is not set
-# CONFIG_SENSORS_TSL2563 is not set
-# CONFIG_TSL2583 is not set
-CONFIG_TSL2772=m
-# CONFIG_TSL4531 is not set
-CONFIG_US5182D=m
-# CONFIG_VCNL4000 is not set
-CONFIG_VCNL4035=m
-CONFIG_VEML6030=m
-# CONFIG_VEML6070 is not set
-CONFIG_VL6180=m
-CONFIG_ZOPT2201=m
-# end of Light sensors
-
-#
-# Magnetometer sensors
-#
-CONFIG_AK8974=m
-# CONFIG_AK8975 is not set
-# CONFIG_AK09911 is not set
-# CONFIG_BMC150_MAGN_I2C is not set
-# CONFIG_BMC150_MAGN_SPI is not set
-# CONFIG_MAG3110 is not set
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-# CONFIG_MMC35240 is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_SENSORS_HMC5843_I2C is not set
-# CONFIG_SENSORS_HMC5843_SPI is not set
-CONFIG_SENSORS_RM3100=m
-CONFIG_SENSORS_RM3100_I2C=m
-CONFIG_SENSORS_RM3100_SPI=m
-# end of Magnetometer sensors
-
-#
-# Multiplexers
-#
-CONFIG_IIO_MUX=m
-# end of Multiplexers
-
-#
-# Inclinometer sensors
-#
-CONFIG_HID_SENSOR_INCLINOMETER_3D=m
-CONFIG_HID_SENSOR_DEVICE_ROTATION=m
-# end of Inclinometer sensors
-
-#
-# Triggers - standalone
-#
-CONFIG_IIO_HRTIMER_TRIGGER=m
-# CONFIG_IIO_INTERRUPT_TRIGGER is not set
-CONFIG_IIO_TIGHTLOOP_TRIGGER=m
-# CONFIG_IIO_SYSFS_TRIGGER is not set
-# end of Triggers - standalone
-
-#
-# Linear and angular position sensors
-#
-CONFIG_IQS624_POS=m
-# end of Linear and angular position sensors
-
-#
-# Digital potentiometers
-#
-CONFIG_AD5272=m
-# CONFIG_DS1803 is not set
-CONFIG_MAX5432=m
-CONFIG_MAX5481=m
-CONFIG_MAX5487=m
-CONFIG_MCP4018=m
-# CONFIG_MCP4131 is not set
-CONFIG_MCP4531=m
-CONFIG_MCP41010=m
-CONFIG_TPL0102=m
-# end of Digital potentiometers
-
-#
-# Digital potentiostats
-#
-CONFIG_LMP91000=m
-# end of Digital potentiostats
-
-#
-# Pressure sensors
-#
-CONFIG_ABP060MG=m
-CONFIG_BMP280=m
-CONFIG_BMP280_I2C=m
-CONFIG_BMP280_SPI=m
-CONFIG_IIO_CROS_EC_BARO=m
-CONFIG_DLHL60D=m
-CONFIG_DPS310=m
-CONFIG_HID_SENSOR_PRESS=m
-# CONFIG_HP03 is not set
-CONFIG_ICP10100=m
-CONFIG_MPL115=m
-CONFIG_MPL115_I2C=m
-CONFIG_MPL115_SPI=m
-# CONFIG_MPL3115 is not set
-# CONFIG_MS5611 is not set
-CONFIG_MS5637=m
-CONFIG_IIO_ST_PRESS=m
-CONFIG_IIO_ST_PRESS_I2C=m
-CONFIG_IIO_ST_PRESS_SPI=m
-# CONFIG_T5403 is not set
-# CONFIG_HP206C is not set
-CONFIG_ZPA2326=m
-CONFIG_ZPA2326_I2C=m
-CONFIG_ZPA2326_SPI=m
-# end of Pressure sensors
-
-#
-# Lightning sensors
-#
-# CONFIG_AS3935 is not set
-# end of Lightning sensors
-
-#
-# Proximity and distance sensors
-#
-CONFIG_ISL29501=m
-CONFIG_LIDAR_LITE_V2=m
-CONFIG_MB1232=m
-CONFIG_PING=m
-CONFIG_RFD77402=m
-CONFIG_SRF04=m
-CONFIG_SX9310=m
-CONFIG_SX9500=m
-CONFIG_SRF08=m
-CONFIG_VCNL3020=m
-CONFIG_VL53L0X_I2C=m
-# end of Proximity and distance sensors
-
-#
-# Resolver to digital converters
-#
-# CONFIG_AD2S90 is not set
-# CONFIG_AD2S1200 is not set
-# end of Resolver to digital converters
-
-#
-# Temperature sensors
-#
-CONFIG_IQS620AT_TEMP=m
-CONFIG_LTC2983=m
-CONFIG_MAXIM_THERMOCOUPLE=m
-CONFIG_HID_SENSOR_TEMP=m
-# CONFIG_MLX90614 is not set
-CONFIG_MLX90632=m
-# CONFIG_TMP006 is not set
-CONFIG_TMP007=m
-CONFIG_TSYS01=m
-CONFIG_TSYS02D=m
-CONFIG_MAX31856=m
-# end of Temperature sensors
-
-CONFIG_NTB=y
-CONFIG_NTB_MSI=y
-CONFIG_NTB_IDT=m
-CONFIG_NTB_SWITCHTEC=m
-# CONFIG_NTB_PINGPONG is not set
-# CONFIG_NTB_TOOL is not set
-CONFIG_NTB_PERF=m
-# CONFIG_NTB_MSI_TEST is not set
-CONFIG_NTB_TRANSPORT=m
-# CONFIG_VME_BUS is not set
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
-# CONFIG_PWM_DEBUG is not set
-CONFIG_PWM_ATMEL_HLCDC_PWM=m
-CONFIG_PWM_BCM_IPROC=m
-CONFIG_PWM_BCM2835=m
-CONFIG_PWM_BERLIN=m
-CONFIG_PWM_BRCMSTB=m
-CONFIG_PWM_CROS_EC=m
-# CONFIG_PWM_FSL_FTM is not set
-CONFIG_PWM_HIBVT=m
-# CONFIG_PWM_IMX1 is not set
-# CONFIG_PWM_IMX27 is not set
-CONFIG_PWM_IMX_TPM=m
-CONFIG_PWM_IQS620A=m
-CONFIG_PWM_LP3943=m
-CONFIG_PWM_MESON=m
-CONFIG_PWM_MTK_DISP=m
-CONFIG_PWM_MEDIATEK=m
-# CONFIG_PWM_PCA9685 is not set
-CONFIG_PWM_ROCKCHIP=m
-CONFIG_PWM_SAMSUNG=m
-CONFIG_PWM_SPRD=m
-CONFIG_PWM_SUN4I=m
-CONFIG_PWM_TEGRA=m
-CONFIG_PWM_ZX=m
-
-#
-# IRQ chip support
-#
-CONFIG_IRQCHIP=y
-CONFIG_ARM_GIC=y
-CONFIG_ARM_GIC_PM=y
-CONFIG_ARM_GIC_MAX_NR=1
-CONFIG_ARM_GIC_V2M=y
-CONFIG_ARM_GIC_V3=y
-CONFIG_ARM_GIC_V3_ITS=y
-CONFIG_ARM_GIC_V3_ITS_PCI=y
-CONFIG_ARM_GIC_V3_ITS_FSL_MC=y
-CONFIG_ALPINE_MSI=y
-CONFIG_AL_FIC=y
-CONFIG_BCM7038_L1_IRQ=y
-CONFIG_BRCMSTB_L2_IRQ=y
-CONFIG_DW_APB_ICTL=y
-CONFIG_HISILICON_IRQ_MBIGEN=y
-CONFIG_MADERA_IRQ=m
-CONFIG_IMX_GPCV2=y
-CONFIG_MVEBU_GICP=y
-CONFIG_MVEBU_ICU=y
-CONFIG_MVEBU_ODMI=y
-CONFIG_MVEBU_PIC=y
-CONFIG_MVEBU_SEI=y
-CONFIG_LS_EXTIRQ=y
-CONFIG_LS_SCFG_MSI=y
-CONFIG_PARTITION_PERCPU=y
-CONFIG_QCOM_IRQ_COMBINER=y
-CONFIG_MESON_IRQ_GPIO=y
-CONFIG_QCOM_PDC=y
-CONFIG_IMX_IRQSTEER=y
-CONFIG_IMX_INTMUX=y
-# end of IRQ chip support
-
-CONFIG_IPACK_BUS=m
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
-CONFIG_ARCH_HAS_RESET_CONTROLLER=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_RESET_BERLIN=y
-CONFIG_RESET_BRCMSTB=m
-CONFIG_RESET_BRCMSTB_RESCAL=y
-CONFIG_RESET_IMX7=y
-# CONFIG_RESET_INTEL_GW is not set
-CONFIG_RESET_MESON=y
-CONFIG_RESET_MESON_AUDIO_ARB=m
-CONFIG_RESET_QCOM_AOSS=y
-CONFIG_RESET_QCOM_PDC=m
-CONFIG_RESET_SCMI=m
-CONFIG_RESET_SIMPLE=y
-CONFIG_RESET_SUNXI=y
-CONFIG_RESET_TI_SYSCON=m
-CONFIG_COMMON_RESET_HI3660=m
-CONFIG_COMMON_RESET_HI6220=m
-CONFIG_RESET_TEGRA_BPMP=y
-
-#
-# PHY Subsystem
-#
-CONFIG_GENERIC_PHY=y
-CONFIG_GENERIC_PHY_MIPI_DPHY=y
-CONFIG_PHY_XGENE=m
-CONFIG_PHY_SUN4I_USB=m
-CONFIG_PHY_SUN6I_MIPI_DPHY=m
-CONFIG_PHY_SUN9I_USB=m
-CONFIG_PHY_SUN50I_USB3=m
-CONFIG_PHY_MESON8B_USB2=m
-CONFIG_PHY_MESON_GXL_USB2=m
-CONFIG_PHY_MESON_G12A_USB2=m
-CONFIG_PHY_MESON_G12A_USB3_PCIE=m
-CONFIG_PHY_MESON_AXG_PCIE=m
-CONFIG_PHY_MESON_AXG_MIPI_PCIE_ANALOG=m
-CONFIG_PHY_BCM_SR_USB=m
-CONFIG_BCM_KONA_USB2_PHY=m
-CONFIG_PHY_BCM_NS_USB2=m
-CONFIG_PHY_BCM_NS_USB3=m
-CONFIG_PHY_NS2_PCIE=m
-CONFIG_PHY_NS2_USB_DRD=m
-CONFIG_PHY_BRCM_SATA=m
-CONFIG_PHY_BRCM_USB=m
-CONFIG_PHY_BCM_SR_PCIE=m
-CONFIG_PHY_CADENCE_TORRENT=m
-CONFIG_PHY_CADENCE_DPHY=m
-CONFIG_PHY_CADENCE_SIERRA=m
-CONFIG_PHY_CADENCE_SALVO=m
-CONFIG_PHY_FSL_IMX8MQ_USB=m
-CONFIG_PHY_MIXEL_MIPI_DPHY=m
-CONFIG_PHY_HI6220_USB=m
-CONFIG_PHY_HI3660_USB=m
-CONFIG_PHY_HISTB_COMBPHY=m
-CONFIG_PHY_HISI_INNO_USB2=m
-CONFIG_PHY_BERLIN_SATA=m
-CONFIG_PHY_BERLIN_USB=m
-CONFIG_PHY_MVEBU_A3700_COMPHY=m
-CONFIG_PHY_MVEBU_A3700_UTMI=m
-CONFIG_PHY_MVEBU_A38X_COMPHY=m
-CONFIG_PHY_MVEBU_CP110_COMPHY=m
-CONFIG_PHY_PXA_28NM_HSIC=m
-CONFIG_PHY_PXA_28NM_USB2=m
-CONFIG_PHY_MTK_TPHY=m
-CONFIG_PHY_MTK_UFS=m
-CONFIG_PHY_MTK_XSPHY=m
-CONFIG_PHY_CPCAP_USB=m
-CONFIG_PHY_MAPPHONE_MDM6600=m
-CONFIG_PHY_OCELOT_SERDES=m
-CONFIG_PHY_QCOM_APQ8064_SATA=m
-CONFIG_PHY_QCOM_IPQ4019_USB=m
-CONFIG_PHY_QCOM_IPQ806X_SATA=m
-CONFIG_PHY_QCOM_PCIE2=m
-CONFIG_PHY_QCOM_QMP=m
-CONFIG_PHY_QCOM_QUSB2=m
-CONFIG_PHY_QCOM_USB_HS=m
-CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=m
-CONFIG_PHY_QCOM_USB_HSIC=m
-CONFIG_PHY_QCOM_USB_HS_28NM=m
-CONFIG_PHY_QCOM_USB_SS=m
-CONFIG_PHY_QCOM_IPQ806X_USB=m
-CONFIG_PHY_ROCKCHIP_DP=m
-CONFIG_PHY_ROCKCHIP_EMMC=m
-CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
-CONFIG_PHY_ROCKCHIP_INNO_USB2=m
-CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
-CONFIG_PHY_ROCKCHIP_PCIE=m
-CONFIG_PHY_ROCKCHIP_TYPEC=m
-CONFIG_PHY_ROCKCHIP_USB=m
-CONFIG_PHY_EXYNOS_DP_VIDEO=m
-CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
-CONFIG_PHY_EXYNOS_PCIE=y
-CONFIG_PHY_SAMSUNG_UFS=m
-# CONFIG_PHY_SAMSUNG_USB2 is not set
-# CONFIG_PHY_EXYNOS5_USBDRD is not set
-CONFIG_PHY_TEGRA_XUSB=m
-CONFIG_PHY_TEGRA194_P2U=m
-# CONFIG_PHY_TUSB1210 is not set
-CONFIG_PHY_XILINX_ZYNQMP=m
-# end of PHY Subsystem
-
-CONFIG_POWERCAP=y
-CONFIG_IDLE_INJECT=y
-# CONFIG_MCB is not set
-
-#
-# Performance monitor support
-#
-CONFIG_ARM_CCI_PMU=y
-CONFIG_ARM_CCI400_PMU=y
-CONFIG_ARM_CCI5xx_PMU=y
-CONFIG_ARM_CCN=y
-CONFIG_ARM_PMU=y
-CONFIG_ARM_PMU_ACPI=y
-CONFIG_ARM_SMMU_V3_PMU=m
-CONFIG_ARM_DSU_PMU=m
-CONFIG_FSL_IMX8_DDR_PMU=m
-CONFIG_QCOM_L2_PMU=y
-CONFIG_QCOM_L3_PMU=y
-CONFIG_THUNDERX2_PMU=m
-CONFIG_XGENE_PMU=y
-CONFIG_ARM_SPE_PMU=m
-CONFIG_HISI_PMU=y
-# end of Performance monitor support
-
-CONFIG_RAS=y
-CONFIG_USB4=m
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-# end of Android
-
-CONFIG_LIBNVDIMM=m
-CONFIG_BLK_DEV_PMEM=m
-CONFIG_ND_BLK=m
-CONFIG_ND_CLAIM=y
-CONFIG_ND_BTT=m
-CONFIG_BTT=y
-CONFIG_ND_PFN=m
-CONFIG_NVDIMM_PFN=y
-CONFIG_NVDIMM_DAX=y
-CONFIG_OF_PMEM=m
-CONFIG_NVDIMM_KEYS=y
-CONFIG_DAX_DRIVER=y
-CONFIG_DAX=y
-CONFIG_DEV_DAX=m
-CONFIG_DEV_DAX_PMEM=m
-CONFIG_DEV_DAX_HMEM=m
-CONFIG_DEV_DAX_KMEM=m
-CONFIG_DEV_DAX_PMEM_COMPAT=m
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-CONFIG_NVMEM_IMX_IIM=m
-CONFIG_NVMEM_IMX_OCOTP=m
-CONFIG_NVMEM_IMX_OCOTP_SCU=m
-CONFIG_MTK_EFUSE=m
-CONFIG_QCOM_QFPROM=m
-CONFIG_NVMEM_SPMI_SDAM=m
-CONFIG_ROCKCHIP_EFUSE=m
-CONFIG_ROCKCHIP_OTP=m
-CONFIG_NVMEM_BCM_OCOTP=m
-CONFIG_NVMEM_SUNXI_SID=m
-CONFIG_MESON_EFUSE=m
-# CONFIG_MESON_MX_EFUSE is not set
-CONFIG_NVMEM_SNVS_LPGPR=m
-CONFIG_SC27XX_EFUSE=m
-CONFIG_NVMEM_ZYNQMP=y
-CONFIG_SPRD_EFUSE=m
-
-#
-# HW tracing support
-#
-CONFIG_STM=y
-CONFIG_STM_PROTO_BASIC=m
-CONFIG_STM_PROTO_SYS_T=m
-# CONFIG_STM_DUMMY is not set
-CONFIG_STM_SOURCE_CONSOLE=y
-# CONFIG_STM_SOURCE_HEARTBEAT is not set
-CONFIG_STM_SOURCE_FTRACE=m
-# CONFIG_INTEL_TH is not set
-# end of HW tracing support
-
-CONFIG_FPGA=m
-CONFIG_ALTERA_PR_IP_CORE=m
-CONFIG_ALTERA_PR_IP_CORE_PLAT=m
-CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
-CONFIG_FPGA_MGR_ALTERA_CVP=m
-CONFIG_FPGA_MGR_STRATIX10_SOC=m
-CONFIG_FPGA_MGR_XILINX_SPI=m
-CONFIG_FPGA_MGR_ICE40_SPI=m
-CONFIG_FPGA_MGR_MACHXO2_SPI=m
-CONFIG_FPGA_BRIDGE=m
-CONFIG_ALTERA_FREEZE_BRIDGE=m
-CONFIG_XILINX_PR_DECOUPLER=m
-CONFIG_FPGA_REGION=m
-CONFIG_OF_FPGA_REGION=m
-CONFIG_FPGA_DFL=m
-CONFIG_FPGA_DFL_FME=m
-CONFIG_FPGA_DFL_FME_MGR=m
-CONFIG_FPGA_DFL_FME_BRIDGE=m
-CONFIG_FPGA_DFL_FME_REGION=m
-CONFIG_FPGA_DFL_AFU=m
-CONFIG_FPGA_DFL_PCI=m
-CONFIG_FPGA_MGR_ZYNQMP_FPGA=m
-# CONFIG_FSI is not set
-CONFIG_TEE=m
-
-#
-# TEE drivers
-#
-# CONFIG_OPTEE is not set
-# end of TEE drivers
-
-CONFIG_MULTIPLEXER=m
-
-#
-# Multiplexer drivers
-#
-CONFIG_MUX_ADG792A=m
-CONFIG_MUX_ADGS1408=m
-CONFIG_MUX_GPIO=m
-CONFIG_MUX_MMIO=m
-# end of Multiplexer drivers
-
-CONFIG_PM_OPP=y
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-CONFIG_INTERCONNECT=y
-CONFIG_INTERCONNECT_IMX=m
-CONFIG_INTERCONNECT_IMX8MM=m
-CONFIG_INTERCONNECT_IMX8MN=m
-CONFIG_INTERCONNECT_IMX8MQ=m
-# CONFIG_INTERCONNECT_QCOM is not set
-# CONFIG_COUNTER is not set
-# CONFIG_MOST is not set
-# end of Device Drivers
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-CONFIG_VALIDATE_FS_PARSER=y
-CONFIG_FS_IOMAP=y
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT2=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=y
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-# CONFIG_OCFS2_DEBUG_MASKLOG is not set
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_FS_REF_VERIFY is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-# CONFIG_F2FS_CHECK_FS is not set
-# CONFIG_F2FS_IO_TRACE is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_COMPRESSION is not set
-CONFIG_ZONEFS_FS=m
-CONFIG_FS_DAX=y
-CONFIG_FS_DAX_PMD=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_EXPORTFS_BLOCK_OPS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_MANDATORY_FILE_LOCKING=y
-CONFIG_FS_ENCRYPTION=y
-CONFIG_FS_ENCRYPTION_ALGS=y
-CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_AUTOFS_FS=y
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_VIRTIO_FS=m
-CONFIG_OVERLAY_FS=m
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
-# CONFIG_OVERLAY_FS_INDEX is not set
-# CONFIG_OVERLAY_FS_XINO_AUTO is not set
-# CONFIG_OVERLAY_FS_METACOPY is not set
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-CONFIG_FSCACHE_OBJECT_LIST=y
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/EXFAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_DEFAULT_UTF8 is not set
-CONFIG_EXFAT_FS=m
-CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
-# end of DOS/FAT/EXFAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_VMCORE=y
-# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_PROC_CHILDREN=y
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_TMPFS_INODE64=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_EFIVAR_FS=m
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ORANGEFS_FS is not set
-# CONFIG_ADFS_FS is not set
-CONFIG_AFFS_FS=m
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-# CONFIG_UBIFS_FS is not set
-CONFIG_CRAMFS=m
-CONFIG_CRAMFS_BLOCKDEV=y
-CONFIG_CRAMFS_MTD=y
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_FILE_CACHE=y
-# CONFIG_SQUASHFS_FILE_DIRECT is not set
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_ZSTD=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-CONFIG_HPFS_FS=m
-# CONFIG_QNX4FS_FS is not set
-CONFIG_QNX6FS_FS=m
-# CONFIG_QNX6FS_DEBUG is not set
-CONFIG_ROMFS_FS=m
-# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
-# CONFIG_ROMFS_BACKED_BY_MTD is not set
-CONFIG_ROMFS_BACKED_BY_BOTH=y
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_ROMFS_ON_MTD=y
-CONFIG_PSTORE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=m
-# CONFIG_PSTORE_LZO_COMPRESS is not set
-# CONFIG_PSTORE_LZ4_COMPRESS is not set
-CONFIG_PSTORE_LZ4HC_COMPRESS=m
-# CONFIG_PSTORE_842_COMPRESS is not set
-CONFIG_PSTORE_ZSTD_COMPRESS=y
-CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
-# CONFIG_PSTORE_LZ4HC_COMPRESS_DEFAULT is not set
-# CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT is not set
-CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EROFS_FS=m
-# CONFIG_EROFS_FS_DEBUG is not set
-CONFIG_EROFS_FS_XATTR=y
-CONFIG_EROFS_FS_POSIX_ACL=y
-CONFIG_EROFS_FS_SECURITY=y
-CONFIG_EROFS_FS_ZIP=y
-CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-CONFIG_NFS_SWAP=y
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-# CONFIG_NFS_V4_1_MIGRATION is not set
-CONFIG_NFS_V4_SECURITY_LABEL=y
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFS_DEBUG=y
-CONFIG_NFS_DISABLE_UDP_SUPPORT=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_BLOCKLAYOUT=y
-CONFIG_NFSD_SCSILAYOUT=y
-CONFIG_NFSD_FLEXFILELAYOUT=y
-CONFIG_NFSD_V4_2_INTER_SSC=y
-CONFIG_NFSD_V4_SECURITY_LABEL=y
-CONFIG_GRACE_PERIOD=m
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_SUNRPC_SWAP=y
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
-CONFIG_SUNRPC_DEBUG=y
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-# CONFIG_CEPH_FS_SECURITY_LABEL is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-CONFIG_CIFS_WEAK_PW_HASH=y
-CONFIG_CIFS_UPCALL=y
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
-CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_SMB_DIRECT is not set
-CONFIG_CIFS_FSCACHE=y
-CONFIG_CODA_FS=m
-# CONFIG_AFS_FS is not set
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-CONFIG_9P_FS_SECURITY=y
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-CONFIG_DLM_DEBUG=y
-CONFIG_UNICODE=y
-# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
-CONFIG_IO_WQ=y
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_KEYS_REQUEST_CACHE is not set
-CONFIG_PERSISTENT_KEYRINGS=y
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=y
-CONFIG_KEY_DH_OPERATIONS=y
-CONFIG_KEY_NOTIFICATIONS=y
-CONFIG_SECURITY_DMESG_RESTRICT=y
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_INFINIBAND is not set
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-CONFIG_FORTIFY_SOURCE=y
-# CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_HASH=y
-CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
-# CONFIG_SECURITY_APPARMOR_DEBUG is not set
-# CONFIG_SECURITY_LOADPIN is not set
-CONFIG_SECURITY_YAMA=y
-# CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-CONFIG_INTEGRITY=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_AUDIT=y
-# CONFIG_IMA is not set
-# CONFIG_EVM is not set
-CONFIG_DEFAULT_SECURITY_APPARMOR=y
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_LSM="yama,loadpin,safesetid,integrity"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_SKCIPHER=y
-CONFIG_CRYPTO_SKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_SIMD=m
-CONFIG_CRYPTO_ENGINE=m
-
-#
-# Public-key cryptography
-#
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECC=m
-CONFIG_CRYPTO_ECDH=m
-CONFIG_CRYPTO_ECRDSA=m
-CONFIG_CRYPTO_CURVE25519=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_AEGIS128 is not set
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CFB=m
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_OFB=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
-CONFIG_CRYPTO_NHPOLY1305=m
-CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_ESSIV=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_XXHASH=m
-CONFIG_CRYPTO_BLAKE2B=m
-CONFIG_CRYPTO_BLAKE2S=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_GHASH=y
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_STREEBOG=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_TI=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_842=y
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-CONFIG_CRYPTO_ZSTD=y
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=y
-CONFIG_CRYPTO_DRBG_HMAC=y
-CONFIG_CRYPTO_DRBG_HASH=y
-CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_DRBG=y
-CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
-CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_ALLWINNER=y
-CONFIG_CRYPTO_DEV_SUN4I_SS=m
-CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
-CONFIG_CRYPTO_DEV_SUN8I_CE=m
-# CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG is not set
-CONFIG_CRYPTO_DEV_SUN8I_SS=m
-# CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG is not set
-CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON=m
-CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
-CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC=m
-CONFIG_CRYPTO_DEV_FSL_CAAM=m
-# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
-CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
-CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
-CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=255
-CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=2048
-CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
-CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
-CONFIG_CRYPTO_DEV_SAHARA=m
-CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
-CONFIG_CRYPTO_DEV_S5P=m
-CONFIG_CRYPTO_DEV_ATMEL_I2C=m
-CONFIG_CRYPTO_DEV_ATMEL_ECC=m
-CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_SP_CCP=y
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
-CONFIG_CRYPTO_DEV_MXS_DCP=m
-CONFIG_CRYPTO_DEV_CPT=m
-CONFIG_CAVIUM_CPT=m
-CONFIG_CRYPTO_DEV_NITROX=m
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
-CONFIG_CRYPTO_DEV_MARVELL=m
-CONFIG_CRYPTO_DEV_MARVELL_CESA=m
-CONFIG_CRYPTO_DEV_OCTEONTX_CPT=m
-CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m
-CONFIG_CRYPTO_DEV_QCE=m
-CONFIG_CRYPTO_DEV_QCE_SKCIPHER=y
-CONFIG_CRYPTO_DEV_QCE_SHA=y
-CONFIG_CRYPTO_DEV_QCE_ENABLE_ALL=y
-# CONFIG_CRYPTO_DEV_QCE_ENABLE_SKCIPHER is not set
-# CONFIG_CRYPTO_DEV_QCE_ENABLE_SHA is not set
-CONFIG_CRYPTO_DEV_QCE_SW_MAX_LEN=512
-CONFIG_CRYPTO_DEV_QCOM_RNG=m
-CONFIG_CRYPTO_DEV_ROCKCHIP=m
-CONFIG_CRYPTO_DEV_ZYNQMP_AES=m
-CONFIG_CRYPTO_DEV_CHELSIO=m
-CONFIG_CHELSIO_IPSEC_INLINE=y
-CONFIG_CHELSIO_TLS_DEVICE=y
-CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DEV_BCM_SPU=m
-CONFIG_CRYPTO_DEV_SAFEXCEL=m
-CONFIG_CRYPTO_DEV_CCREE=m
-CONFIG_CRYPTO_DEV_HISI_SEC=m
-CONFIG_CRYPTO_DEV_HISI_SEC2=m
-CONFIG_CRYPTO_DEV_HISI_QM=m
-CONFIG_CRYPTO_DEV_HISI_ZIP=m
-CONFIG_CRYPTO_DEV_HISI_HPRE=m
-CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
-# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set
-CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
-CONFIG_X509_CERTIFICATE_PARSER=y
-CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
-CONFIG_TPM_KEY_PARSER=m
-CONFIG_PKCS7_MESSAGE_PARSER=y
-# CONFIG_PKCS7_TEST_KEY is not set
-CONFIG_SIGNED_PE_FILE_VERIFICATION=y
-
-#
-# Certificates for signature checking
-#
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
-# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# end of Certificates for signature checking
-
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_RAID6_PQ_BENCHMARK=y
-CONFIG_LINEAR_RANGES=y
-CONFIG_PACKING=y
-CONFIG_BITREVERSE=y
-CONFIG_HAVE_ARCH_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_CORDIC=m
-# CONFIG_PRIME_NUMBERS is not set
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_STMP_DEVICE=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
-CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
-CONFIG_INDIRECT_PIO=y
-CONFIG_CRC_CCITT=y
-CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=m
-CONFIG_CRC4=m
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_XXHASH=y
-CONFIG_AUDIT_GENERIC=y
-CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
-CONFIG_AUDIT_COMPAT_GENERIC=y
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_842_COMPRESS=y
-CONFIG_842_DECOMPRESS=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMPRESS=y
-CONFIG_ZSTD_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_DECOMPRESS_ZSTD=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_BCH=m
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_INTERVAL_TREE=y
-CONFIG_XARRAY_MULTI=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_DMA_OPS=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_DMA_DECLARE_COHERENT=y
-CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
-CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
-CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
-CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
-CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
-CONFIG_DMA_VIRT_OPS=y
-CONFIG_SWIOTLB=y
-CONFIG_DMA_NONCOHERENT_MMAP=y
-CONFIG_DMA_COHERENT_POOL=y
-CONFIG_DMA_REMAP=y
-CONFIG_DMA_DIRECT_REMAP=y
-CONFIG_DMA_CMA=y
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=0
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
-CONFIG_CLZ_TAB=y
-CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
-CONFIG_LIBFDT=y
-CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
-CONFIG_HAVE_GENERIC_VDSO=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_GENERIC_VDSO_TIME_NS=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_6x10 is not set
-# CONFIG_FONT_10x18 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-CONFIG_FONT_TER16x32=y
-CONFIG_SG_SPLIT=y
-CONFIG_SG_POOL=y
-CONFIG_ARCH_HAS_PMEM_API=y
-CONFIG_MEMREGION=y
-CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
-CONFIG_STACKDEPOT=y
-CONFIG_SBITMAP=y
-CONFIG_PARMAN=m
-CONFIG_OBJAGG=m
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-CONFIG_PLDMFW=y
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=4
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DYNAMIC_DEBUG_CORE=y
-CONFIG_SYMBOLIC_ERRNAME=y
-CONFIG_DEBUG_BUGVERBOSE=y
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_DEBUG_INFO_COMPRESSED is not set
-# CONFIG_DEBUG_INFO_SPLIT is not set
-# CONFIG_DEBUG_INFO_DWARF4 is not set
-CONFIG_DEBUG_INFO_BTF=y
-# CONFIG_GDB_SCRIPTS is not set
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=2048
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_READABLE_ASM is not set
-# CONFIG_HEADERS_INSTALL is not set
-CONFIG_DEBUG_SECTION_MISMATCH=y
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
-# end of Compile-time checks and compiler options
-
-#
-# Generic Kernel Debugging Instruments
-#
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
-CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_FS_ALLOW_ALL=y
-# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
-# CONFIG_DEBUG_FS_ALLOW_NONE is not set
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_KGDB=y
-CONFIG_KGDB_SERIAL_CONSOLE=y
-# CONFIG_KGDB_TESTS is not set
-CONFIG_KGDB_KDB=y
-CONFIG_KDB_DEFAULT_ENABLE=0x1
-CONFIG_KDB_KEYBOARD=y
-CONFIG_KDB_CONTINUE_CATASTROPHIC=0
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_UBSAN is not set
-# end of Generic Kernel Debugging Instruments
-
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-CONFIG_PAGE_EXTENSION=y
-# CONFIG_DEBUG_PAGEALLOC is not set
-CONFIG_PAGE_OWNER=y
-CONFIG_PAGE_POISONING=y
-CONFIG_PAGE_POISONING_NO_SANITY=y
-CONFIG_PAGE_POISONING_ZERO=y
-# CONFIG_DEBUG_PAGE_REF is not set
-# CONFIG_DEBUG_RODATA_TEST is not set
-CONFIG_ARCH_HAS_DEBUG_WX=y
-CONFIG_DEBUG_WX=y
-CONFIG_GENERIC_PTDUMP=y
-CONFIG_PTDUMP_CORE=y
-# CONFIG_PTDUMP_DEBUGFS is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-CONFIG_SCHED_STACK_END_CHECK=y
-CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VM_PGTABLE is not set
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_ARCH_KASAN=y
-CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
-CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
-# CONFIG_KASAN is not set
-# end of Memory Debugging
-
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Oops, Lockups and Hangs
-#
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_SOFTLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-# CONFIG_WQ_WATCHDOG is not set
-# CONFIG_TEST_LOCKUP is not set
-# end of Debug Oops, Lockups and Hangs
-
-#
-# Scheduler Debugging
-#
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-CONFIG_SCHEDSTATS=y
-# end of Scheduler Debugging
-
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-CONFIG_STACKTRACE=y
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_HAVE_DEBUG_BUGVERBOSE=y
-
-#
-# Debug kernel data structures
-#
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-# end of Debug kernel data structures
-
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-CONFIG_TORTURE_TEST=m
-CONFIG_RCU_PERF_TEST=m
-CONFIG_RCU_TORTURE_TEST=m
-CONFIG_RCU_REF_SCALE_TEST=m
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-CONFIG_RCU_TRACE=y
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-CONFIG_LATENCYTOP=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACER_MAX_TRACE=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_BOOTTIME_TRACING=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_FUNCTION_PROFILER=y
-CONFIG_STACK_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-CONFIG_SCHED_TRACER=y
-CONFIG_HWLAT_TRACER=y
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_TRACER_SNAPSHOT=y
-CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_KPROBE_EVENTS=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_BPF_KPROBE_OVERRIDE=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_TRACING_MAP=y
-CONFIG_SYNTH_EVENTS=y
-CONFIG_HIST_TRIGGERS=y
-# CONFIG_TRACE_EVENT_INJECT is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-CONFIG_RING_BUFFER_BENCHMARK=m
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_SYNTH_EVENT_GEN_TEST is not set
-# CONFIG_KPROBE_EVENT_GEN_TEST is not set
-# CONFIG_HIST_TRIGGERS_DEBUG is not set
-# CONFIG_SAMPLES is not set
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_IO_STRICT_DEVMEM=y
-
-#
-# arm64 Debugging
-#
-CONFIG_PID_IN_CONTEXTIDR=y
-# CONFIG_DEBUG_EFI is not set
-CONFIG_ARM64_RELOC_TEST=m
-CONFIG_CORESIGHT=y
-CONFIG_CORESIGHT_LINKS_AND_SINKS=y
-CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
-CONFIG_CORESIGHT_CATU=y
-CONFIG_CORESIGHT_SINK_TPIU=y
-CONFIG_CORESIGHT_SINK_ETBV10=y
-CONFIG_CORESIGHT_SOURCE_ETM4X=y
-CONFIG_CORESIGHT_STM=y
-CONFIG_CORESIGHT_CPU_DEBUG=m
-CONFIG_CORESIGHT_CTI=y
-# CONFIG_CORESIGHT_CTI_INTEGRATION_REGS is not set
-# end of arm64 Debugging
-
-#
-# Kernel Testing and Coverage
-#
-# CONFIG_KUNIT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-CONFIG_FUNCTION_ERROR_INJECTION=y
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_ARCH_HAS_KCOV=y
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
-CONFIG_RUNTIME_TESTING_MENU=y
-# CONFIG_LKDTM is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_TEST_MIN_HEAP is not set
-# CONFIG_TEST_SORT is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_REED_SOLOMON_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_PERCPU_TEST is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
-# CONFIG_TEST_HEXDUMP is not set
-# CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_STRSCPY is not set
-# CONFIG_TEST_KSTRTOX is not set
-# CONFIG_TEST_PRINTF is not set
-# CONFIG_TEST_BITMAP is not set
-# CONFIG_TEST_BITFIELD is not set
-# CONFIG_TEST_UUID is not set
-# CONFIG_TEST_XARRAY is not set
-# CONFIG_TEST_OVERFLOW is not set
-# CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_HASH is not set
-# CONFIG_TEST_IDA is not set
-# CONFIG_TEST_PARMAN is not set
-# CONFIG_TEST_LKM is not set
-# CONFIG_TEST_BITOPS is not set
-# CONFIG_TEST_VMALLOC is not set
-# CONFIG_TEST_USER_COPY is not set
-# CONFIG_TEST_BPF is not set
-# CONFIG_TEST_BLACKHOLE_DEV is not set
-# CONFIG_FIND_BIT_BENCHMARK is not set
-# CONFIG_TEST_FIRMWARE is not set
-# CONFIG_TEST_SYSCTL is not set
-# CONFIG_TEST_UDELAY is not set
-# CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_TEST_KMOD is not set
-# CONFIG_TEST_MEMCAT_P is not set
-# CONFIG_TEST_OBJAGG is not set
-# CONFIG_TEST_STACKINIT is not set
-# CONFIG_TEST_MEMINIT is not set
-# CONFIG_TEST_HMM is not set
-# CONFIG_TEST_FREE_PAGES is not set
-# CONFIG_MEMTEST is not set
-# end of Kernel Testing and Coverage
-# end of Kernel hacking
diff --git a/srcpkgs/linux5.9/files/i386-dotconfig b/srcpkgs/linux5.9/files/i386-dotconfig
deleted file mode 100644
index 7ae8afd18c65..000000000000
--- a/srcpkgs/linux5.9/files/i386-dotconfig
+++ /dev/null
@@ -1,9855 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.9.12 Kernel Configuration
-#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 9.3.0"
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=234000000
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_TABLE_SORT=y
-CONFIG_THREAD_INFO_IN_TASK=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_1"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT=""
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_HAVE_KERNEL_ZSTD=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-# CONFIG_KERNEL_ZSTD is not set
-CONFIG_DEFAULT_INIT=""
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_WATCH_QUEUE=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-# CONFIG_USELIB is not set
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_GENERIC_IRQ_INJECTION=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_SIM=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
-CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
-# end of IRQ subsystem
-
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_ARCH_CLOCKSOURCE_INIT=y
-CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y
-CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ is not set
-CONFIG_HIGH_RES_TIMERS=y
-# end of Timers subsystem
-
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-CONFIG_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_SCHED_AVG_IRQ=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_PSI=y
-CONFIG_PSI_DEFAULT_DISABLED=y
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
-CONFIG_TASKS_TRACE_RCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKHEADERS=m
-CONFIG_LOG_BUF_SHIFT=19
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-
-#
-# Scheduler features
-#
-# CONFIG_UCLAMP_TASK is not set
-# end of Scheduler features
-
-CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
-CONFIG_CGROUPS=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_HUGETLB=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_TIME_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_RD_ZSTD=y
-CONFIG_BOOT_CONFIG=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_MULTIUSER=y
-CONFIG_SGETMASK_SYSCALL=y
-CONFIG_SYSFS_SYSCALL=y
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_USERFAULTFD=y
-CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLAB_FREELIST_RANDOM=y
-CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_SYSTEM_DATA_VERIFICATION=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-# end of General setup
-
-CONFIG_X86_32=y
-CONFIG_FORCE_DYNAMIC_FTRACE=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf32-i386"
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_BITS_MAX=16
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_BUG=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_32_SMP=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=3
-CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
-
-#
-# Processor type and features
-#
-CONFIG_ZONE_DMA=y
-CONFIG_SMP=y
-CONFIG_X86_FEATURE_NAMES=y
-CONFIG_X86_MPPARSE=y
-# CONFIG_GOLDFISH is not set
-CONFIG_RETPOLINE=y
-CONFIG_X86_CPU_RESCTRL=y
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_INTEL_LPSS=y
-CONFIG_X86_AMD_PLATFORM_DEVICE=y
-CONFIG_IOSF_MBI=y
-# CONFIG_IOSF_MBI_DEBUG is not set
-# CONFIG_X86_32_IRIS is not set
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-CONFIG_X86_HV_CALLBACK_VECTOR=y
-# CONFIG_XEN is not set
-CONFIG_KVM_GUEST=y
-CONFIG_ARCH_CPUIDLE_HALTPOLL=y
-# CONFIG_PVH is not set
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
-CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_M486SX is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-CONFIG_M686=y
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MELAN is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-# CONFIG_X86_GENERIC is not set
-CONFIG_X86_INTERNODE_CACHE_SHIFT=5
-CONFIG_X86_L1_CACHE_SHIFT=5
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=6
-CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_IA32_FEAT_CTL=y
-CONFIG_X86_VMX_FEATURE_NAMES=y
-# CONFIG_PROCESSOR_SELECT is not set
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_CYRIX_32=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_HYGON=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
-CONFIG_CPU_SUP_ZHAOXIN=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_NR_CPUS_RANGE_BEGIN=2
-CONFIG_NR_CPUS_RANGE_END=8
-CONFIG_NR_CPUS_DEFAULT=8
-CONFIG_NR_CPUS=8
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_MC_PRIO=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-# CONFIG_X86_MCELOG_LEGACY is not set
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-# CONFIG_X86_ANCIENT_MCE is not set
-CONFIG_X86_MCE_THRESHOLD=y
-CONFIG_X86_MCE_INJECT=m
-CONFIG_X86_THERMAL_VECTOR=y
-
-#
-# Performance monitoring
-#
-CONFIG_PERF_EVENTS_INTEL_UNCORE=y
-CONFIG_PERF_EVENTS_INTEL_RAPL=m
-CONFIG_PERF_EVENTS_INTEL_CSTATE=m
-CONFIG_PERF_EVENTS_AMD_POWER=m
-# end of Performance monitoring
-
-# CONFIG_X86_LEGACY_VM86 is not set
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX32=y
-CONFIG_X86_IOPL_IOPERM=y
-# CONFIG_TOSHIBA is not set
-CONFIG_I8K=m
-# CONFIG_X86_REBOOTFIXUPS is not set
-CONFIG_MICROCODE=y
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-# CONFIG_NOHIGHMEM is not set
-# CONFIG_HIGHMEM4G is not set
-CONFIG_HIGHMEM64G=y
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_HIGHMEM=y
-CONFIG_X86_PAE=y
-# CONFIG_X86_CPA_STATISTICS is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ILLEGAL_POINTER_VALUE=0
-# CONFIG_X86_PMEM_LEGACY is not set
-# CONFIG_HIGHPTE is not set
-CONFIG_X86_CHECK_BIOS_CORRUPTION=y
-CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
-CONFIG_X86_RESERVE_LOW=64
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
-CONFIG_X86_UMIP=y
-CONFIG_X86_INTEL_TSX_MODE_OFF=y
-# CONFIG_X86_INTEL_TSX_MODE_ON is not set
-# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
-CONFIG_EFI=y
-CONFIG_EFI_STUB=y
-CONFIG_SECCOMP=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-CONFIG_HZ_1000=y
-CONFIG_HZ=1000
-CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
-CONFIG_CRASH_DUMP=y
-# CONFIG_KEXEC_JUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_MODIFY_LDT_SYSCALL=y
-# end of Processor type and features
-
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_HIBERNATION_SNAPSHOT_DEV=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_CLK=y
-CONFIG_PM_GENERIC_DOMAINS=y
-CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_ENERGY_MODEL=y
-CONFIG_ARCH_SUPPORTS_ACPI=y
-CONFIG_ACPI=y
-CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
-CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
-CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
-# CONFIG_ACPI_DEBUGGER is not set
-CONFIG_ACPI_SPCR_TABLE=y
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
-CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_TINY_POWER_BUTTON=m
-CONFIG_ACPI_TINY_POWER_BUTTON_SIGNAL=38
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-# CONFIG_ACPI_TAD is not set
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_CPU_FREQ_PSS=y
-CONFIG_ACPI_PROCESSOR_CSTATE=y
-CONFIG_ACPI_PROCESSOR_IDLE=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
-CONFIG_ACPI_TABLE_UPGRADE=y
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_IOAPIC=y
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=y
-CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_BGRT=y
-# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
-CONFIG_HAVE_ACPI_APEI=y
-CONFIG_HAVE_ACPI_APEI_NMI=y
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_ERST_DEBUG=m
-CONFIG_DPTF_POWER=m
-CONFIG_ACPI_WATCHDOG=y
-CONFIG_ACPI_EXTLOG=m
-# CONFIG_PMIC_OPREGION is not set
-CONFIG_ACPI_CONFIGFS=m
-CONFIG_X86_PM_TIMER=y
-CONFIG_SFI=y
-# CONFIG_APM is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-# CONFIG_CPU_FREQ_STAT is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-
-#
-# CPU frequency scaling drivers
-#
-CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ_CPB=y
-# CONFIG_X86_POWERNOW_K6 is not set
-# CONFIG_X86_POWERNOW_K7 is not set
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-# CONFIG_X86_GX_SUSPMOD is not set
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-# CONFIG_X86_SPEEDSTEP_ICH is not set
-# CONFIG_X86_SPEEDSTEP_SMI is not set
-CONFIG_X86_P4_CLOCKMOD=m
-# CONFIG_X86_CPUFREQ_NFORCE2 is not set
-# CONFIG_X86_LONGRUN is not set
-# CONFIG_X86_LONGHAUL is not set
-# CONFIG_X86_E_POWERSAVER is not set
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-# end of CPU Frequency scaling
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_CPU_IDLE_GOV_TEO=y
-CONFIG_CPU_IDLE_GOV_HALTPOLL=y
-CONFIG_HALTPOLL_CPUIDLE=y
-# end of CPU Idle
-
-CONFIG_INTEL_IDLE=y
-# end of Power management and ACPI options
-
-#
-# Bus options (PCI etc.)
-#
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
-# CONFIG_ISA_BUS is not set
-CONFIG_ISA_DMA_API=y
-# CONFIG_ISA is not set
-# CONFIG_SCx200 is not set
-# CONFIG_ALIX is not set
-# CONFIG_NET5501 is not set
-# CONFIG_GEOS is not set
-CONFIG_AMD_NB=y
-# CONFIG_X86_SYSFB is not set
-# end of Bus options (PCI etc.)
-
-#
-# Binary Emulations
-#
-CONFIG_COMPAT_32=y
-# end of Binary Emulations
-
-CONFIG_HAVE_ATOMIC_IOMAP=y
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-# CONFIG_EDD_OFF is not set
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=m
-CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_IBFT=m
-CONFIG_FW_CFG_SYSFS=m
-CONFIG_FW_CFG_SYSFS_CMDLINE=y
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=y
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=y
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-CONFIG_EFI_RUNTIME_MAP=y
-# CONFIG_EFI_FAKE_MEMMAP is not set
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
-CONFIG_EFI_BOOTLOADER_CONTROL=m
-CONFIG_EFI_CAPSULE_LOADER=y
-CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y
-CONFIG_EFI_TEST=m
-CONFIG_APPLE_PROPERTIES=y
-CONFIG_RESET_ATTACK_MITIGATION=y
-# CONFIG_EFI_RCI2_TABLE is not set
-# CONFIG_EFI_DISABLE_PCI_DMA is not set
-# end of EFI (Extensible Firmware Interface) Support
-
-CONFIG_EFI_EMBEDDED_FIRMWARE=y
-CONFIG_UEFI_CPER=y
-CONFIG_UEFI_CPER_X86=y
-CONFIG_EFI_DEV_PATH_PARSER=y
-CONFIG_EFI_EARLYCON=y
-CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
-
-#
-# Tegra firmware driver
-#
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_NO_POLL=y
-CONFIG_KVM_XFER_TO_GUEST_WORK=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_WERROR=y
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-# CONFIG_KVM_MMU_AUDIT is not set
-CONFIG_AS_AVX512=y
-CONFIG_AS_SHA1_NI=y
-CONFIG_AS_SHA256_NI=y
-CONFIG_AS_TPAUSE=y
-
-#
-# General architecture-dependent options
-#
-CONFIG_CRASH_CORE=y
-CONFIG_KEXEC_CORE=y
-CONFIG_HOTPLUG_SMT=y
-CONFIG_GENERIC_ENTRY=y
-CONFIG_OPROFILE=m
-CONFIG_OPROFILE_EVENT_MULTIPLEX=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_OPROFILE_NMI_TIMER=y
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_OPTPROBES=y
-CONFIG_KPROBES_ON_FTRACE=y
-CONFIG_UPROBES=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_KRETPROBES=y
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_KPROBES_ON_FTRACE=y
-CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
-CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
-CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
-CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_HAVE_ASM_MODVERSIONS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
-CONFIG_MMU_GATHER_TABLE_FREE=y
-CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_ARCH_STACKLEAK=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_MOVE_PMD=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_HUGE_VMAP=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=8
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_OLD_SIGACTION=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
-CONFIG_ARCH_HAS_MEM_ENCRYPT=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# end of GCOV-based kernel profiling
-
-CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_ASM_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
-CONFIG_BLK_CGROUP_RWSTAT=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
-CONFIG_BLK_DEV_ZONED=y
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
-CONFIG_BLK_CMDLINE_PARSER=y
-CONFIG_BLK_WBT=y
-# CONFIG_BLK_CGROUP_IOLATENCY is not set
-# CONFIG_BLK_CGROUP_IOCOST is not set
-CONFIG_BLK_WBT_MQ=y
-CONFIG_BLK_DEBUG_FS=y
-CONFIG_BLK_DEBUG_FS_ZONED=y
-# CONFIG_BLK_SED_OPAL is not set
-CONFIG_BLK_INLINE_ENCRYPTION=y
-CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AIX_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_CMDLINE_PARTITION=y
-# end of Partition Types
-
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_MQ_RDMA=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-CONFIG_IOSCHED_BFQ=y
-CONFIG_BFQ_GROUP_IOSCHED=y
-# CONFIG_BFQ_CGROUP_DEBUG is not set
-# end of IO Schedulers
-
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
-CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
-CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_ELFCORE=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_FLATMEM_MANUAL is not set
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_SPARSEMEM_STATIC=y
-CONFIG_HAVE_FAST_GUP=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_PAGE_REPORTING=y
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
-CONFIG_CLEANCACHE=y
-CONFIG_FRONTSWAP=y
-# CONFIG_CMA is not set
-CONFIG_ZSWAP=y
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
-CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
-CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
-CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
-CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
-# CONFIG_ZSWAP_DEFAULT_ON is not set
-CONFIG_ZPOOL=y
-CONFIG_ZBUD=y
-CONFIG_Z3FOLD=m
-CONFIG_ZSMALLOC=y
-# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-CONFIG_IDLE_PAGE_TRACKING=y
-CONFIG_HMM_MIRROR=y
-CONFIG_FRAME_VECTOR=y
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-CONFIG_GUP_GET_PTE_LOW_HIGH=y
-# CONFIG_READ_ONLY_THP_FOR_FS is not set
-CONFIG_ARCH_HAS_PTE_SPECIAL=y
-CONFIG_MAPPING_DIRTY_HELPERS=y
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-CONFIG_NET_REDIRECT=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-CONFIG_UNIX_DIAG=m
-CONFIG_TLS=m
-CONFIG_TLS_DEVICE=y
-# CONFIG_TLS_TOE is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_OFFLOAD=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-CONFIG_XFRM_INTERFACE=m
-# CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_MIGRATE=y
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_AH=m
-CONFIG_XFRM_ESP=m
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_XFRM_ESPINTCP=y
-CONFIG_SMC=m
-CONFIG_SMC_DIAG=m
-CONFIG_XDP_SOCKETS=y
-CONFIG_XDP_SOCKETS_DIAG=m
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_ESP_OFFLOAD=m
-CONFIG_INET_ESPINTCP=y
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_INET_UDP_DIAG=y
-CONFIG_INET_RAW_DIAG=m
-CONFIG_INET_DIAG_DESTROY=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_NV=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_TCP_CONG_DCTCP=m
-CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=m
-CONFIG_DEFAULT_RENO=y
-CONFIG_DEFAULT_TCP_CONG="reno"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_ESP_OFFLOAD=m
-CONFIG_INET6_ESPINTCP=y
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_FOU=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-CONFIG_IPV6_SEG6_LWTUNNEL=y
-CONFIG_IPV6_SEG6_HMAC=y
-CONFIG_IPV6_SEG6_BPF=y
-CONFIG_IPV6_RPL_LWTUNNEL=y
-# CONFIG_NETLABEL is not set
-CONFIG_MPTCP=y
-CONFIG_INET_MPTCP_DIAG=y
-CONFIG_MPTCP_IPV6=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NET_PTP_CLASSIFY=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_FAMILY_BRIDGE=y
-CONFIG_NETFILTER_FAMILY_ARP=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-CONFIG_NF_LOG_NETDEV=m
-CONFIG_NETFILTER_CONNCOUNT=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CONNTRACK_PROCFS is not set
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NF_NAT_MASQUERADE=y
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CONNLIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_TUNNEL=m
-CONFIG_NFT_OBJREF=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
-CONFIG_NFT_XFRM=m
-CONFIG_NFT_SOCKET=m
-CONFIG_NFT_OSF=m
-CONFIG_NFT_TPROXY=m
-# CONFIG_NFT_SYNPROXY is not set
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_FIB_NETDEV=m
-CONFIG_NF_FLOW_TABLE_INET=m
-CONFIG_NF_FLOW_TABLE=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-# end of Core Netfilter Configuration
-
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_MH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS MH scheduler
-#
-CONFIG_IP_VS_MH_TAB_INDEX=12
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_SOCKET_IPV4=m
-CONFIG_NF_TPROXY_IPV4=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_FLOW_TABLE_IPV4=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-# CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# end of IP: Netfilter Configuration
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_SOCKET_IPV6=m
-CONFIG_NF_TPROXY_IPV6=m
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_FLOW_TABLE_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_SRH=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-# CONFIG_IP6_NF_SECURITY is not set
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-# end of IPv6: Netfilter Configuration
-
-CONFIG_NF_DEFRAG_IPV6=m
-# CONFIG_NF_TABLES_BRIDGE is not set
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-# CONFIG_BPFILTER is not set
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-# end of DCCP CCIDs Configuration
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-# end of DCCP Kernel Hacking
-
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-# CONFIG_SCTP_COOKIE_HMAC_MD5 is not set
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_INET_SCTP_DIAG=m
-CONFIG_RDS=m
-# CONFIG_RDS_RDMA is not set
-CONFIG_RDS_TCP=m
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-CONFIG_TIPC_MEDIA_IB=y
-CONFIG_TIPC_MEDIA_UDP=y
-CONFIG_TIPC_CRYPTO=y
-CONFIG_TIPC_DIAG=m
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-CONFIG_L2TP_DEBUGFS=m
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_MRP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_BRIDGE_MRP=y
-CONFIG_HAVE_NET_DSA=y
-CONFIG_NET_DSA=m
-CONFIG_NET_DSA_TAG_8021Q=m
-CONFIG_NET_DSA_TAG_AR9331=m
-CONFIG_NET_DSA_TAG_BRCM_COMMON=m
-CONFIG_NET_DSA_TAG_BRCM=m
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
-CONFIG_NET_DSA_TAG_GSWIP=m
-CONFIG_NET_DSA_TAG_DSA=m
-CONFIG_NET_DSA_TAG_EDSA=m
-CONFIG_NET_DSA_TAG_MTK=m
-CONFIG_NET_DSA_TAG_KSZ=m
-CONFIG_NET_DSA_TAG_RTL4_A=m
-CONFIG_NET_DSA_TAG_OCELOT=m
-CONFIG_NET_DSA_TAG_QCA=m
-CONFIG_NET_DSA_TAG_LAN9303=m
-CONFIG_NET_DSA_TAG_SJA1105=m
-CONFIG_NET_DSA_TAG_TRAILER=m
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_X25=m
-CONFIG_LAPB=m
-CONFIG_PHONET=m
-# CONFIG_6LOWPAN is not set
-CONFIG_IEEE802154=m
-CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
-CONFIG_IEEE802154_SOCKET=m
-CONFIG_MAC802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_CBS=m
-CONFIG_NET_SCH_ETF=m
-CONFIG_NET_SCH_TAPRIO=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_SKBPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_CAKE=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_FQ_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-CONFIG_NET_SCH_ETS=m
-# CONFIG_NET_SCH_DEFAULT is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-# CONFIG_NET_CLS_CGROUP is not set
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_MATCHALL=m
-# CONFIG_NET_EMATCH is not set
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_SAMPLE=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-# CONFIG_NET_ACT_MPLS is not set
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_ACT_CTINFO is not set
-CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-# CONFIG_NET_ACT_CT is not set
-CONFIG_NET_ACT_GATE=m
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IFE_SKBTCINDEX=m
-# CONFIG_NET_TC_SKB_EXT is not set
-CONFIG_NET_SCH_FIFO=y
-CONFIG_DCB=y
-CONFIG_DNS_RESOLVER=y
-CONFIG_BATMAN_ADV=m
-CONFIG_BATMAN_ADV_BATMAN_V=y
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-CONFIG_BATMAN_ADV_NC=y
-CONFIG_BATMAN_ADV_MCAST=y
-CONFIG_BATMAN_ADV_DEBUGFS=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_BATMAN_ADV_SYSFS=y
-# CONFIG_BATMAN_ADV_TRACING is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
-CONFIG_VSOCKETS_DIAG=m
-CONFIG_VSOCKETS_LOOPBACK=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-CONFIG_HYPERV_VSOCKETS=m
-CONFIG_NETLINK_DIAG=m
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_NET_NSH=m
-CONFIG_HSR=m
-CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_L3_MASTER_DEV=y
-CONFIG_QRTR=m
-CONFIG_QRTR_SMD=m
-CONFIG_QRTR_TUN=m
-CONFIG_QRTR_MHI=m
-# CONFIG_NET_NCSI is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-# CONFIG_BPF_JIT is not set
-CONFIG_BPF_STREAM_PARSER=y
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-CONFIG_NET_DROP_MONITOR=y
-# end of Network testing
-# end of Networking options
-
-# CONFIG_HAMRADIO is not set
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_GW=m
-# CONFIG_CAN_J1939 is not set
-
-#
-# CAN Device Drivers
-#
-CONFIG_CAN_VCAN=m
-# CONFIG_CAN_VXCAN is not set
-CONFIG_CAN_SLCAN=m
-CONFIG_CAN_DEV=m
-CONFIG_CAN_CALC_BITTIMING=y
-# CONFIG_CAN_JANZ_ICAN3 is not set
-# CONFIG_CAN_KVASER_PCIEFD is not set
-# CONFIG_PCH_CAN is not set
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
-CONFIG_CAN_C_CAN_PCI=m
-CONFIG_CAN_CC770=m
-CONFIG_CAN_CC770_ISA=m
-CONFIG_CAN_CC770_PLATFORM=m
-CONFIG_CAN_IFI_CANFD=m
-CONFIG_CAN_M_CAN=m
-# CONFIG_CAN_M_CAN_PLATFORM is not set
-# CONFIG_CAN_M_CAN_TCAN4X5X is not set
-# CONFIG_CAN_PEAK_PCIEFD is not set
-# CONFIG_CAN_SJA1000 is not set
-CONFIG_CAN_SOFTING=m
-
-#
-# CAN SPI interfaces
-#
-# CONFIG_CAN_HI311X is not set
-CONFIG_CAN_MCP251X=m
-# end of CAN SPI interfaces
-
-#
-# CAN USB interfaces
-#
-CONFIG_CAN_8DEV_USB=m
-CONFIG_CAN_EMS_USB=m
-CONFIG_CAN_ESD_USB2=m
-CONFIG_CAN_GS_USB=m
-CONFIG_CAN_KVASER_USB=m
-# CONFIG_CAN_MCBA_USB is not set
-CONFIG_CAN_PEAK_USB=m
-CONFIG_CAN_UCAN=m
-# end of CAN USB interfaces
-
-CONFIG_CAN_DEBUG_DEVICES=y
-# end of CAN Device Drivers
-
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-CONFIG_BT_LEDS=y
-CONFIG_BT_MSFTEXT=y
-CONFIG_BT_DEBUGFS=y
-# CONFIG_BT_SELFTEST is not set
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
-CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_SERDEV=y
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_NOKIA=m
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_RTL=y
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIUART_AG6XX=y
-# CONFIG_BT_HCIUART_MRVL is not set
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_MTKSDIO=m
-CONFIG_BT_MTKUART=m
-CONFIG_BT_HCIRSI=m
-# end of Bluetooth device drivers
-
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_IPV6 is not set
-# CONFIG_AF_RXRPC_INJECT_LOSS is not set
-# CONFIG_AF_RXRPC_DEBUG is not set
-# CONFIG_RXKAD is not set
-CONFIG_AF_KCM=m
-CONFIG_STREAM_PARSER=y
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
-CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
-CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_CFG80211_CRDA_SUPPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_GPIO=m
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_RDMA is not set
-# CONFIG_NET_9P_DEBUG is not set
-CONFIG_CAIF=m
-# CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_NETDEV=m
-CONFIG_CAIF_USB=m
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
-CONFIG_NFC=m
-CONFIG_NFC_DIGITAL=m
-CONFIG_NFC_NCI=m
-CONFIG_NFC_NCI_SPI=m
-CONFIG_NFC_NCI_UART=m
-CONFIG_NFC_HCI=m
-# CONFIG_NFC_SHDLC is not set
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_NFC_TRF7970A=m
-CONFIG_NFC_MEI_PHY=m
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PORT100=m
-CONFIG_NFC_FDP=m
-CONFIG_NFC_FDP_I2C=m
-CONFIG_NFC_PN544=m
-CONFIG_NFC_PN544_MEI=m
-CONFIG_NFC_PN533=m
-CONFIG_NFC_PN533_USB=m
-CONFIG_NFC_PN533_I2C=m
-CONFIG_NFC_PN532_UART=m
-CONFIG_NFC_MICROREAD=m
-CONFIG_NFC_MICROREAD_MEI=m
-CONFIG_NFC_MRVL=m
-CONFIG_NFC_MRVL_USB=m
-CONFIG_NFC_MRVL_UART=m
-CONFIG_NFC_MRVL_I2C=m
-CONFIG_NFC_MRVL_SPI=m
-CONFIG_NFC_ST_NCI=m
-CONFIG_NFC_ST_NCI_I2C=m
-CONFIG_NFC_ST_NCI_SPI=m
-CONFIG_NFC_NXP_NCI=m
-CONFIG_NFC_NXP_NCI_I2C=m
-CONFIG_NFC_S3FWRN5=m
-CONFIG_NFC_S3FWRN5_I2C=m
-CONFIG_NFC_ST95HF=m
-# end of Near Field Communication (NFC) devices
-
-CONFIG_PSAMPLE=m
-CONFIG_NET_IFE=m
-CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_SOCK_VALIDATE_XMIT=y
-CONFIG_NET_SOCK_MSG=y
-CONFIG_NET_DEVLINK=y
-CONFIG_PAGE_POOL=y
-CONFIG_FAILOVER=m
-CONFIG_ETHTOOL_NETLINK=y
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_HAVE_EISA=y
-# CONFIG_EISA is not set
-CONFIG_HAVE_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-CONFIG_PCIEAER_INJECT=m
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEFAULT is not set
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-CONFIG_PCIEASPM_PERFORMANCE=y
-CONFIG_PCIE_PME=y
-# CONFIG_PCIE_DPC is not set
-# CONFIG_PCIE_PTM is not set
-# CONFIG_PCIE_BW is not set
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_REALLOC_ENABLE_AUTO=y
-CONFIG_PCI_STUB=m
-# CONFIG_PCI_PF_STUB is not set
-CONFIG_PCI_ATS=y
-CONFIG_PCI_LOCKLESS_CONFIG=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_LABEL=y
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_COMPAQ is not set
-# CONFIG_HOTPLUG_PCI_IBM is not set
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-# CONFIG_HOTPLUG_PCI_SHPC is not set
-
-#
-# PCI controller drivers
-#
-
-#
-# DesignWare PCI Core Support
-#
-CONFIG_PCIE_DW=y
-CONFIG_PCIE_DW_HOST=y
-# CONFIG_PCIE_DW_PLAT_HOST is not set
-CONFIG_PCI_MESON=y
-# end of DesignWare PCI Core Support
-
-#
-# Mobiveil PCIe Core Support
-#
-# end of Mobiveil PCIe Core Support
-
-#
-# Cadence PCIe controllers support
-#
-# end of Cadence PCIe controllers support
-# end of PCI controller drivers
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-# end of PCI Endpoint
-
-#
-# PCI switch controller drivers
-#
-CONFIG_PCI_SW_SWITCHTEC=m
-# end of PCI switch controller drivers
-
-CONFIG_PCCARD=m
-# CONFIG_PCMCIA is not set
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_RAPIDIO=m
-CONFIG_RAPIDIO_TSI721=m
-CONFIG_RAPIDIO_DISC_TIMEOUT=30
-CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y
-CONFIG_RAPIDIO_DMA_ENGINE=y
-CONFIG_RAPIDIO_DEBUG=y
-CONFIG_RAPIDIO_ENUM_BASIC=m
-CONFIG_RAPIDIO_CHMAN=m
-CONFIG_RAPIDIO_MPORT_CDEV=m
-
-#
-# RapidIO Switch drivers
-#
-CONFIG_RAPIDIO_TSI57X=m
-CONFIG_RAPIDIO_CPS_XX=m
-CONFIG_RAPIDIO_TSI568=m
-CONFIG_RAPIDIO_CPS_GEN2=m
-CONFIG_RAPIDIO_RXS_GEN3=m
-# end of RapidIO Switch drivers
-
-#
-# Generic Driver Options
-#
-# CONFIG_UEVENT_HELPER is not set
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-CONFIG_FW_CACHE=y
-# end of Firmware loader
-
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_ALLOW_DEV_COREDUMP=y
-CONFIG_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=y
-CONFIG_REGMAP_SPI=y
-CONFIG_REGMAP_SPMI=m
-CONFIG_REGMAP_W1=m
-CONFIG_REGMAP_MMIO=y
-CONFIG_REGMAP_IRQ=y
-CONFIG_REGMAP_I3C=m
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-CONFIG_MHI_BUS=m
-# end of Bus devices
-
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_GNSS=m
-CONFIG_GNSS_SERIAL=m
-CONFIG_GNSS_MTK_SERIAL=m
-CONFIG_GNSS_SIRF_SERIAL=m
-CONFIG_GNSS_UBX_SERIAL=m
-CONFIG_MTD=m
-# CONFIG_MTD_TESTS is not set
-
-#
-# Partition parsers
-#
-CONFIG_MTD_AR7_PARTS=m
-CONFIG_MTD_CMDLINE_PARTS=m
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# end of Partition parsers
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-# CONFIG_SM_FTL is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
-CONFIG_MTD_SWAP=m
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-# end of RAM/ROM/Flash chip drivers
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_PLATRAM is not set
-# end of Mapping drivers for chip access
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_MCHP23K256 is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_MTD_PHRAM=m
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_DOCG3=m
-CONFIG_BCH_CONST_M=14
-CONFIG_BCH_CONST_T=4
-# end of Self-contained MTD device drivers
-
-#
-# NAND
-#
-CONFIG_MTD_NAND_CORE=m
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_NAND_ECC_SW_HAMMING=m
-# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-CONFIG_MTD_RAW_NAND=m
-CONFIG_MTD_NAND_ECC_SW_BCH=y
-
-#
-# Raw/parallel NAND flash controllers
-#
-CONFIG_MTD_NAND_DENALI=m
-CONFIG_MTD_NAND_DENALI_PCI=m
-CONFIG_MTD_NAND_CAFE=m
-CONFIG_MTD_NAND_CS553X=m
-CONFIG_MTD_NAND_MXIC=m
-CONFIG_MTD_NAND_GPIO=m
-CONFIG_MTD_NAND_PLATFORM=m
-CONFIG_MTD_NAND_ARASAN=m
-
-#
-# Misc
-#
-CONFIG_MTD_SM_COMMON=m
-CONFIG_MTD_NAND_NANDSIM=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x0
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
-CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
-CONFIG_MTD_SPI_NAND=m
-# end of NAND
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-# end of LPDDR & LPDDR2 PCM memory drivers
-
-# CONFIG_MTD_SPI_NOR is not set
-# CONFIG_MTD_UBI is not set
-# CONFIG_MTD_HYPERBUS is not set
-# CONFIG_OF is not set
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_NULL_BLK=m
-CONFIG_BLK_DEV_FD=m
-CONFIG_CDROM=m
-# CONFIG_PARIDE is not set
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_ZRAM=m
-CONFIG_ZRAM_WRITEBACK=y
-# CONFIG_ZRAM_MEMORY_TRACKING is not set
-CONFIG_BLK_DEV_UMEM=m
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_VIRTIO_BLK=m
-CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_BLK_DEV_RNBD=y
-CONFIG_BLK_DEV_RNBD_CLIENT=m
-CONFIG_BLK_DEV_RNBD_SERVER=m
-
-#
-# NVME Support
-#
-CONFIG_NVME_CORE=y
-CONFIG_BLK_DEV_NVME=y
-CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_HWMON=y
-CONFIG_NVME_FABRICS=m
-CONFIG_NVME_RDMA=m
-CONFIG_NVME_FC=m
-CONFIG_NVME_TCP=m
-CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_PASSTHRU=y
-CONFIG_NVME_TARGET_LOOP=m
-CONFIG_NVME_TARGET_RDMA=m
-CONFIG_NVME_TARGET_FC=m
-CONFIG_NVME_TARGET_FCLOOP=m
-CONFIG_NVME_TARGET_TCP=m
-# end of NVME Support
-
-#
-# Misc devices
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT_SPI=m
-CONFIG_DUMMY_IRQ=m
-# CONFIG_IBM_ASM is not set
-CONFIG_PHANTOM=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_CS5535_MFGPT=m
-CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-CONFIG_VMWARE_BALLOON=m
-CONFIG_PCH_PHUB=m
-CONFIG_LATTICE_ECP3_CONFIG=m
-CONFIG_SRAM=y
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
-CONFIG_MISC_RTSX=m
-CONFIG_PVPANIC=m
-CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_AT25=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_EEPROM_93XX46=m
-CONFIG_EEPROM_IDT_89HPESX=m
-CONFIG_EEPROM_EE1004=m
-# end of EEPROM support
-
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-# end of Texas Instruments shared transport line discipline
-
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
-CONFIG_INTEL_MEI_HDCP=m
-CONFIG_VMWARE_VMCI=m
-
-#
-# Intel MIC & related support
-#
-CONFIG_VOP_BUS=m
-CONFIG_VOP=m
-# end of Intel MIC & related support
-
-CONFIG_ECHO=m
-CONFIG_MISC_ALCOR_PCI=m
-CONFIG_MISC_RTSX_PCI=m
-CONFIG_MISC_RTSX_USB=m
-CONFIG_HABANA_AI=m
-CONFIG_UACCE=m
-# end of Misc devices
-
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-# end of SCSI Transports
-
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_MVSAS_TASKLET is not set
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ESAS2R=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_SMARTPQI=m
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_UFS_CDNS_PLATFORM=m
-# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
-CONFIG_SCSI_UFS_BSG=y
-CONFIG_SCSI_UFS_CRYPTO=y
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_FLASHPOINT is not set
-CONFIG_SCSI_MYRB=m
-CONFIG_SCSI_MYRS=m
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_SNIC=m
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-CONFIG_SCSI_DMX3191D=m
-# CONFIG_SCSI_FDOMAIN_PCI is not set
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
-# CONFIG_TCM_QLA2XXX_DEBUG is not set
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_QEDI=m
-CONFIG_QEDF=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_AM53C974=m
-# CONFIG_SCSI_NSP32 is not set
-CONFIG_SCSI_WD719X=m
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-CONFIG_SCSI_DH=y
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-# end of SCSI device support
-
-CONFIG_ATA=m
-CONFIG_SATA_HOST=y
-CONFIG_PATA_TIMINGS=y
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_FORCE=y
-CONFIG_ATA_ACPI=y
-CONFIG_SATA_ZPODD=y
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=0
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SX4=m
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-CONFIG_SATA_DWC=m
-# CONFIG_SATA_DWC_OLD_DMA is not set
-# CONFIG_SATA_DWC_DEBUG is not set
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-# CONFIG_PATA_CS5535 is not set
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SC1200=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PLATFORM=m
-CONFIG_PATA_RZ1000=m
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=m
-CONFIG_ATA_GENERIC=m
-# CONFIG_PATA_LEGACY is not set
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_MD_CLUSTER=m
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING=y
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-# CONFIG_DM_UNSTRIPED is not set
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-# CONFIG_DM_WRITECACHE is not set
-CONFIG_DM_EBS=m
-CONFIG_DM_ERA=m
-# CONFIG_DM_CLONE is not set
-CONFIG_DM_MIRROR=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_MULTIPATH_HST=m
-CONFIG_DM_DELAY=m
-CONFIG_DM_DUST=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
-# CONFIG_DM_VERITY_FEC is not set
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-# CONFIG_DM_INTEGRITY is not set
-# CONFIG_DM_ZONED is not set
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_TCM_USER2=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_ISCSI_TARGET_CXGB4=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LAN is not set
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-# end of IEEE 1394 (FireWire) support
-
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=m
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_WIREGUARD=m
-# CONFIG_WIREGUARD_DEBUG is not set
-CONFIG_EQUALIZER=m
-CONFIG_NET_FC=y
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
-CONFIG_IPVTAP=m
-CONFIG_VXLAN=m
-CONFIG_GENEVE=m
-CONFIG_BAREUDP=m
-CONFIG_GTP=m
-CONFIG_MACSEC=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NTB_NETDEV=m
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-CONFIG_TUN=m
-CONFIG_TAP=m
-CONFIG_TUN_VNET_CROSS_LE=y
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_NET_VRF=m
-# CONFIG_VSOCKMON is not set
-CONFIG_SUNGEM_PHY=m
-# CONFIG_ARCNET is not set
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-CONFIG_ATM_NICSTAR_USE_SUNI=y
-CONFIG_ATM_NICSTAR_USE_IDT77105=y
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-# CONFIG_CAIF_DRIVERS is not set
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_B53=m
-CONFIG_B53_SPI_DRIVER=m
-CONFIG_B53_MDIO_DRIVER=m
-CONFIG_B53_MMAP_DRIVER=m
-CONFIG_B53_SRAB_DRIVER=m
-CONFIG_B53_SERDES=m
-# CONFIG_NET_DSA_BCM_SF2 is not set
-# CONFIG_NET_DSA_LOOP is not set
-CONFIG_NET_DSA_LANTIQ_GSWIP=m
-# CONFIG_NET_DSA_MT7530 is not set
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
-CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
-CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
-CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
-CONFIG_NET_DSA_MICROCHIP_KSZ8795=m
-CONFIG_NET_DSA_MICROCHIP_KSZ8795_SPI=m
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
-CONFIG_NET_DSA_MV88E6XXX_PTP=y
-CONFIG_NET_DSA_AR9331=m
-CONFIG_NET_DSA_SJA1105=m
-# CONFIG_NET_DSA_SJA1105_PTP is not set
-CONFIG_NET_DSA_QCA8K=m
-# CONFIG_NET_DSA_REALTEK_SMI is not set
-# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
-# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-CONFIG_NET_DSA_VITESSE_VSC73XX=m
-CONFIG_NET_DSA_VITESSE_VSC73XX_SPI=m
-CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_AGERE=y
-CONFIG_ET131X=m
-CONFIG_NET_VENDOR_ALACRITECH=y
-CONFIG_SLICOSS=m
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_ALTERA_TSE=m
-CONFIG_NET_VENDOR_AMAZON=y
-CONFIG_ENA_ETHERNET=m
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_PCNET32=y
-CONFIG_AMD_XGBE=m
-# CONFIG_AMD_XGBE_DCB is not set
-CONFIG_AMD_XGBE_HAVE_ECC=y
-CONFIG_NET_VENDOR_AQUANTIA=y
-CONFIG_NET_VENDOR_ARC=y
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-CONFIG_NET_VENDOR_AURORA=y
-CONFIG_AURORA_NB8800=m
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BCMGENET=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_TIGON3=m
-CONFIG_TIGON3_HWMON=y
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_SYSTEMPORT=m
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_BNXT_FLOWER_OFFLOAD=y
-CONFIG_BNXT_DCB=y
-CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
-CONFIG_NET_VENDOR_CADENCE=y
-CONFIG_MACB=m
-CONFIG_MACB_USE_HWSTAMP=y
-CONFIG_MACB_PCI=m
-CONFIG_NET_VENDOR_CAVIUM=y
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-# CONFIG_CHELSIO_T4_DCB is not set
-CONFIG_CHELSIO_T4VF=m
-CONFIG_CHELSIO_LIB=m
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-CONFIG_NET_VENDOR_CORTINA=y
-CONFIG_CX_ECAT=m
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-# CONFIG_PCMCIA_XIRCOM is not set
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET_BE2=y
-CONFIG_BE2NET_BE3=y
-CONFIG_BE2NET_LANCER=y
-CONFIG_BE2NET_SKYHAWK=y
-CONFIG_NET_VENDOR_EZCHIP=y
-CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_GVE is not set
-CONFIG_NET_VENDOR_HUAWEI=y
-CONFIG_HINIC=m
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=m
-CONFIG_E1000=m
-CONFIG_E1000E=y
-CONFIG_E1000E_HWTS=y
-CONFIG_IGB=m
-CONFIG_IGB_HWMON=y
-CONFIG_IGBVF=m
-CONFIG_IXGB=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
-# CONFIG_IXGBE_DCB is not set
-CONFIG_IXGBE_IPSEC=y
-CONFIG_IXGBEVF=m
-CONFIG_IXGBEVF_IPSEC=y
-CONFIG_I40E=m
-CONFIG_I40E_DCB=y
-CONFIG_IAVF=m
-CONFIG_I40EVF=m
-# CONFIG_ICE is not set
-CONFIG_FM10K=m
-CONFIG_IGC=m
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_MVMDIO=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-# CONFIG_SKGE_GENESIS is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_DCB=y
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX4_CORE_GEN2=y
-CONFIG_MLX5_CORE=m
-CONFIG_MLX5_ACCEL=y
-# CONFIG_MLX5_FPGA is not set
-CONFIG_MLX5_CORE_EN=y
-CONFIG_MLX5_EN_ARFS=y
-CONFIG_MLX5_EN_RXNFC=y
-CONFIG_MLX5_MPFS=y
-CONFIG_MLX5_ESWITCH=y
-CONFIG_MLX5_CLS_ACT=y
-CONFIG_MLX5_CORE_EN_DCB=y
-# CONFIG_MLX5_CORE_IPOIB is not set
-CONFIG_MLX5_IPSEC=y
-CONFIG_MLX5_EN_IPSEC=y
-# CONFIG_MLX5_TLS is not set
-CONFIG_MLX5_SW_STEERING=y
-CONFIG_MLXSW_CORE=m
-CONFIG_MLXSW_CORE_HWMON=y
-CONFIG_MLXSW_CORE_THERMAL=y
-CONFIG_MLXSW_PCI=m
-CONFIG_MLXSW_I2C=m
-CONFIG_MLXSW_SWITCHIB=m
-CONFIG_MLXSW_SWITCHX2=m
-CONFIG_MLXSW_SPECTRUM=m
-CONFIG_MLXSW_SPECTRUM_DCB=y
-CONFIG_MLXSW_MINIMAL=m
-CONFIG_MLXFW=m
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_ENCX24J600=m
-# CONFIG_LAN743X is not set
-CONFIG_NET_VENDOR_MICROSEMI=y
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_NETERION=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_NETRONOME=y
-CONFIG_NFP=m
-# CONFIG_NFP_APP_FLOWER is not set
-CONFIG_NFP_APP_ABM_NIC=y
-# CONFIG_NFP_DEBUG is not set
-CONFIG_NET_VENDOR_NI=y
-CONFIG_NI_XGE_MANAGEMENT_ENET=m
-CONFIG_NET_VENDOR_8390=y
-CONFIG_NE2K_PCI=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-# CONFIG_PCH_GBE is not set
-CONFIG_ETHOC=m
-CONFIG_NET_VENDOR_PACKET_ENGINES=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_PENSANDO=y
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLCNIC_DCB=y
-CONFIG_QLCNIC_HWMON=y
-CONFIG_NETXEN_NIC=m
-CONFIG_QED=m
-CONFIG_QED_LL2=y
-CONFIG_QED_SRIOV=y
-CONFIG_QEDE=m
-CONFIG_QED_ISCSI=y
-CONFIG_QED_FCOE=y
-CONFIG_QED_OOO=y
-CONFIG_NET_VENDOR_QUALCOMM=y
-CONFIG_QCOM_EMAC=m
-CONFIG_RMNET=m
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_ATP=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_ROCKER=y
-CONFIG_ROCKER=m
-CONFIG_NET_VENDOR_SAMSUNG=y
-CONFIG_SXGBE_ETH=m
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SOLARFLARE=y
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_SFC_MCDI_LOGGING=y
-CONFIG_SFC_FALCON=m
-CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_EPIC100=m
-CONFIG_SMSC911X=m
-CONFIG_SMSC9420=m
-CONFIG_NET_VENDOR_SOCIONEXT=y
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_SELFTESTS is not set
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_DWMAC_GENERIC=m
-CONFIG_DWMAC_INTEL=m
-CONFIG_STMMAC_PCI=m
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_SYNOPSYS=y
-# CONFIG_DWC_XLGMAC is not set
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-# CONFIG_TI_CPSW_PHY_SEL is not set
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_WIZNET_W5100_SPI=m
-CONFIG_NET_VENDOR_XILINX=y
-# CONFIG_XILINX_AXI_EMAC is not set
-CONFIG_XILINX_LL_TEMAC=m
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_NET_SB1000=m
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_BUS=y
-CONFIG_MDIO_DEVRES=y
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_GPIO=m
-# CONFIG_MDIO_MSCC_MIIM is not set
-# CONFIG_MDIO_MVUSB is not set
-CONFIG_MDIO_XPCS=m
-CONFIG_PHYLINK=m
-CONFIG_PHYLIB=y
-CONFIG_SWPHY=y
-CONFIG_LED_TRIGGER_PHY=y
-
-#
-# MII PHY device drivers
-#
-# CONFIG_SFP is not set
-# CONFIG_ADIN_PHY is not set
-CONFIG_AMD_PHY=m
-CONFIG_AQUANTIA_PHY=m
-CONFIG_AX88796B_PHY=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM54140_PHY=m
-CONFIG_BCM84881_PHY=y
-CONFIG_CICADA_PHY=m
-# CONFIG_CORTINA_PHY is not set
-CONFIG_DAVICOM_PHY=m
-CONFIG_DP83822_PHY=m
-# CONFIG_DP83TC811_PHY is not set
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_DP83869_PHY=m
-CONFIG_FIXED_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_INTEL_XWAY_PHY=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_MARVELL_PHY=m
-# CONFIG_MARVELL_10G_PHY is not set
-CONFIG_MICREL_PHY=m
-CONFIG_MICROCHIP_PHY=m
-# CONFIG_MICROCHIP_T1_PHY is not set
-CONFIG_MICROSEMI_PHY=m
-CONFIG_NATIONAL_PHY=m
-# CONFIG_NXP_TJA11XX_PHY is not set
-CONFIG_AT803X_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_RENESAS_PHY=m
-CONFIG_ROCKCHIP_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_STE10XP=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_XILINX_GMII2RGMII=m
-CONFIG_MICREL_KS8995MA=m
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-# CONFIG_SLIP_COMPRESSED is not set
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#
-CONFIG_USB_NET_DRIVERS=m
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_USB_NET_CH9200=m
-CONFIG_USB_NET_AQC111=m
-CONFIG_WLAN=y
-CONFIG_WIRELESS_WDS=y
-CONFIG_WLAN_VENDOR_ADMTEK=y
-CONFIG_ADM8211=m
-CONFIG_ATH_COMMON=m
-CONFIG_WLAN_VENDOR_ATH=y
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_AHB=y
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DYNACK is not set
-CONFIG_ATH9K_WOW=y
-CONFIG_ATH9K_RFKILL=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_PCI_NO_EEPROM=m
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_ATH9K_HWRNG=y
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-CONFIG_CARL9170_HWRNG=y
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-# CONFIG_ATH6KL_DEBUG is not set
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_WIL6210_DEBUGFS=y
-CONFIG_ATH10K=m
-CONFIG_ATH10K_CE=y
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_SDIO is not set
-CONFIG_ATH10K_USB=m
-# CONFIG_ATH10K_DEBUG is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_WCN36XX=m
-# CONFIG_WCN36XX_DEBUGFS is not set
-CONFIG_WLAN_VENDOR_ATMEL=y
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_WLAN_VENDOR_BROADCOM=y
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMFMAC_PCIE=y
-# CONFIG_BRCM_TRACING is not set
-# CONFIG_BRCMDBG is not set
-CONFIG_WLAN_VENDOR_CISCO=y
-CONFIG_AIRO=m
-CONFIG_WLAN_VENDOR_INTEL=y
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-
-#
-# iwl3945 / iwl4965 Debugging Options
-#
-# CONFIG_IWLEGACY_DEBUG is not set
-# end of iwl3945 / iwl4965 Debugging Options
-
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLDVM=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-CONFIG_IWLWIFI_BCAST_FILTERING=y
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_DEVICE_TRACING=y
-# end of Debugging Options
-
-CONFIG_WLAN_VENDOR_INTERSIL=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_SPI=m
-# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
-CONFIG_P54_LEDS=y
-CONFIG_PRISM54=m
-CONFIG_WLAN_VENDOR_MARVELL=y
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_MWL8K=m
-CONFIG_WLAN_VENDOR_MEDIATEK=y
-CONFIG_MT7601U=m
-CONFIG_MT76_CORE=m
-CONFIG_MT76_LEDS=y
-CONFIG_MT76_USB=m
-CONFIG_MT76_SDIO=m
-CONFIG_MT76x02_LIB=m
-CONFIG_MT76x02_USB=m
-CONFIG_MT76x0_COMMON=m
-CONFIG_MT76x0U=m
-CONFIG_MT76x0E=m
-CONFIG_MT76x2_COMMON=m
-CONFIG_MT76x2E=m
-CONFIG_MT76x2U=m
-CONFIG_MT7603E=m
-CONFIG_MT7615_COMMON=m
-CONFIG_MT7615E=m
-CONFIG_MT7663_USB_SDIO_COMMON=m
-CONFIG_MT7663U=m
-CONFIG_MT7663S=m
-CONFIG_MT7915E=m
-CONFIG_WLAN_VENDOR_MICROCHIP=y
-CONFIG_WILC1000=m
-CONFIG_WILC1000_SDIO=m
-# CONFIG_WILC1000_SPI is not set
-# CONFIG_WILC1000_HW_OOB_INTR is not set
-CONFIG_WLAN_VENDOR_RALINK=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WLAN_VENDOR_REALTEK=y
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8821AE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-CONFIG_RTLWIFI_DEBUG=y
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL8XXXU=m
-# CONFIG_RTL8XXXU_UNTESTED is not set
-CONFIG_RTW88=m
-CONFIG_RTW88_CORE=m
-CONFIG_RTW88_PCI=m
-CONFIG_RTW88_8822B=m
-CONFIG_RTW88_8822C=m
-CONFIG_RTW88_8723D=m
-CONFIG_RTW88_8821C=m
-CONFIG_RTW88_8822BE=m
-CONFIG_RTW88_8822CE=m
-CONFIG_RTW88_8723DE=m
-CONFIG_RTW88_8821CE=m
-# CONFIG_RTW88_DEBUG is not set
-# CONFIG_RTW88_DEBUGFS is not set
-CONFIG_WLAN_VENDOR_RSI=y
-CONFIG_RSI_91X=m
-CONFIG_RSI_DEBUGFS=y
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-CONFIG_RSI_COEX=y
-CONFIG_WLAN_VENDOR_ST=y
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CW1200_WLAN_SPI=m
-CONFIG_WLAN_VENDOR_TI=y
-CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_WLAN_VENDOR_ZYDAS=y
-CONFIG_USB_ZD1201=m
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_WLAN_VENDOR_QUANTENNA=y
-CONFIG_QTNFMAC=m
-CONFIG_QTNFMAC_PCIE=m
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_VIRT_WIFI=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-# end of WiMAX Wireless Broadband devices
-
-# CONFIG_WAN is not set
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKELB=m
-CONFIG_IEEE802154_AT86RF230=m
-# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
-CONFIG_IEEE802154_MRF24J40=m
-# CONFIG_IEEE802154_CC2520 is not set
-CONFIG_IEEE802154_ATUSB=m
-CONFIG_IEEE802154_ADF7242=m
-# CONFIG_IEEE802154_CA8210 is not set
-# CONFIG_IEEE802154_MCR20A is not set
-CONFIG_IEEE802154_HWSIM=m
-CONFIG_VMXNET3=m
-CONFIG_FUJITSU_ES=m
-CONFIG_USB4_NET=m
-CONFIG_HYPERV_NET=m
-# CONFIG_NETDEVSIM is not set
-CONFIG_NET_FAILOVER=m
-# CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_LEDS=m
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADC=m
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_APPLESPI=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_QT1050=m
-CONFIG_KEYBOARD_QT1070=m
-CONFIG_KEYBOARD_QT2160=m
-# CONFIG_KEYBOARD_DLINK_DIR685 is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-CONFIG_KEYBOARD_GPIO_POLLED=m
-CONFIG_KEYBOARD_TCA6416=m
-CONFIG_KEYBOARD_TCA8418=m
-# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-CONFIG_KEYBOARD_LM8333=m
-CONFIG_KEYBOARD_MAX7359=m
-CONFIG_KEYBOARD_MCS=m
-CONFIG_KEYBOARD_MPR121=m
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_OPENCORES=m
-CONFIG_KEYBOARD_SAMSUNG=m
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_IQS62X is not set
-CONFIG_KEYBOARD_TM2_TOUCHKEY=m
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_KEYBOARD_CROS_EC=m
-# CONFIG_KEYBOARD_MTK_PMIC is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_BYD=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
-CONFIG_MOUSE_PS2_CYPRESS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_PS2_FOCALTECH=y
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_PS2_SMBUS=y
-CONFIG_MOUSE_SERIAL=y
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=m
-CONFIG_JOYSTICK_IFORCE_232=m
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-CONFIG_JOYSTICK_FSIA6B=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_PEGASUS=m
-# CONFIG_TABLET_SERIAL_WACOM4 is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_PROPERTIES=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879_SPI=m
-CONFIG_TOUCHSCREEN_ADC=m
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
-CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_BU21029=m
-CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
-CONFIG_TOUCHSCREEN_CY8CTMA140=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
-CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
-CONFIG_TOUCHSCREEN_DA9052=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
-CONFIG_TOUCHSCREEN_EXC3000=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GOODIX=m
-CONFIG_TOUCHSCREEN_HIDEEP=m
-CONFIG_TOUCHSCREEN_ILI210X=m
-CONFIG_TOUCHSCREEN_S6SY761=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_EKTF2127=m
-CONFIG_TOUCHSCREEN_ELAN=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_WACOM_I2C=m
-CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MMS114=m
-CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
-# CONFIG_TOUCHSCREEN_UCB1400 is not set
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
-# CONFIG_TOUCHSCREEN_WM831X is not set
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-CONFIG_TOUCHSCREEN_TSC200X_CORE=m
-CONFIG_TOUCHSCREEN_TSC2004=m
-CONFIG_TOUCHSCREEN_TSC2005=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
-# CONFIG_TOUCHSCREEN_PCAP is not set
-CONFIG_TOUCHSCREEN_RM_TS=m
-CONFIG_TOUCHSCREEN_SILEAD=m
-CONFIG_TOUCHSCREEN_SIS_I2C=m
-CONFIG_TOUCHSCREEN_ST1232=m
-# CONFIG_TOUCHSCREEN_STMFTS is not set
-CONFIG_TOUCHSCREEN_SUR40=m
-CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
-CONFIG_TOUCHSCREEN_SX8654=m
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_TOUCHSCREEN_ZET6223=m
-CONFIG_TOUCHSCREEN_ZFORCE=m
-CONFIG_TOUCHSCREEN_ROHM_BU21023=m
-CONFIG_TOUCHSCREEN_IQS5XX=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
-CONFIG_INPUT_ARIZONA_HAPTICS=m
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_E3X0_BUTTON=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MAX77693_HAPTIC=m
-CONFIG_INPUT_MC13783_PWRBUTTON=m
-CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_APANEL=m
-# CONFIG_INPUT_GPIO_BEEPER is not set
-CONFIG_INPUT_GPIO_DECODER=m
-CONFIG_INPUT_GPIO_VIBRA=m
-# CONFIG_INPUT_WISTRON_BTNS is not set
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_REGULATOR_HAPTIC=m
-CONFIG_INPUT_RETU_PWRBUTTON=m
-CONFIG_INPUT_AXP20X_PEK=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_PWM_BEEPER=m
-CONFIG_INPUT_PWM_VIBRA=m
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-CONFIG_INPUT_DA9052_ONKEY=m
-CONFIG_INPUT_DA9063_ONKEY=m
-# CONFIG_INPUT_WM831X_ON is not set
-# CONFIG_INPUT_PCAP is not set
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
-CONFIG_INPUT_IMS_PCU=m
-CONFIG_INPUT_IQS269A=m
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
-CONFIG_INPUT_DRV260X_HAPTICS=m
-CONFIG_INPUT_DRV2665_HAPTICS=m
-CONFIG_INPUT_DRV2667_HAPTICS=m
-CONFIG_RMI4_CORE=m
-CONFIG_RMI4_I2C=m
-CONFIG_RMI4_SPI=m
-CONFIG_RMI4_SMB=m
-CONFIG_RMI4_F03=y
-CONFIG_RMI4_F03_SERIO=m
-CONFIG_RMI4_2D_SENSOR=y
-CONFIG_RMI4_F11=y
-CONFIG_RMI4_F12=y
-CONFIG_RMI4_F30=y
-CONFIG_RMI4_F34=y
-# CONFIG_RMI4_F54 is not set
-CONFIG_RMI4_F55=y
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-CONFIG_SERIO_ARC_PS2=m
-CONFIG_HYPERV_KEYBOARD=m
-CONFIG_SERIO_GPIO_PS2=m
-CONFIG_USERIO=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_LDISC_AUTOLOAD=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_16550A_VARIANTS=y
-CONFIG_SERIAL_8250_FINTEK=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_EXAR=y
-CONFIG_SERIAL_8250_MEN_MCB=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_8250_DWLIB=y
-CONFIG_SERIAL_8250_DW=m
-CONFIG_SERIAL_8250_RT288X=y
-CONFIG_SERIAL_8250_LPSS=m
-CONFIG_SERIAL_8250_MID=m
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_MAX3100=m
-CONFIG_SERIAL_MAX310X=y
-CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_UARTLITE_NR_UARTS=1
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_LANTIQ=m
-CONFIG_SERIAL_SCCNXP=y
-CONFIG_SERIAL_SCCNXP_CONSOLE=y
-# CONFIG_SERIAL_SC16IS7XX is not set
-CONFIG_SERIAL_TIMBERDALE=m
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_IFX6X60=m
-CONFIG_SERIAL_PCH_UART=m
-CONFIG_SERIAL_ARC=m
-CONFIG_SERIAL_ARC_NR_PORTS=1
-CONFIG_SERIAL_RP2=m
-CONFIG_SERIAL_RP2_NR_UARTS=32
-CONFIG_SERIAL_FSL_LPUART=m
-CONFIG_SERIAL_FSL_LINFLEXUART=m
-# CONFIG_SERIAL_MEN_Z135 is not set
-# CONFIG_SERIAL_SPRD is not set
-# end of Serial drivers
-
-CONFIG_SERIAL_MCTRL_GPIO=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_ISI=m
-CONFIG_N_HDLC=m
-CONFIG_N_GSM=m
-CONFIG_NOZOMI=m
-CONFIG_NULL_TTY=m
-CONFIG_TRACE_ROUTER=m
-CONFIG_TRACE_SINK=m
-CONFIG_HVC_DRIVER=y
-CONFIG_SERIAL_DEV_BUS=m
-CONFIG_TTY_PRINTK=m
-CONFIG_TTY_PRINTK_LEVEL=6
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_DMI_DECODE=y
-CONFIG_IPMI_PLAT_DATA=y
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_SSIF=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-# CONFIG_IPMB_DEVICE_INTERFACE is not set
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_BA431=m
-CONFIG_HW_RANDOM_GEODE=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_APPLICOM=m
-# CONFIG_SONYPI is not set
-CONFIG_MWAVE=m
-# CONFIG_PC8736x_GPIO is not set
-# CONFIG_NSC_GPIO is not set
-CONFIG_DEVMEM=y
-# CONFIG_DEVKMEM is not set
-CONFIG_NVRAM=m
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
-CONFIG_DEVPORT=y
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HPET_MMAP_DEFAULT=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_HW_RANDOM_TPM=y
-CONFIG_TCG_TIS_CORE=m
-CONFIG_TCG_TIS=m
-CONFIG_TCG_TIS_SPI=m
-CONFIG_TCG_TIS_SPI_CR50=y
-CONFIG_TCG_TIS_I2C_ATMEL=m
-CONFIG_TCG_TIS_I2C_INFINEON=m
-CONFIG_TCG_TIS_I2C_NUVOTON=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-CONFIG_TCG_CRB=m
-CONFIG_TCG_VTPM_PROXY=m
-CONFIG_TCG_TIS_ST33ZP24=m
-CONFIG_TCG_TIS_ST33ZP24_I2C=m
-CONFIG_TCG_TIS_ST33ZP24_SPI=m
-CONFIG_TELCLOCK=m
-CONFIG_XILLYBUS=m
-CONFIG_XILLYBUS_PCIE=m
-# end of Character devices
-
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-CONFIG_ACPI_I2C_OPREGION=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_GPIO=m
-# CONFIG_I2C_MUX_LTC4306 is not set
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-CONFIG_I2C_MUX_REG=m
-CONFIG_I2C_MUX_MLXCPLD=m
-# end of Multiplexer I2C Chip support
-
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_AMD_MP2=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_ISMT=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_NVIDIA_GPU=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_CBUS_GPIO=m
-CONFIG_I2C_DESIGNWARE_CORE=m
-# CONFIG_I2C_DESIGNWARE_SLAVE is not set
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
-CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_EG20T=m
-CONFIG_I2C_EMEV2=m
-CONFIG_I2C_GPIO=m
-# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
-CONFIG_I2C_KEMPLD=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_SIMTEC=m
-# CONFIG_I2C_XILINX is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_DLN2=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_ROBOTFUZZ_OSIF=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIPERBOARD=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_CROS_EC_TUNNEL=m
-# CONFIG_SCx200_ACB is not set
-# end of I2C Hardware Bus support
-
-# CONFIG_I2C_STUB is not set
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SLAVE_EEPROM=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-CONFIG_I3C=m
-CONFIG_CDNS_I3C_MASTER=m
-CONFIG_DW_I3C_MASTER=m
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_MEM=y
-
-#
-# SPI Master Controller Drivers
-#
-CONFIG_SPI_ALTERA=m
-CONFIG_SPI_AXI_SPI_ENGINE=m
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-CONFIG_SPI_CADENCE=m
-CONFIG_SPI_DESIGNWARE=m
-CONFIG_SPI_DW_DMA=y
-CONFIG_SPI_DW_PCI=m
-CONFIG_SPI_DW_MMIO=m
-CONFIG_SPI_DLN2=m
-CONFIG_SPI_NXP_FLEXSPI=m
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_LM70_LLP=m
-CONFIG_SPI_LANTIQ_SSC=m
-CONFIG_SPI_OC_TINY=m
-CONFIG_SPI_PXA2XX=m
-CONFIG_SPI_PXA2XX_PCI=m
-CONFIG_SPI_ROCKCHIP=m
-CONFIG_SPI_SC18IS602=m
-CONFIG_SPI_SIFIVE=m
-CONFIG_SPI_MXIC=m
-CONFIG_SPI_TOPCLIFF_PCH=m
-CONFIG_SPI_XCOMM=m
-CONFIG_SPI_XILINX=m
-CONFIG_SPI_ZYNQMP_GQSPI=m
-CONFIG_SPI_AMD=m
-
-#
-# SPI Multiplexer support
-#
-CONFIG_SPI_MUX=m
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_LOOPBACK_TEST=m
-CONFIG_SPI_TLE62X0=m
-# CONFIG_SPI_SLAVE is not set
-CONFIG_SPI_DYNAMIC=y
-CONFIG_SPMI=m
-CONFIG_HSI=m
-CONFIG_HSI_BOARDINFO=y
-
-#
-# HSI controllers
-#
-
-#
-# HSI clients
-#
-CONFIG_HSI_CHAR=m
-CONFIG_PPS=y
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-CONFIG_PPS_CLIENT_KTIMER=m
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
-CONFIG_PPS_CLIENT_GPIO=m
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=y
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=y
-CONFIG_PTP_1588_CLOCK_IDT82P33=m
-CONFIG_PTP_1588_CLOCK_IDTCM=m
-CONFIG_PTP_1588_CLOCK_VMW=m
-# end of PTP clock support
-
-CONFIG_PINCTRL=y
-CONFIG_PINMUX=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
-CONFIG_PINCTRL_AMD=y
-CONFIG_PINCTRL_DA9062=m
-# CONFIG_PINCTRL_MCP23S08 is not set
-# CONFIG_PINCTRL_SX150X is not set
-CONFIG_PINCTRL_BAYTRAIL=y
-CONFIG_PINCTRL_CHERRYVIEW=y
-CONFIG_PINCTRL_LYNXPOINT=m
-CONFIG_PINCTRL_INTEL=m
-CONFIG_PINCTRL_BROXTON=m
-CONFIG_PINCTRL_CANNONLAKE=m
-CONFIG_PINCTRL_CEDARFORK=m
-CONFIG_PINCTRL_DENVERTON=m
-CONFIG_PINCTRL_EMMITSBURG=m
-CONFIG_PINCTRL_GEMINILAKE=m
-CONFIG_PINCTRL_ICELAKE=m
-CONFIG_PINCTRL_JASPERLAKE=m
-CONFIG_PINCTRL_LEWISBURG=m
-CONFIG_PINCTRL_SUNRISEPOINT=m
-CONFIG_PINCTRL_TIGERLAKE=m
-CONFIG_PINCTRL_MADERA=m
-CONFIG_PINCTRL_CS47L35=y
-CONFIG_PINCTRL_CS47L85=y
-CONFIG_PINCTRL_CS47L90=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIOLIB_FASTPATH_LIMIT=512
-CONFIG_GPIO_ACPI=y
-CONFIG_GPIOLIB_IRQCHIP=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC=m
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO drivers
-#
-CONFIG_GPIO_AMDPT=m
-CONFIG_GPIO_DWAPB=m
-CONFIG_GPIO_EXAR=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_ICH=m
-CONFIG_GPIO_MB86S7X=m
-CONFIG_GPIO_MENZ127=m
-CONFIG_GPIO_VX855=m
-# CONFIG_GPIO_XILINX is not set
-CONFIG_GPIO_AMD_FCH=m
-# end of Memory mapped GPIO drivers
-
-#
-# Port-mapped I/O GPIO drivers
-#
-CONFIG_GPIO_F7188X=m
-CONFIG_GPIO_IT87=m
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_SCH311X=m
-# CONFIG_GPIO_WINBOND is not set
-# CONFIG_GPIO_WS16C48 is not set
-# end of Port-mapped I/O GPIO drivers
-
-#
-# I2C GPIO expanders
-#
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCA953X_IRQ=y
-CONFIG_GPIO_PCA9570=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_TPIC2810=m
-# end of I2C GPIO expanders
-
-#
-# MFD GPIO expanders
-#
-CONFIG_GPIO_ARIZONA=m
-CONFIG_GPIO_BD9571MWV=m
-CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_DA9052=m
-CONFIG_GPIO_DLN2=m
-CONFIG_GPIO_JANZ_TTL=m
-CONFIG_GPIO_KEMPLD=m
-CONFIG_GPIO_LP3943=m
-CONFIG_GPIO_LP873X=m
-CONFIG_GPIO_MADERA=m
-CONFIG_GPIO_MSIC=y
-CONFIG_GPIO_TIMBERDALE=y
-CONFIG_GPIO_TPS65086=m
-# CONFIG_GPIO_TPS65912 is not set
-CONFIG_GPIO_TQMX86=m
-CONFIG_GPIO_UCB1400=m
-# CONFIG_GPIO_WM831X is not set
-# end of MFD GPIO expanders
-
-#
-# PCI GPIO expanders
-#
-CONFIG_GPIO_AMD8111=m
-CONFIG_GPIO_ML_IOH=m
-CONFIG_GPIO_PCH=m
-CONFIG_GPIO_PCI_IDIO_16=m
-# CONFIG_GPIO_PCIE_IDIO_24 is not set
-CONFIG_GPIO_RDC321X=m
-# end of PCI GPIO expanders
-
-#
-# SPI GPIO expanders
-#
-CONFIG_GPIO_MAX3191X=m
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_PISOSR=m
-# CONFIG_GPIO_XRA1403 is not set
-# end of SPI GPIO expanders
-
-#
-# USB GPIO expanders
-#
-CONFIG_GPIO_VIPERBOARD=m
-# end of USB GPIO expanders
-
-CONFIG_GPIO_AGGREGATOR=m
-CONFIG_GPIO_MOCKUP=m
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS1WM=m
-CONFIG_W1_MASTER_GPIO=m
-CONFIG_W1_MASTER_SGI=m
-# end of 1-wire Bus Masters
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2405=m
-CONFIG_W1_SLAVE_DS2408=m
-CONFIG_W1_SLAVE_DS2408_READBACK=y
-CONFIG_W1_SLAVE_DS2413=m
-# CONFIG_W1_SLAVE_DS2406 is not set
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2805=m
-CONFIG_W1_SLAVE_DS2430=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-CONFIG_W1_SLAVE_DS2433_CRC=y
-# CONFIG_W1_SLAVE_DS2438 is not set
-CONFIG_W1_SLAVE_DS250X=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_DS2781=m
-CONFIG_W1_SLAVE_DS28E04=m
-CONFIG_W1_SLAVE_DS28E17=m
-# end of 1-wire Slaves
-
-CONFIG_POWER_AVS=y
-CONFIG_QCOM_CPR=m
-# CONFIG_POWER_RESET is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_POWER_SUPPLY_HWMON=y
-CONFIG_PDA_POWER=m
-CONFIG_GENERIC_ADC_BATTERY=m
-# CONFIG_WM831X_BACKUP is not set
-# CONFIG_WM831X_POWER is not set
-CONFIG_TEST_POWER=m
-CONFIG_CHARGER_ADP5061=m
-CONFIG_BATTERY_CW2015=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2780=m
-CONFIG_BATTERY_DS2781=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_SBS=m
-CONFIG_CHARGER_SBS=m
-CONFIG_MANAGER_SBS=m
-CONFIG_BATTERY_BQ27XXX=m
-CONFIG_BATTERY_BQ27XXX_I2C=m
-CONFIG_BATTERY_BQ27XXX_HDQ=m
-# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
-CONFIG_BATTERY_DA9052=m
-CONFIG_CHARGER_DA9150=m
-CONFIG_BATTERY_DA9150=m
-CONFIG_AXP20X_POWER=m
-CONFIG_AXP288_CHARGER=m
-CONFIG_AXP288_FUEL_GAUGE=m
-CONFIG_BATTERY_MAX17040=m
-CONFIG_BATTERY_MAX17042=m
-CONFIG_BATTERY_MAX1721X=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_CHARGER_ISP1704=m
-CONFIG_CHARGER_MAX8903=m
-CONFIG_CHARGER_LP8727=m
-CONFIG_CHARGER_GPIO=m
-CONFIG_CHARGER_MANAGER=y
-CONFIG_CHARGER_LT3651=m
-CONFIG_CHARGER_MP2629=m
-CONFIG_CHARGER_BQ2415X=m
-CONFIG_CHARGER_BQ24190=m
-CONFIG_CHARGER_BQ24257=m
-CONFIG_CHARGER_BQ24735=m
-CONFIG_CHARGER_BQ2515X=m
-CONFIG_CHARGER_BQ25890=m
-CONFIG_CHARGER_SMB347=m
-CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_BATTERY_RT5033=m
-CONFIG_CHARGER_RT9455=m
-CONFIG_CHARGER_CROS_USBPD=m
-CONFIG_CHARGER_BD99954=m
-CONFIG_HWMON=y
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7314=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM1177=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_ADT7310=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_AS370=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_AXI_FAN_CONTROL=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_AMD_ENERGY=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
-# CONFIG_SENSORS_ASPEED is not set
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_CORSAIR_CPRO=m
-CONFIG_SENSORS_DRIVETEMP=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DELL_SMM=m
-CONFIG_SENSORS_DA9052_ADC=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_MC13783_ADC=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_FTSTEUTATES=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_HIH6130=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IIO_HWMON=m
-CONFIG_SENSORS_I5500=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-# CONFIG_SENSORS_POWR1220 is not set
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC2947=m
-CONFIG_SENSORS_LTC2947_I2C=m
-CONFIG_SENSORS_LTC2947_SPI=m
-CONFIG_SENSORS_LTC2990=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX1111=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX31722=m
-CONFIG_SENSORS_MAX31730=m
-CONFIG_SENSORS_MAX6621=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_TC654=m
-CONFIG_SENSORS_MENF21BMC_HWMON=m
-CONFIG_SENSORS_ADCXX=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM70=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_NPCM7XX=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_BEL_PFE=m
-CONFIG_SENSORS_IBM_CFFPS=m
-CONFIG_SENSORS_INSPUR_IPSPS=m
-# CONFIG_SENSORS_IR35221 is not set
-CONFIG_SENSORS_IR38064=m
-# CONFIG_SENSORS_IRPS5401 is not set
-CONFIG_SENSORS_ISL68137=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-# CONFIG_SENSORS_LTC2978_REGULATOR is not set
-CONFIG_SENSORS_LTC3815=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX16601=m
-CONFIG_SENSORS_MAX20730=m
-CONFIG_SENSORS_MAX20751=m
-CONFIG_SENSORS_MAX31785=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-# CONFIG_SENSORS_PXE1610 is not set
-# CONFIG_SENSORS_TPS40422 is not set
-CONFIG_SENSORS_TPS53679=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_XDPE122=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHT3x=m
-# CONFIG_SENSORS_SHTC1 is not set
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_STTS751=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_INA209=m
-CONFIG_SENSORS_INA2XX=m
-CONFIG_SENSORS_INA3221=m
-CONFIG_SENSORS_TC74=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-# CONFIG_SENSORS_TMP103 is not set
-CONFIG_SENSORS_TMP108=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_TMP513=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-# CONFIG_SENSORS_W83773G is not set
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-# CONFIG_SENSORS_WM831X is not set
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_THERMAL=y
-CONFIG_THERMAL_NETLINK=y
-# CONFIG_THERMAL_STATISTICS is not set
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
-# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-CONFIG_DEVFREQ_THERMAL=y
-# CONFIG_THERMAL_EMULATION is not set
-
-#
-# Intel thermal drivers
-#
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_X86_PKG_TEMP_THERMAL=m
-CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
-# CONFIG_INTEL_SOC_DTS_THERMAL is not set
-
-#
-# ACPI INT340X thermal drivers
-#
-CONFIG_INT340X_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_INT3406_THERMAL=m
-# end of ACPI INT340X thermal drivers
-
-CONFIG_INTEL_PCH_THERMAL=m
-# end of Intel thermal drivers
-
-CONFIG_GENERIC_ADC_THERMAL=m
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
-CONFIG_WATCHDOG_OPEN_TIMEOUT=0
-CONFIG_WATCHDOG_SYSFS=y
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_DA9052_WATCHDOG=m
-CONFIG_DA9062_WATCHDOG=m
-CONFIG_MENF21BMC_WATCHDOG=m
-# CONFIG_MENZ069_WATCHDOG is not set
-CONFIG_WDAT_WDT=m
-# CONFIG_WM831X_WATCHDOG is not set
-CONFIG_XILINX_WATCHDOG=m
-CONFIG_ZIIRAVE_WATCHDOG=m
-CONFIG_CADENCE_WATCHDOG=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_MAX63XX_WATCHDOG=m
-CONFIG_RETU_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-# CONFIG_EBC_C384_WDT is not set
-CONFIG_F71808E_WDT=m
-CONFIG_SP5100_TCO=m
-CONFIG_GEODE_WDT=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_IE6XX_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_HPWDT_NMI_DECODING=y
-CONFIG_KEMPLD_WDT=m
-CONFIG_SC1200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_NV_TCO=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-# CONFIG_SBC7240_WDT is not set
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_TQMX86_WDT=m
-CONFIG_VIA_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_INTEL_MEI_WDT=m
-CONFIG_NI903X_WDT=m
-CONFIG_NIC7018_WDT=m
-CONFIG_MEN_A21_WDT=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_DRIVER_GPIO=y
-CONFIG_BCMA_POSSIBLE=y
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_SOC=y
-CONFIG_BCMA_DRIVER_PCI=y
-CONFIG_BCMA_SFLASH=y
-CONFIG_BCMA_DRIVER_GMAC_CMN=y
-CONFIG_BCMA_DRIVER_GPIO=y
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-CONFIG_MFD_CS5535=m
-# CONFIG_MFD_AS3711 is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_MFD_AAT2870_CORE is not set
-CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_BD9571MWV=m
-CONFIG_MFD_AXP20X=m
-CONFIG_MFD_AXP20X_I2C=m
-CONFIG_MFD_CROS_EC_DEV=m
-CONFIG_MFD_MADERA=m
-CONFIG_MFD_MADERA_I2C=m
-CONFIG_MFD_MADERA_SPI=m
-# CONFIG_MFD_CS47L15 is not set
-CONFIG_MFD_CS47L35=y
-CONFIG_MFD_CS47L85=y
-CONFIG_MFD_CS47L90=y
-# CONFIG_MFD_CS47L92 is not set
-# CONFIG_PMIC_DA903X is not set
-CONFIG_PMIC_DA9052=y
-CONFIG_MFD_DA9052_SPI=y
-# CONFIG_MFD_DA9052_I2C is not set
-# CONFIG_MFD_DA9055 is not set
-CONFIG_MFD_DA9062=m
-# CONFIG_MFD_DA9063 is not set
-CONFIG_MFD_DA9150=m
-CONFIG_MFD_DLN2=m
-CONFIG_MFD_MC13XXX=m
-CONFIG_MFD_MC13XXX_SPI=m
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_MFD_MP2629=m
-CONFIG_HTC_PASIC3=m
-# CONFIG_HTC_I2CPLD is not set
-CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
-CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
-# CONFIG_INTEL_SOC_PMIC_BXTWC is not set
-CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
-CONFIG_INTEL_SOC_PMIC_MRFLD=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
-CONFIG_MFD_INTEL_MSIC=y
-CONFIG_MFD_INTEL_PMC_BXT=m
-CONFIG_MFD_IQS62X=m
-CONFIG_MFD_JANZ_CMODIO=m
-CONFIG_MFD_KEMPLD=m
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77693 is not set
-CONFIG_MFD_MAX77843=y
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_MAX8997 is not set
-# CONFIG_MFD_MAX8998 is not set
-CONFIG_MFD_MT6360=m
-CONFIG_MFD_MT6397=m
-CONFIG_MFD_MENF21BMC=m
-CONFIG_EZX_PCAP=y
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_RT5033=m
-# CONFIG_MFD_RC5T583 is not set
-# CONFIG_MFD_SEC_CORE is not set
-CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
-CONFIG_MFD_SKY81452=m
-CONFIG_ABX500_CORE=y
-# CONFIG_AB3100_CORE is not set
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_MFD_LP3943=m
-# CONFIG_MFD_LP8788 is not set
-# CONFIG_MFD_TI_LMU is not set
-# CONFIG_MFD_PALMAS is not set
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_MFD_TPS65086=m
-# CONFIG_MFD_TPS65090 is not set
-CONFIG_MFD_TI_LP873X=m
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_MFD_TPS65910 is not set
-CONFIG_MFD_TPS65912=y
-# CONFIG_MFD_TPS65912_I2C is not set
-CONFIG_MFD_TPS65912_SPI=y
-# CONFIG_MFD_TPS80031 is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_TWL6040_CORE is not set
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MFD_LM3533=m
-CONFIG_MFD_TIMBERDALE=m
-CONFIG_MFD_TQMX86=m
-CONFIG_MFD_VX855=m
-CONFIG_MFD_ARIZONA=y
-CONFIG_MFD_ARIZONA_I2C=m
-CONFIG_MFD_ARIZONA_SPI=m
-CONFIG_MFD_CS47L24=y
-CONFIG_MFD_WM5102=y
-CONFIG_MFD_WM5110=y
-# CONFIG_MFD_WM8997 is not set
-CONFIG_MFD_WM8998=y
-# CONFIG_MFD_WM8400 is not set
-CONFIG_MFD_WM831X=y
-# CONFIG_MFD_WM831X_I2C is not set
-CONFIG_MFD_WM831X_SPI=y
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_RAVE_SP_CORE is not set
-# end of Multifunction device drivers
-
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
-CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-# CONFIG_REGULATOR_88PG86X is not set
-CONFIG_REGULATOR_ACT8865=m
-CONFIG_REGULATOR_AD5398=m
-# CONFIG_REGULATOR_ARIZONA_LDO1 is not set
-# CONFIG_REGULATOR_ARIZONA_MICSUPP is not set
-CONFIG_REGULATOR_AXP20X=m
-CONFIG_REGULATOR_BCM590XX=m
-# CONFIG_REGULATOR_BD9571MWV is not set
-CONFIG_REGULATOR_DA9052=m
-CONFIG_REGULATOR_DA9062=m
-CONFIG_REGULATOR_DA9210=m
-# CONFIG_REGULATOR_DA9211 is not set
-CONFIG_REGULATOR_FAN53555=m
-CONFIG_REGULATOR_GPIO=m
-CONFIG_REGULATOR_ISL9305=m
-CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_LP872X=m
-CONFIG_REGULATOR_LP8755=m
-# CONFIG_REGULATOR_LTC3589 is not set
-CONFIG_REGULATOR_LTC3676=m
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_MAX77693=m
-CONFIG_REGULATOR_MAX77826=m
-CONFIG_REGULATOR_MC13XXX_CORE=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_MC13892=m
-CONFIG_REGULATOR_MP8859=m
-CONFIG_REGULATOR_MT6311=m
-CONFIG_REGULATOR_MT6323=m
-CONFIG_REGULATOR_MT6358=m
-CONFIG_REGULATOR_MT6397=m
-CONFIG_REGULATOR_PCA9450=m
-CONFIG_REGULATOR_PCAP=m
-CONFIG_REGULATOR_PCF50633=m
-CONFIG_REGULATOR_PFUZE100=m
-CONFIG_REGULATOR_PV88060=m
-CONFIG_REGULATOR_PV88080=m
-CONFIG_REGULATOR_PV88090=m
-CONFIG_REGULATOR_PWM=m
-CONFIG_REGULATOR_QCOM_SPMI=m
-CONFIG_REGULATOR_QCOM_USB_VBUS=m
-CONFIG_REGULATOR_RT5033=m
-CONFIG_REGULATOR_SKY81452=m
-# CONFIG_REGULATOR_SLG51000 is not set
-CONFIG_REGULATOR_TPS51632=m
-CONFIG_REGULATOR_TPS6105X=m
-CONFIG_REGULATOR_TPS62360=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_TPS65086=m
-# CONFIG_REGULATOR_TPS65132 is not set
-CONFIG_REGULATOR_TPS6524X=m
-# CONFIG_REGULATOR_TPS65912 is not set
-# CONFIG_REGULATOR_WM831X is not set
-CONFIG_REGULATOR_QCOM_LABIBB=m
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_LIRC=y
-CONFIG_RC_DECODERS=y
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_SHARP_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_XMP_DECODER=m
-# CONFIG_IR_IMON_DECODER is not set
-CONFIG_IR_RCMM_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_IMON=m
-# CONFIG_IR_IMON_RAW is not set
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_IR_IGORPLUGUSB=m
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_SERIAL=m
-CONFIG_IR_SERIAL_TRANSMITTER=y
-# CONFIG_IR_SIR is not set
-CONFIG_RC_XBOX_DVD=m
-CONFIG_IR_TOY=m
-CONFIG_CEC_CORE=m
-CONFIG_CEC_NOTIFIER=y
-CONFIG_MEDIA_CEC_RC=y
-CONFIG_MEDIA_CEC_SUPPORT=y
-CONFIG_CEC_CH7322=m
-CONFIG_CEC_CROS_EC=m
-CONFIG_CEC_SECO=m
-CONFIG_CEC_SECO_RC=y
-CONFIG_USB_PULSE8_CEC=m
-# CONFIG_USB_RAINSHADOW_CEC is not set
-CONFIG_MEDIA_SUPPORT=m
-# CONFIG_MEDIA_SUPPORT_FILTER is not set
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-
-#
-# Media device types
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_PLATFORM_SUPPORT=y
-CONFIG_MEDIA_TEST_SUPPORT=y
-# end of Media device types
-
-#
-# Media core support
-#
-CONFIG_VIDEO_DEV=m
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_DVB_CORE=m
-# end of Media core support
-
-#
-# Video4Linux options
-#
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L2_I2C=y
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_V4L2_FLASH_LED_CLASS=m
-CONFIG_V4L2_FWNODE=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-# end of Video4Linux options
-
-#
-# Media controller options
-#
-CONFIG_MEDIA_CONTROLLER_DVB=y
-# end of Media controller options
-
-#
-# Digital TV options
-#
-# CONFIG_DVB_MMAP is not set
-CONFIG_DVB_NET=y
-CONFIG_DVB_MAX_ADAPTERS=8
-CONFIG_DVB_DYNAMIC_MINORS=y
-# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
-# CONFIG_DVB_ULE_DEBUG is not set
-# end of Digital TV options
-
-#
-# Media drivers
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-# CONFIG_USB_GSPCA_DTCS033 is not set
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_VIDEO_USBTV=m
-
-#
-# Analog TV USB devices
-#
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_LOADER=m
-CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-
-#
-# Analog/digital TV USB devices
-#
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_AU0828_RC is not set
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_DIB3000MC=m
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-# CONFIG_DVB_USB_CXUSB_ANALOG is not set
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_USB_ZD1301=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-CONFIG_DVB_AS102=m
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-
-#
-# Software defined radio USB devices
-#
-CONFIG_USB_AIRSPY=m
-CONFIG_USB_HACKRF=m
-CONFIG_USB_MSI2500=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-CONFIG_VIDEO_MEYE=m
-# CONFIG_VIDEO_SOLO6X10 is not set
-CONFIG_VIDEO_TW5864=m
-CONFIG_VIDEO_TW68=m
-CONFIG_VIDEO_TW686X=m
-
-#
-# Media capture/analog TV support
-#
-CONFIG_VIDEO_IVTV=m
-# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
-CONFIG_VIDEO_IVTV_ALSA=m
-CONFIG_VIDEO_FB_IVTV=m
-# CONFIG_VIDEO_FB_IVTV_FORCE_PAT is not set
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DT3155=m
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_ENABLE_VP3054=y
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_BT848=m
-CONFIG_DVB_BT8XX=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7134_GO7007=m
-CONFIG_VIDEO_SAA7164=m
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-CONFIG_DVB_PT3=m
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_DDBRIDGE=m
-# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
-CONFIG_DVB_SMIPCIE=m
-CONFIG_DVB_NETUP_UNIDVB=m
-# CONFIG_VIDEO_IPU3_CIO2 is not set
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_TEA575X=m
-CONFIG_RADIO_SI470X=m
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_SI4713=m
-CONFIG_PLATFORM_SI4713=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI476X=m
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_SHARK=m
-CONFIG_RADIO_SHARK2=m
-CONFIG_USB_KEENE=m
-CONFIG_USB_RAREMONO=m
-CONFIG_USB_MA901=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_TIMBERDALE=m
-CONFIG_RADIO_WL1273=m
-CONFIG_RADIO_WL128X=m
-CONFIG_MEDIA_COMMON_OPTIONS=y
-
-#
-# common driver options
-#
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_V4L2=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_VIA_CAMERA=m
-# CONFIG_VIDEO_CADENCE is not set
-CONFIG_VIDEO_ASPEED=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
-CONFIG_DVB_PLATFORM_DRIVERS=y
-CONFIG_SDR_PLATFORM_DRIVERS=y
-
-#
-# MMC/SDIO DVB adapters
-#
-CONFIG_SMS_SDIO_DRV=m
-# CONFIG_V4L_TEST_DRIVERS is not set
-
-#
-# FireWire (IEEE 1394) Adapters
-#
-# CONFIG_DVB_FIREDTV is not set
-# end of Media drivers
-
-#
-# Media ancillary drivers
-#
-CONFIG_MEDIA_ATTACH=y
-
-#
-# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
-#
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-# CONFIG_VIDEO_TDA1997X is not set
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS3308=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-# CONFIG_VIDEO_TLV320AIC23B is not set
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-# end of Audio decoders, processors and mixers
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-# end of RDS decoders
-
-#
-# Video decoders
-#
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7183 is not set
-# CONFIG_VIDEO_ADV7604 is not set
-# CONFIG_VIDEO_ADV7842 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_ML86V7667 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-CONFIG_VIDEO_SAA711X=m
-# CONFIG_VIDEO_TC358743 is not set
-# CONFIG_VIDEO_TVP514X is not set
-CONFIG_VIDEO_TVP5150=m
-# CONFIG_VIDEO_TVP7002 is not set
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-# CONFIG_VIDEO_TW9910 is not set
-# CONFIG_VIDEO_VPX3220 is not set
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-# end of Video decoders
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV7393 is not set
-# CONFIG_VIDEO_ADV7511 is not set
-# CONFIG_VIDEO_AD9389B is not set
-# CONFIG_VIDEO_AK881X is not set
-# CONFIG_VIDEO_THS8200 is not set
-# end of Video encoders
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-# end of Video improvement chips
-
-#
-# Audio/Video compression chips
-#
-CONFIG_VIDEO_SAA6752HS=m
-# end of Audio/Video compression chips
-
-#
-# SDR tuner chips
-#
-CONFIG_SDR_MAX2175=m
-# end of SDR tuner chips
-
-#
-# Miscellaneous helper chips
-#
-# CONFIG_VIDEO_THS7303 is not set
-CONFIG_VIDEO_M52790=m
-# CONFIG_VIDEO_I2C is not set
-# CONFIG_VIDEO_ST_MIPID02 is not set
-# end of Miscellaneous helper chips
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_HI556=m
-# CONFIG_VIDEO_IMX214 is not set
-CONFIG_VIDEO_IMX219=m
-# CONFIG_VIDEO_IMX258 is not set
-# CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX290 is not set
-# CONFIG_VIDEO_IMX319 is not set
-# CONFIG_VIDEO_IMX355 is not set
-CONFIG_VIDEO_OV2640=m
-# CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV2680 is not set
-# CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV2740 is not set
-# CONFIG_VIDEO_OV5647 is not set
-# CONFIG_VIDEO_OV6650 is not set
-# CONFIG_VIDEO_OV5670 is not set
-CONFIG_VIDEO_OV5675=m
-# CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV7251 is not set
-# CONFIG_VIDEO_OV772X is not set
-CONFIG_VIDEO_OV7640=m
-CONFIG_VIDEO_OV7670=m
-# CONFIG_VIDEO_OV7740 is not set
-# CONFIG_VIDEO_OV8856 is not set
-# CONFIG_VIDEO_OV9640 is not set
-# CONFIG_VIDEO_OV9650 is not set
-# CONFIG_VIDEO_OV13858 is not set
-# CONFIG_VIDEO_VS6624 is not set
-# CONFIG_VIDEO_MT9M001 is not set
-# CONFIG_VIDEO_MT9M032 is not set
-# CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9P031 is not set
-# CONFIG_VIDEO_MT9T001 is not set
-# CONFIG_VIDEO_MT9T112 is not set
-CONFIG_VIDEO_MT9V011=m
-# CONFIG_VIDEO_MT9V032 is not set
-# CONFIG_VIDEO_MT9V111 is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_M5MOLS is not set
-CONFIG_VIDEO_RDACM20=m
-# CONFIG_VIDEO_RJ54N1 is not set
-# CONFIG_VIDEO_S5K6AA is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_S5K4ECGX is not set
-# CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_SMIAPP is not set
-# CONFIG_VIDEO_ET8EK8 is not set
-# CONFIG_VIDEO_S5C73M3 is not set
-# end of Camera sensor devices
-
-#
-# Lens drivers
-#
-# CONFIG_VIDEO_AD5820 is not set
-# CONFIG_VIDEO_AK7375 is not set
-# CONFIG_VIDEO_DW9714 is not set
-CONFIG_VIDEO_DW9768=m
-# CONFIG_VIDEO_DW9807_VCM is not set
-# end of Lens drivers
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_LM3560 is not set
-# CONFIG_VIDEO_LM3646 is not set
-# end of Flash devices
-
-#
-# SPI helper chips
-#
-# CONFIG_VIDEO_GS1662 is not set
-# end of SPI helper chips
-
-#
-# Media SPI Adapters
-#
-# CONFIG_CXD2880_SPI_DRV is not set
-# end of Media SPI Adapters
-
-CONFIG_MEDIA_TUNER=m
-
-#
-# Customize TV tuners
-#
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA18250=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MSI001=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_M88RS6000T=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_MXL301RF=m
-CONFIG_MEDIA_TUNER_QM1D1C0042=m
-CONFIG_MEDIA_TUNER_QM1D1B0004=m
-# end of Customize TV tuners
-
-#
-# Customise DVB Frontends
-#
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV0910=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_STV6111=m
-CONFIG_DVB_MXL5XX=m
-CONFIG_DVB_M88DS3103=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_SI2165=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24117=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-# CONFIG_DVB_S5H1432 is not set
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-# CONFIG_DVB_DIB9000 is not set
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_CXD2841ER=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_RTL2832_SDR=m
-CONFIG_DVB_SI2168=m
-CONFIG_DVB_AS102_FE=m
-CONFIG_DVB_ZD1301_DEMOD=m
-CONFIG_DVB_GP8PSK_FE=m
-# CONFIG_DVB_CXD2880 is not set
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT3306A=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_TC90522=m
-# CONFIG_DVB_MN88443X is not set
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_LNBH25=m
-# CONFIG_DVB_LNBH29 is not set
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-# CONFIG_DVB_LGS8GL5 is not set
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_HORUS3A=m
-CONFIG_DVB_ASCOT2E=m
-CONFIG_DVB_HELENE=m
-
-#
-# Common Interface (EN50221) controller drivers
-#
-CONFIG_DVB_CXD2099=m
-CONFIG_DVB_SP2=m
-# end of Customise DVB Frontends
-
-#
-# Tools to develop new frontends
-#
-CONFIG_DVB_DUMMY_FE=m
-# end of Media ancillary drivers
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-# CONFIG_AGP_ALI is not set
-# CONFIG_AGP_ATI is not set
-# CONFIG_AGP_AMD is not set
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-# CONFIG_AGP_NVIDIA is not set
-CONFIG_AGP_SIS=m
-# CONFIG_AGP_SWORKS is not set
-CONFIG_AGP_VIA=m
-# CONFIG_AGP_EFFICEON is not set
-CONFIG_INTEL_GTT=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
-CONFIG_DRM_MIPI_DBI=m
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
-CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_DP_CEC=y
-CONFIG_DRM_TTM=m
-CONFIG_DRM_TTM_DMA_PAGE_POOL=y
-CONFIG_DRM_VRAM_HELPER=m
-CONFIG_DRM_TTM_HELPER=m
-CONFIG_DRM_GEM_CMA_HELPER=y
-CONFIG_DRM_KMS_CMA_HELPER=y
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_VM=y
-CONFIG_DRM_SCHED=m
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# end of I2C encoder or helper chips
-
-#
-# ARM devices
-#
-# end of ARM devices
-
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_USERPTR=y
-CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_AMDGPU_SI=y
-CONFIG_DRM_AMDGPU_CIK=y
-CONFIG_DRM_AMDGPU_USERPTR=y
-# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
-
-#
-# ACP (Audio CoProcessor) Configuration
-#
-CONFIG_DRM_AMD_ACP=y
-# end of ACP (Audio CoProcessor) Configuration
-
-#
-# Display Engine Configuration
-#
-CONFIG_DRM_AMD_DC=y
-CONFIG_DRM_AMD_DC_DCN=y
-CONFIG_DRM_AMD_DC_DCN3_0=y
-# CONFIG_DRM_AMD_DC_HDCP is not set
-# CONFIG_DEBUG_KERNEL_DC is not set
-# end of Display Engine Configuration
-
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-# CONFIG_NOUVEAU_DEBUG_MMU is not set
-# CONFIG_NOUVEAU_DEBUG_PUSH is not set
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_FORCE_PROBE=""
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_USERPTR=y
-
-#
-# drm/i915 Debugging
-#
-# CONFIG_DRM_I915_WERROR is not set
-# CONFIG_DRM_I915_DEBUG is not set
-# CONFIG_DRM_I915_DEBUG_MMIO is not set
-# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
-# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
-# CONFIG_DRM_I915_DEBUG_GUC is not set
-# CONFIG_DRM_I915_SELFTEST is not set
-# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
-# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
-# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
-# end of drm/i915 Debugging
-
-#
-# drm/i915 Profile Guided Optimisation
-#
-CONFIG_DRM_I915_FENCE_TIMEOUT=10000
-CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
-CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
-CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
-CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
-CONFIG_DRM_I915_STOP_TIMEOUT=100
-CONFIG_DRM_I915_TIMESLICE_DURATION=1
-# end of drm/i915 Profile Guided Optimisation
-
-CONFIG_DRM_VGEM=m
-CONFIG_DRM_VKMS=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
-# end of Display Panels
-
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-CONFIG_DRM_ANALOGIX_ANX78XX=m
-CONFIG_DRM_ANALOGIX_DP=m
-# end of Display Interface Bridges
-
-# CONFIG_DRM_ETNAVIV is not set
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_GM12U320=m
-CONFIG_TINYDRM_HX8357D=m
-# CONFIG_TINYDRM_ILI9225 is not set
-# CONFIG_TINYDRM_ILI9341 is not set
-# CONFIG_TINYDRM_ILI9486 is not set
-CONFIG_TINYDRM_MI0283QT=m
-CONFIG_TINYDRM_REPAPER=m
-CONFIG_TINYDRM_ST7586=m
-# CONFIG_TINYDRM_ST7735R is not set
-CONFIG_DRM_VBOXVIDEO=m
-CONFIG_DRM_LEGACY=y
-# CONFIG_DRM_TDFX is not set
-# CONFIG_DRM_R128 is not set
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_MGA is not set
-# CONFIG_DRM_SIS is not set
-# CONFIG_DRM_VIA is not set
-# CONFIG_DRM_SAVAGE is not set
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DDC=m
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_BACKLIGHT=m
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_UVESA=m
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_HGA is not set
-CONFIG_FB_OPENCORES=m
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-# CONFIG_FB_I810 is not set
-# CONFIG_FB_LE80578 is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-CONFIG_FB_VIA=m
-CONFIG_FB_VIA_DIRECT_PROCFS=y
-CONFIG_FB_VIA_X_COMPATIBILITY=y
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_SM501 is not set
-# CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_UDL=m
-CONFIG_FB_IBM_GXT4500=m
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-CONFIG_FB_HYPERV=m
-# CONFIG_FB_SIMPLE is not set
-CONFIG_FB_SM712=m
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-CONFIG_LCD_ILI922X=m
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_AMS369FG06=m
-CONFIG_LCD_LMS501KF03=m
-CONFIG_LCD_HX8357=m
-# CONFIG_LCD_OTM3225A is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_PWM=m
-CONFIG_BACKLIGHT_DA9052=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_QCOM_WLED=m
-CONFIG_BACKLIGHT_SAHARA=m
-# CONFIG_BACKLIGHT_WM831X is not set
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_PCF50633=m
-CONFIG_BACKLIGHT_LM3630A=m
-CONFIG_BACKLIGHT_LM3639=m
-CONFIG_BACKLIGHT_LP855X=m
-CONFIG_BACKLIGHT_SKY81452=m
-CONFIG_BACKLIGHT_GPIO=m
-CONFIG_BACKLIGHT_LV5207LP=m
-CONFIG_BACKLIGHT_BD6107=m
-# CONFIG_BACKLIGHT_ARCXCNN is not set
-# end of Backlight & LCD device support
-
-CONFIG_VGASTATE=m
-CONFIG_HDMI=y
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
-# end of Console display driver support
-
-# CONFIG_LOGO is not set
-# end of Graphics support
-
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_PCM_ELD=y
-CONFIG_SND_PCM_IEC958=y
-CONFIG_SND_DMAENGINE_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_SEQ_DEVICE=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_COMPRESS_OFFLOAD=m
-CONFIG_SND_JACK=y
-CONFIG_SND_JACK_INPUT_DEV=y
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_PCM_TIMER=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_PROC_FS=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_SEQUENCER_OSS=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_SEQ_MIDI_EVENT=m
-CONFIG_SND_SEQ_MIDI=m
-CONFIG_SND_SEQ_MIDI_EMUL=m
-CONFIG_SND_SEQ_VIRMIDI=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=1
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-# CONFIG_SND_ES1968_RADIO is not set
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-# CONFIG_SND_SIS7019 is not set
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-
-#
-# HD-Audio
-#
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_GENERIC_LEDS=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
-# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
-# end of HD-Audio
-
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_COMPONENT=y
-CONFIG_SND_HDA_I915=y
-CONFIG_SND_HDA_EXT_CORE=m
-CONFIG_SND_HDA_PREALLOC_SIZE=64
-CONFIG_SND_INTEL_NHLT=y
-CONFIG_SND_INTEL_DSP_CONFIG=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-# CONFIG_SND_BCD2000 is not set
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_DICE=m
-CONFIG_SND_OXFW=m
-# CONFIG_SND_ISIGHT is not set
-# CONFIG_SND_FIREWORKS is not set
-# CONFIG_SND_BEBOB is not set
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-# CONFIG_SND_FIREWIRE_MOTU is not set
-# CONFIG_SND_FIREFACE is not set
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_AC97_BUS=y
-CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
-CONFIG_SND_SOC_COMPRESS=y
-CONFIG_SND_SOC_TOPOLOGY=y
-CONFIG_SND_SOC_ACPI=m
-CONFIG_SND_SOC_AMD_ACP=m
-# CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
-CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-CONFIG_SND_SOC_AMD_ACP3x=m
-CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
-CONFIG_SND_SOC_AMD_RENOIR=m
-CONFIG_SND_SOC_AMD_RENOIR_MACH=m
-CONFIG_SND_ATMEL_SOC=m
-CONFIG_SND_BCM63XX_I2S_WHISTLER=m
-CONFIG_SND_DESIGNWARE_I2S=m
-# CONFIG_SND_DESIGNWARE_PCM is not set
-
-#
-# SoC Audio for Freescale CPUs
-#
-
-#
-# Common SoC Audio options for Freescale CPUs:
-#
-# CONFIG_SND_SOC_FSL_ASRC is not set
-# CONFIG_SND_SOC_FSL_SAI is not set
-CONFIG_SND_SOC_FSL_AUDMIX=m
-# CONFIG_SND_SOC_FSL_SSI is not set
-# CONFIG_SND_SOC_FSL_SPDIF is not set
-# CONFIG_SND_SOC_FSL_ESAI is not set
-CONFIG_SND_SOC_FSL_MICFIL=m
-# CONFIG_SND_SOC_IMX_AUDMUX is not set
-# end of SoC Audio for Freescale CPUs
-
-# CONFIG_SND_I2S_HI6210_I2S is not set
-CONFIG_SND_SOC_IMG=y
-CONFIG_SND_SOC_IMG_I2S_IN=m
-CONFIG_SND_SOC_IMG_I2S_OUT=m
-CONFIG_SND_SOC_IMG_PARALLEL_OUT=m
-CONFIG_SND_SOC_IMG_SPDIF_IN=m
-CONFIG_SND_SOC_IMG_SPDIF_OUT=m
-CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
-CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
-CONFIG_SND_SST_IPC=m
-CONFIG_SND_SST_IPC_ACPI=m
-CONFIG_SND_SOC_INTEL_SST_ACPI=m
-CONFIG_SND_SOC_INTEL_SST=m
-CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
-CONFIG_SND_SOC_INTEL_HASWELL=m
-CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
-# CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI is not set
-CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
-CONFIG_SND_SOC_INTEL_SKYLAKE=m
-CONFIG_SND_SOC_INTEL_SKL=m
-CONFIG_SND_SOC_INTEL_APL=m
-CONFIG_SND_SOC_INTEL_KBL=m
-CONFIG_SND_SOC_INTEL_GLK=m
-CONFIG_SND_SOC_INTEL_CNL=m
-CONFIG_SND_SOC_INTEL_CFL=m
-# CONFIG_SND_SOC_INTEL_CML_H is not set
-# CONFIG_SND_SOC_INTEL_CML_LP is not set
-CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
-CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
-CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
-CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
-CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
-CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
-CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
-CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
-CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
-CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
-CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
-CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
-CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
-CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
-# CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
-CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
-CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
-CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
-CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
-CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON=m
-CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
-CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
-CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH is not set
-CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
-CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m
-CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
-CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
-CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
-CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
-CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
-CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_MTK_BTCVSD=m
-CONFIG_SND_SOC_SOF_TOPLEVEL=y
-CONFIG_SND_SOC_SOF_PCI=m
-CONFIG_SND_SOC_SOF_ACPI=m
-# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set
-# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set
-CONFIG_SND_SOC_SOF=m
-CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
-CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
-CONFIG_SND_SOC_SOF_INTEL_ACPI=m
-CONFIG_SND_SOC_SOF_INTEL_PCI=m
-CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
-CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
-CONFIG_SND_SOC_SOF_INTEL_COMMON=m
-CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
-CONFIG_SND_SOC_SOF_MERRIFIELD=m
-CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_APOLLOLAKE=m
-CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_GEMINILAKE=m
-CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_CANNONLAKE=m
-CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_COFFEELAKE=m
-CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_ICELAKE=m
-# CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT is not set
-CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_TIGERLAKE=m
-CONFIG_SND_SOC_SOF_ELKHARTLAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
-CONFIG_SND_SOC_SOF_JASPERLAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_JASPERLAKE=m
-CONFIG_SND_SOC_SOF_HDA_COMMON=m
-CONFIG_SND_SOC_SOF_HDA_LINK=y
-CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
-# CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set
-CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
-CONFIG_SND_SOC_SOF_HDA=m
-CONFIG_SND_SOC_SOF_XTENSA=m
-
-#
-# STMicroelectronics STM32 SOC audio support
-#
-# end of STMicroelectronics STM32 SOC audio support
-
-CONFIG_SND_SOC_XILINX_I2S=m
-CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
-CONFIG_SND_SOC_XILINX_SPDIF=m
-CONFIG_SND_SOC_XTFPGA_I2S=m
-# CONFIG_ZX_TDM is not set
-CONFIG_SND_SOC_I2C_AND_SPI=m
-
-#
-# CODEC drivers
-#
-CONFIG_SND_SOC_AC97_CODEC=m
-CONFIG_SND_SOC_ADAU1701=m
-# CONFIG_SND_SOC_ADAU1761_I2C is not set
-# CONFIG_SND_SOC_ADAU1761_SPI is not set
-CONFIG_SND_SOC_ADAU7002=m
-CONFIG_SND_SOC_ADAU7118=m
-CONFIG_SND_SOC_ADAU7118_HW=m
-CONFIG_SND_SOC_ADAU7118_I2C=m
-CONFIG_SND_SOC_AK4104=m
-CONFIG_SND_SOC_AK4118=m
-# CONFIG_SND_SOC_AK4458 is not set
-CONFIG_SND_SOC_AK4554=m
-CONFIG_SND_SOC_AK4613=m
-CONFIG_SND_SOC_AK4642=m
-CONFIG_SND_SOC_AK5386=m
-# CONFIG_SND_SOC_AK5558 is not set
-# CONFIG_SND_SOC_ALC5623 is not set
-# CONFIG_SND_SOC_BD28623 is not set
-CONFIG_SND_SOC_BT_SCO=m
-CONFIG_SND_SOC_CROS_EC_CODEC=m
-CONFIG_SND_SOC_CS35L32=m
-CONFIG_SND_SOC_CS35L33=m
-CONFIG_SND_SOC_CS35L34=m
-# CONFIG_SND_SOC_CS35L35 is not set
-CONFIG_SND_SOC_CS35L36=m
-CONFIG_SND_SOC_CS42L42=m
-CONFIG_SND_SOC_CS42L51=m
-CONFIG_SND_SOC_CS42L51_I2C=m
-CONFIG_SND_SOC_CS42L52=m
-# CONFIG_SND_SOC_CS42L56 is not set
-CONFIG_SND_SOC_CS42L73=m
-# CONFIG_SND_SOC_CS4265 is not set
-CONFIG_SND_SOC_CS4270=m
-CONFIG_SND_SOC_CS4271=m
-CONFIG_SND_SOC_CS4271_I2C=m
-CONFIG_SND_SOC_CS4271_SPI=m
-CONFIG_SND_SOC_CS42XX8=m
-CONFIG_SND_SOC_CS42XX8_I2C=m
-CONFIG_SND_SOC_CS43130=m
-CONFIG_SND_SOC_CS4341=m
-CONFIG_SND_SOC_CS4349=m
-CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
-# CONFIG_SND_SOC_DA7213 is not set
-CONFIG_SND_SOC_DA7219=m
-CONFIG_SND_SOC_DMIC=m
-CONFIG_SND_SOC_HDMI_CODEC=m
-# CONFIG_SND_SOC_ES7134 is not set
-# CONFIG_SND_SOC_ES7241 is not set
-# CONFIG_SND_SOC_ES8316 is not set
-CONFIG_SND_SOC_ES8328=m
-CONFIG_SND_SOC_ES8328_I2C=m
-CONFIG_SND_SOC_ES8328_SPI=m
-CONFIG_SND_SOC_GTM601=m
-CONFIG_SND_SOC_HDAC_HDMI=m
-CONFIG_SND_SOC_HDAC_HDA=m
-CONFIG_SND_SOC_INNO_RK3036=m
-CONFIG_SND_SOC_MAX98088=m
-CONFIG_SND_SOC_MAX98090=m
-CONFIG_SND_SOC_MAX98357A=m
-CONFIG_SND_SOC_MAX98504=m
-# CONFIG_SND_SOC_MAX9867 is not set
-CONFIG_SND_SOC_MAX98927=m
-CONFIG_SND_SOC_MAX98373=m
-CONFIG_SND_SOC_MAX98373_I2C=m
-CONFIG_SND_SOC_MAX98390=m
-CONFIG_SND_SOC_MAX9860=m
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
-CONFIG_SND_SOC_PCM1681=m
-# CONFIG_SND_SOC_PCM1789_I2C is not set
-CONFIG_SND_SOC_PCM179X=m
-CONFIG_SND_SOC_PCM179X_I2C=m
-CONFIG_SND_SOC_PCM179X_SPI=m
-# CONFIG_SND_SOC_PCM186X_I2C is not set
-# CONFIG_SND_SOC_PCM186X_SPI is not set
-CONFIG_SND_SOC_PCM3060=m
-CONFIG_SND_SOC_PCM3060_I2C=m
-CONFIG_SND_SOC_PCM3060_SPI=m
-CONFIG_SND_SOC_PCM3168A=m
-CONFIG_SND_SOC_PCM3168A_I2C=m
-CONFIG_SND_SOC_PCM3168A_SPI=m
-CONFIG_SND_SOC_PCM512x=m
-CONFIG_SND_SOC_PCM512x_I2C=m
-CONFIG_SND_SOC_PCM512x_SPI=m
-CONFIG_SND_SOC_RK3328=m
-CONFIG_SND_SOC_RL6231=m
-CONFIG_SND_SOC_RL6347A=m
-CONFIG_SND_SOC_RT286=m
-CONFIG_SND_SOC_RT298=m
-CONFIG_SND_SOC_RT1015=m
-CONFIG_SND_SOC_RT5616=m
-CONFIG_SND_SOC_RT5631=m
-CONFIG_SND_SOC_RT5640=m
-CONFIG_SND_SOC_RT5645=m
-CONFIG_SND_SOC_RT5651=m
-CONFIG_SND_SOC_RT5660=m
-CONFIG_SND_SOC_RT5670=m
-CONFIG_SND_SOC_RT5677=m
-CONFIG_SND_SOC_RT5677_SPI=m
-CONFIG_SND_SOC_RT5682=m
-CONFIG_SND_SOC_RT5682_I2C=m
-CONFIG_SND_SOC_SGTL5000=m
-CONFIG_SND_SOC_SI476X=m
-CONFIG_SND_SOC_SIGMADSP=m
-CONFIG_SND_SOC_SIGMADSP_I2C=m
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
-CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m
-CONFIG_SND_SOC_SPDIF=m
-# CONFIG_SND_SOC_SSM2305 is not set
-CONFIG_SND_SOC_SSM2602=m
-CONFIG_SND_SOC_SSM2602_SPI=m
-CONFIG_SND_SOC_SSM2602_I2C=m
-CONFIG_SND_SOC_SSM4567=m
-CONFIG_SND_SOC_STA32X=m
-# CONFIG_SND_SOC_STA350 is not set
-CONFIG_SND_SOC_STI_SAS=m
-# CONFIG_SND_SOC_TAS2552 is not set
-# CONFIG_SND_SOC_TAS2562 is not set
-# CONFIG_SND_SOC_TAS2770 is not set
-CONFIG_SND_SOC_TAS5086=m
-CONFIG_SND_SOC_TAS571X=m
-CONFIG_SND_SOC_TAS5720=m
-# CONFIG_SND_SOC_TAS6424 is not set
-# CONFIG_SND_SOC_TDA7419 is not set
-CONFIG_SND_SOC_TFA9879=m
-CONFIG_SND_SOC_TLV320AIC23=m
-CONFIG_SND_SOC_TLV320AIC23_I2C=m
-CONFIG_SND_SOC_TLV320AIC23_SPI=m
-# CONFIG_SND_SOC_TLV320AIC31XX is not set
-# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
-# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
-CONFIG_SND_SOC_TLV320AIC3X=m
-CONFIG_SND_SOC_TLV320ADCX140=m
-CONFIG_SND_SOC_TS3A227E=m
-# CONFIG_SND_SOC_TSCS42XX is not set
-# CONFIG_SND_SOC_TSCS454 is not set
-CONFIG_SND_SOC_UDA1334=m
-CONFIG_SND_SOC_WM8510=m
-CONFIG_SND_SOC_WM8523=m
-CONFIG_SND_SOC_WM8524=m
-CONFIG_SND_SOC_WM8580=m
-CONFIG_SND_SOC_WM8711=m
-CONFIG_SND_SOC_WM8728=m
-CONFIG_SND_SOC_WM8731=m
-CONFIG_SND_SOC_WM8737=m
-CONFIG_SND_SOC_WM8741=m
-CONFIG_SND_SOC_WM8750=m
-CONFIG_SND_SOC_WM8753=m
-CONFIG_SND_SOC_WM8770=m
-CONFIG_SND_SOC_WM8776=m
-# CONFIG_SND_SOC_WM8782 is not set
-CONFIG_SND_SOC_WM8804=m
-CONFIG_SND_SOC_WM8804_I2C=m
-CONFIG_SND_SOC_WM8804_SPI=m
-CONFIG_SND_SOC_WM8903=m
-CONFIG_SND_SOC_WM8904=m
-CONFIG_SND_SOC_WM8960=m
-CONFIG_SND_SOC_WM8962=m
-CONFIG_SND_SOC_WM8974=m
-CONFIG_SND_SOC_WM8978=m
-CONFIG_SND_SOC_WM8985=m
-CONFIG_SND_SOC_ZL38060=m
-# CONFIG_SND_SOC_ZX_AUD96P22 is not set
-# CONFIG_SND_SOC_MAX9759 is not set
-# CONFIG_SND_SOC_MT6351 is not set
-CONFIG_SND_SOC_MT6358=m
-CONFIG_SND_SOC_MT6660=m
-CONFIG_SND_SOC_NAU8540=m
-CONFIG_SND_SOC_NAU8810=m
-CONFIG_SND_SOC_NAU8822=m
-# CONFIG_SND_SOC_NAU8824 is not set
-CONFIG_SND_SOC_NAU8825=m
-CONFIG_SND_SOC_TPA6130A2=m
-# end of CODEC drivers
-
-CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_CARD=m
-CONFIG_SND_X86=y
-CONFIG_HDMI_LPE_AUDIO=m
-CONFIG_SND_SYNTH_EMUX=m
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-# CONFIG_HID_ACCUTOUCH is not set
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_APPLEIR=m
-CONFIG_HID_ASUS=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_BETOP_FF=m
-CONFIG_HID_BIGBEN_FF=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CORSAIR=m
-CONFIG_HID_COUGAR=m
-CONFIG_HID_MACALLY=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CMEDIA=m
-CONFIG_HID_CP2112=m
-CONFIG_HID_CREATIVE_SB0540=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EMS_FF=m
-# CONFIG_HID_ELAN is not set
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_GEMBIRD=m
-CONFIG_HID_GFRM=m
-CONFIG_HID_GLORIOUS=m
-CONFIG_HID_HOLTEK=m
-# CONFIG_HOLTEK_FF is not set
-# CONFIG_HID_GOOGLE_HAMMER is not set
-# CONFIG_HID_GT683R is not set
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_VIEWSONIC=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_ICADE=m
-# CONFIG_HID_ITE is not set
-# CONFIG_HID_JABRA is not set
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LED=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MALTRON=m
-CONFIG_HID_MAYFLASH=m
-# CONFIG_HID_REDRAGON is not set
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
-# CONFIG_HID_NTI is not set
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PLANTRONICS=m
-CONFIG_HID_PRIMAX=m
-# CONFIG_HID_RETRODE is not set
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_SONY_FF=y
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEAM=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_HYPERV_MOUSE=m
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_UDRAW_PS3=m
-CONFIG_HID_U2FZERO=m
-CONFIG_HID_WACOM=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-CONFIG_HID_ALPS=m
-CONFIG_HID_MCP2221=m
-# end of Special HID drivers
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-# end of USB HID Boot Protocol drivers
-# end of USB HID support
-
-#
-# I2C HID support
-#
-CONFIG_I2C_HID=m
-# end of I2C HID support
-# end of HID support
-
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_LED_TRIG=y
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_CONN_GPIO=m
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-CONFIG_USB_PCI=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-CONFIG_USB_DYNAMIC_MINORS=y
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_PRODUCTLIST is not set
-# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
-CONFIG_USB_LEDS_TRIGGER_USBPORT=m
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=m
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PCI_RENESAS=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=m
-CONFIG_USB_EHCI_FSL=m
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_FOTG210_HCD=m
-# CONFIG_USB_MAX3421_HCD is not set
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_SSB=y
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_HCD_BCMA=m
-CONFIG_USB_HCD_SSB=m
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_VHCI_HC_PORTS=8
-CONFIG_USBIP_VHCI_NR_HCS=1
-CONFIG_USBIP_HOST=m
-CONFIG_USBIP_VUDC=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_USB_CDNS3=m
-CONFIG_USB_CDNS3_GADGET=y
-CONFIG_USB_CDNS3_HOST=y
-CONFIG_USB_CDNS3_PCI_WRAP=m
-CONFIG_USB_MUSB_HDRC=m
-# CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_GADGET is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
-
-#
-# Platform Glue Layer
-#
-
-#
-# MUSB DMA mode
-#
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_DWC3=m
-CONFIG_USB_DWC3_ULPI=y
-# CONFIG_USB_DWC3_HOST is not set
-# CONFIG_USB_DWC3_GADGET is not set
-CONFIG_USB_DWC3_DUAL_ROLE=y
-
-#
-# Platform Glue Driver Support
-#
-CONFIG_USB_DWC3_PCI=m
-CONFIG_USB_DWC3_HAPS=m
-# CONFIG_USB_DWC2 is not set
-CONFIG_USB_CHIPIDEA=m
-# CONFIG_USB_CHIPIDEA_UDC is not set
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA_PCI=m
-CONFIG_USB_CHIPIDEA_MSM=m
-CONFIG_USB_CHIPIDEA_GENERIC=m
-CONFIG_USB_ISP1760=m
-CONFIG_USB_ISP1760_HCD=y
-CONFIG_USB_ISP1761_UDC=y
-# CONFIG_USB_ISP1760_HOST_ROLE is not set
-# CONFIG_USB_ISP1760_GADGET_ROLE is not set
-CONFIG_USB_ISP1760_DUAL_ROLE=y
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_F8153X=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MXUPORT=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_UPD78F0730=m
-# CONFIG_USB_SERIAL_DEBUG is not set
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_APPLE_MFI_FASTCHARGE=m
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-CONFIG_USB_EHSET_TEST_FIXTURE=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_HSIC_USB4604=m
-# CONFIG_USB_LINK_LAYER_TEST is not set
-CONFIG_USB_CHAOSKEY=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-
-#
-# USB Physical Layer drivers
-#
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_USB_GPIO_VBUS=m
-CONFIG_TAHVO_USB=m
-# CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
-CONFIG_USB_ISP1301=m
-# end of USB Physical Layer drivers
-
-CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_U_SERIAL_CONSOLE=y
-
-#
-# USB Peripheral Controller
-#
-CONFIG_USB_FOTG210_UDC=m
-CONFIG_USB_GR_UDC=m
-CONFIG_USB_R8A66597=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_SNP_CORE=m
-CONFIG_USB_M66592=m
-CONFIG_USB_BDC_UDC=m
-
-#
-# Platform Support
-#
-CONFIG_USB_BDC_PCI=m
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_NET2272=m
-# CONFIG_USB_NET2272_DMA is not set
-CONFIG_USB_NET2280=m
-CONFIG_USB_GOKU=m
-CONFIG_USB_EG20T=m
-CONFIG_USB_MAX3420_UDC=m
-CONFIG_USB_DUMMY_HCD=m
-# end of USB Peripheral Controller
-
-CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_F_ACM=m
-CONFIG_USB_U_SERIAL=m
-CONFIG_USB_U_ETHER=m
-CONFIG_USB_U_AUDIO=m
-CONFIG_USB_F_SERIAL=m
-CONFIG_USB_F_OBEX=m
-CONFIG_USB_F_NCM=m
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_PHONET=m
-CONFIG_USB_F_EEM=m
-CONFIG_USB_F_SUBSET=m
-CONFIG_USB_F_RNDIS=m
-CONFIG_USB_F_MASS_STORAGE=m
-CONFIG_USB_F_FS=m
-CONFIG_USB_F_UAC1=m
-CONFIG_USB_F_UVC=m
-CONFIG_USB_F_MIDI=m
-CONFIG_USB_F_HID=m
-CONFIG_USB_F_PRINTER=m
-CONFIG_USB_F_TCM=m
-CONFIG_USB_CONFIGFS=m
-# CONFIG_USB_CONFIGFS_SERIAL is not set
-# CONFIG_USB_CONFIGFS_ACM is not set
-# CONFIG_USB_CONFIGFS_OBEX is not set
-# CONFIG_USB_CONFIGFS_NCM is not set
-# CONFIG_USB_CONFIGFS_ECM is not set
-# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
-# CONFIG_USB_CONFIGFS_RNDIS is not set
-# CONFIG_USB_CONFIGFS_EEM is not set
-# CONFIG_USB_CONFIGFS_PHONET is not set
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-# CONFIG_USB_CONFIGFS_F_LB_SS is not set
-# CONFIG_USB_CONFIGFS_F_FS is not set
-# CONFIG_USB_CONFIGFS_F_UAC1 is not set
-# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
-# CONFIG_USB_CONFIGFS_F_UAC2 is not set
-# CONFIG_USB_CONFIGFS_F_MIDI is not set
-# CONFIG_USB_CONFIGFS_F_HID is not set
-CONFIG_USB_CONFIGFS_F_UVC=y
-CONFIG_USB_CONFIGFS_F_PRINTER=y
-CONFIG_USB_CONFIGFS_F_TCM=y
-
-#
-# USB Gadget precomposed configurations
-#
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-CONFIG_GADGET_UAC1=y
-# CONFIG_GADGET_UAC1_LEGACY is not set
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_ETH_EEM=y
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FUNCTIONFS=m
-# CONFIG_USB_FUNCTIONFS_ETH is not set
-# CONFIG_USB_FUNCTIONFS_RNDIS is not set
-CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_GADGET_TARGET=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MIDI_GADGET=m
-CONFIG_USB_G_PRINTER=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-CONFIG_USB_G_NOKIA=m
-CONFIG_USB_G_ACM_MS=m
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_MULTI_RNDIS=y
-CONFIG_USB_G_MULTI_CDC=y
-CONFIG_USB_G_HID=m
-CONFIG_USB_G_DBGP=m
-# CONFIG_USB_G_DBGP_PRINTK is not set
-CONFIG_USB_G_DBGP_SERIAL=y
-CONFIG_USB_G_WEBCAM=m
-# CONFIG_USB_RAW_GADGET is not set
-# end of USB Gadget precomposed configurations
-
-CONFIG_TYPEC=m
-# CONFIG_TYPEC_TCPM is not set
-# CONFIG_TYPEC_UCSI is not set
-CONFIG_TYPEC_HD3SS3220=m
-CONFIG_TYPEC_TPS6598X=m
-
-#
-# USB Type-C Multiplexer/DeMultiplexer Switch support
-#
-# CONFIG_TYPEC_MUX_PI3USB30532 is not set
-# CONFIG_TYPEC_MUX_INTEL_PMC is not set
-# end of USB Type-C Multiplexer/DeMultiplexer Switch support
-
-#
-# USB Type-C Alternate Mode drivers
-#
-CONFIG_TYPEC_DP_ALTMODE=m
-CONFIG_TYPEC_NVIDIA_ALTMODE=m
-# end of USB Type-C Alternate Mode drivers
-
-CONFIG_USB_ROLE_SWITCH=m
-# CONFIG_USB_ROLES_INTEL_XHCI is not set
-CONFIG_MMC=m
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI_PLTFM=m
-# CONFIG_MMC_SDHCI_F_SDH30 is not set
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_ALCOR=m
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SPI=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-# CONFIG_MMC_USDHI6ROL0 is not set
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_CQHCI=m
-# CONFIG_MMC_HSQ is not set
-CONFIG_MMC_TOSHIBA_PCI=m
-CONFIG_MMC_MTK=m
-# CONFIG_MMC_SDHCI_XENON is not set
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-CONFIG_MS_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_CLASS_FLASH=m
-CONFIG_LEDS_CLASS_MULTICOLOR=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
-
-#
-# LED drivers
-#
-CONFIG_LEDS_APU=m
-CONFIG_LEDS_AS3645A=m
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM3532=m
-CONFIG_LEDS_LM3533=m
-CONFIG_LEDS_LM3642=m
-# CONFIG_LEDS_LM3601X is not set
-# CONFIG_LEDS_MT6323 is not set
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA9532_GPIO=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP3952=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-# CONFIG_LEDS_PCA955X_GPIO is not set
-CONFIG_LEDS_PCA963X=m
-# CONFIG_LEDS_WM831X_STATUS is not set
-CONFIG_LEDS_DA9052=m
-CONFIG_LEDS_DAC124S085=m
-CONFIG_LEDS_PWM=m
-CONFIG_LEDS_REGULATOR=m
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_TLC591XX=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_OT200=m
-CONFIG_LEDS_MENF21BMC=m
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-CONFIG_LEDS_BLINKM=m
-# CONFIG_LEDS_MLXCPLD is not set
-# CONFIG_LEDS_MLXREG is not set
-CONFIG_LEDS_USER=m
-CONFIG_LEDS_NIC78BX=m
-# CONFIG_LEDS_TI_LMU_COMMON is not set
-CONFIG_LEDS_TPS6105X=m
-CONFIG_LEDS_SGM3140=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_DISK=y
-CONFIG_LEDS_TRIGGER_MTD=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_ACTIVITY=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_PANIC=y
-# CONFIG_LEDS_TRIGGER_NETDEV is not set
-CONFIG_LEDS_TRIGGER_PATTERN=m
-CONFIG_LEDS_TRIGGER_AUDIO=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-# end of Speakup console speech
-
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_CXGB4=m
-CONFIG_INFINIBAND_I40IW=m
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_OCRDMA=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
-CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SRPT=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_ISERT=m
-CONFIG_INFINIBAND_RTRS=m
-CONFIG_INFINIBAND_RTRS_CLIENT=m
-CONFIG_INFINIBAND_RTRS_SERVER=m
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_EDAC=y
-CONFIG_EDAC_LEGACY_SYSFS=y
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=m
-# CONFIG_EDAC_GHES is not set
-CONFIG_EDAC_AMD64=m
-# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
-# CONFIG_EDAC_AMD76X is not set
-# CONFIG_EDAC_E7XXX is not set
-CONFIG_EDAC_E752X=m
-# CONFIG_EDAC_I82875P is not set
-CONFIG_EDAC_I82975X=m
-CONFIG_EDAC_I3000=m
-CONFIG_EDAC_I3200=m
-# CONFIG_EDAC_IE31200 is not set
-CONFIG_EDAC_X38=m
-CONFIG_EDAC_I5400=m
-CONFIG_EDAC_I7CORE=m
-# CONFIG_EDAC_I82860 is not set
-# CONFIG_EDAC_R82600 is not set
-CONFIG_EDAC_I5000=m
-CONFIG_EDAC_I5100=m
-CONFIG_EDAC_I7300=m
-CONFIG_RTC_LIB=y
-CONFIG_RTC_MC146818_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_NVMEM=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_ABB5ZES3=m
-CONFIG_RTC_DRV_ABEOZ9=m
-CONFIG_RTC_DRV_ABX80X=m
-CONFIG_RTC_DRV_DS1307=m
-# CONFIG_RTC_DRV_DS1307_CENTURY is not set
-CONFIG_RTC_DRV_DS1374=m
-# CONFIG_RTC_DRV_DS1374_WDT is not set
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF85063=m
-CONFIG_RTC_DRV_PCF85363=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8010=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-CONFIG_RTC_DRV_RV3028=m
-CONFIG_RTC_DRV_RV8803=m
-CONFIG_RTC_DRV_SD3078=m
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_DRV_M41T93=m
-CONFIG_RTC_DRV_M41T94=m
-CONFIG_RTC_DRV_DS1302=m
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1343=m
-CONFIG_RTC_DRV_DS1347=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_MAX6916=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RX4581=m
-CONFIG_RTC_DRV_RX6110=m
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_PCF2123=m
-CONFIG_RTC_DRV_MCP795=m
-CONFIG_RTC_I2C_AND_SPI=y
-
-#
-# SPI and I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_DS3232_HWMON=y
-CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_RTC_DRV_RV3029_HWMON=y
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1685_FAMILY=m
-CONFIG_RTC_DRV_DS1685=y
-# CONFIG_RTC_DRV_DS1689 is not set
-# CONFIG_RTC_DRV_DS17285 is not set
-# CONFIG_RTC_DRV_DS17485 is not set
-# CONFIG_RTC_DRV_DS17885 is not set
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_DA9052=m
-CONFIG_RTC_DRV_DA9063=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_WM831X=m
-CONFIG_RTC_DRV_PCF50633=m
-# CONFIG_RTC_DRV_CROS_EC is not set
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_FTRTC010 is not set
-CONFIG_RTC_DRV_PCAP=m
-CONFIG_RTC_DRV_MC13XXX=m
-CONFIG_RTC_DRV_MT6397=m
-
-#
-# HID Sensor RTC drivers
-#
-CONFIG_RTC_DRV_HID_SENSOR_TIME=m
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_VIRTUAL_CHANNELS=m
-CONFIG_DMA_ACPI=y
-CONFIG_ALTERA_MSGDMA=m
-CONFIG_INTEL_IDMA64=m
-CONFIG_PCH_DMA=m
-CONFIG_PLX_DMA=m
-CONFIG_TIMB_DMA=m
-CONFIG_XILINX_ZYNQMP_DPDMA=m
-CONFIG_QCOM_HIDMA_MGMT=m
-CONFIG_QCOM_HIDMA=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
-CONFIG_HSU_DMA=m
-# CONFIG_SF_PDMA is not set
-
-#
-# DMA Clients
-#
-CONFIG_ASYNC_TX_DMA=y
-# CONFIG_DMATEST is not set
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
-CONFIG_UDMABUF=y
-# CONFIG_DMABUF_MOVE_NOTIFY is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-# CONFIG_DMABUF_HEAPS is not set
-# end of DMABUF options
-
-CONFIG_AUXDISPLAY=y
-# CONFIG_HD44780 is not set
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_CFAG12864B=m
-CONFIG_CFAG12864B_RATE=20
-CONFIG_IMG_ASCII_LCD=m
-CONFIG_PARPORT_PANEL=m
-CONFIG_PANEL_PARPORT=0
-CONFIG_PANEL_PROFILE=5
-# CONFIG_PANEL_CHANGE_MESSAGE is not set
-# CONFIG_CHARLCD_BL_OFF is not set
-# CONFIG_CHARLCD_BL_ON is not set
-CONFIG_CHARLCD_BL_FLASH=y
-CONFIG_PANEL=m
-CONFIG_CHARLCD=m
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_DMEM_GENIRQ=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-CONFIG_UIO_PRUSS=m
-CONFIG_UIO_MF624=m
-CONFIG_UIO_HV_GENERIC=m
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO_VIRQFD=m
-CONFIG_VFIO=m
-CONFIG_VFIO_NOIOMMU=y
-CONFIG_VFIO_PCI=m
-CONFIG_VFIO_PCI_VGA=y
-CONFIG_VFIO_PCI_MMAP=y
-CONFIG_VFIO_PCI_INTX=y
-CONFIG_VFIO_PCI_IGD=y
-CONFIG_VFIO_MDEV=m
-CONFIG_VFIO_MDEV_DEVICE=m
-CONFIG_IRQ_BYPASS_MANAGER=m
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VBOXGUEST=m
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-# CONFIG_VDPA is not set
-CONFIG_VHOST_IOTLB=m
-CONFIG_VHOST_RING=m
-CONFIG_VHOST=m
-CONFIG_VHOST_MENU=y
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_VSOCK=m
-CONFIG_VHOST_CROSS_ENDIAN_LEGACY=y
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_HYPERV=m
-CONFIG_HYPERV_TIMER=y
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-# end of Microsoft Hyper-V guest support
-
-CONFIG_GREYBUS=m
-CONFIG_GREYBUS_ES2=m
-CONFIG_STAGING=y
-CONFIG_PRISM2_USB=m
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
-CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
-CONFIG_COMEDI_MISC_DRIVERS=y
-CONFIG_COMEDI_BOND=m
-CONFIG_COMEDI_TEST=m
-CONFIG_COMEDI_PARPORT=m
-CONFIG_COMEDI_SSV_DNP=m
-# CONFIG_COMEDI_ISA_DRIVERS is not set
-CONFIG_COMEDI_PCI_DRIVERS=m
-CONFIG_COMEDI_8255_PCI=m
-CONFIG_COMEDI_ADDI_WATCHDOG=m
-CONFIG_COMEDI_ADDI_APCI_1032=m
-CONFIG_COMEDI_ADDI_APCI_1500=m
-CONFIG_COMEDI_ADDI_APCI_1516=m
-CONFIG_COMEDI_ADDI_APCI_1564=m
-CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2032=m
-CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3120=m
-CONFIG_COMEDI_ADDI_APCI_3501=m
-CONFIG_COMEDI_ADDI_APCI_3XXX=m
-CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7X3X=m
-CONFIG_COMEDI_ADL_PCI8164=m
-CONFIG_COMEDI_ADL_PCI9111=m
-CONFIG_COMEDI_ADL_PCI9118=m
-CONFIG_COMEDI_ADV_PCI1710=m
-CONFIG_COMEDI_ADV_PCI1720=m
-CONFIG_COMEDI_ADV_PCI1723=m
-CONFIG_COMEDI_ADV_PCI1724=m
-CONFIG_COMEDI_ADV_PCI1760=m
-CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200_PCI=m
-CONFIG_COMEDI_AMPLC_PC236_PCI=m
-CONFIG_COMEDI_AMPLC_PC263_PCI=m
-CONFIG_COMEDI_AMPLC_PCI224=m
-CONFIG_COMEDI_AMPLC_PCI230=m
-CONFIG_COMEDI_CONTEC_PCI_DIO=m
-CONFIG_COMEDI_DAS08_PCI=m
-CONFIG_COMEDI_DT3000=m
-CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_GSC_HPDI=m
-CONFIG_COMEDI_MF6X4=m
-CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_DAQBOARD2000=m
-CONFIG_COMEDI_JR3_PCI=m
-CONFIG_COMEDI_KE_COUNTER=m
-CONFIG_COMEDI_CB_PCIDAS64=m
-CONFIG_COMEDI_CB_PCIDAS=m
-CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIMDAS=m
-CONFIG_COMEDI_CB_PCIMDDA=m
-CONFIG_COMEDI_ME4000=m
-CONFIG_COMEDI_ME_DAQ=m
-CONFIG_COMEDI_NI_6527=m
-CONFIG_COMEDI_NI_65XX=m
-CONFIG_COMEDI_NI_660X=m
-CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_LABPC_PCI=m
-CONFIG_COMEDI_NI_PCIDIO=m
-CONFIG_COMEDI_NI_PCIMIO=m
-CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIOCMD=m
-CONFIG_COMEDI_USB_DRIVERS=m
-CONFIG_COMEDI_DT9812=m
-CONFIG_COMEDI_NI_USB6501=m
-CONFIG_COMEDI_USBDUX=m
-CONFIG_COMEDI_USBDUXFAST=m
-CONFIG_COMEDI_USBDUXSIGMA=m
-CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_8254=m
-CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_8255_SA=m
-CONFIG_COMEDI_KCOMEDILIB=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_DAS08=m
-CONFIG_COMEDI_NI_LABPC=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_ROUTING=m
-CONFIG_RTL8192U=m
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_RTL8723BS=m
-CONFIG_R8712U=m
-CONFIG_R8188EU=m
-CONFIG_88EU_AP_MODE=y
-CONFIG_RTS5208=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-
-#
-# IIO staging drivers
-#
-
-#
-# Accelerometers
-#
-CONFIG_ADIS16203=m
-CONFIG_ADIS16240=m
-# end of Accelerometers
-
-#
-# Analog to digital converters
-#
-CONFIG_AD7816=m
-CONFIG_AD7280=m
-# end of Analog to digital converters
-
-#
-# Analog digital bi-direction converters
-#
-CONFIG_ADT7316=m
-CONFIG_ADT7316_SPI=m
-CONFIG_ADT7316_I2C=m
-# end of Analog digital bi-direction converters
-
-#
-# Capacitance to digital converters
-#
-CONFIG_AD7150=m
-CONFIG_AD7746=m
-# end of Capacitance to digital converters
-
-#
-# Direct Digital Synthesis
-#
-CONFIG_AD9832=m
-CONFIG_AD9834=m
-# end of Direct Digital Synthesis
-
-#
-# Network Analyzer, Impedance Converters
-#
-CONFIG_AD5933=m
-# end of Network Analyzer, Impedance Converters
-
-#
-# Active energy metering IC
-#
-CONFIG_ADE7854=m
-CONFIG_ADE7854_I2C=m
-CONFIG_ADE7854_SPI=m
-# end of Active energy metering IC
-
-#
-# Resolver to digital converters
-#
-CONFIG_AD2S1210=m
-# end of Resolver to digital converters
-# end of IIO staging drivers
-
-CONFIG_FB_SM750=m
-CONFIG_STAGING_MEDIA=y
-CONFIG_INTEL_ATOMISP=y
-CONFIG_VIDEO_IPU3_IMGU=m
-CONFIG_VIDEO_USBVISION=m
-
-#
-# Android
-#
-# end of Android
-
-CONFIG_LTE_GDM724X=m
-CONFIG_FIREWIRE_SERIAL=m
-CONFIG_FWTTY_MAX_TOTAL_PORTS=64
-CONFIG_FWTTY_MAX_CARD_PORTS=32
-CONFIG_GS_FPGABOOT=m
-# CONFIG_UNISYSSPAR is not set
-CONFIG_FB_TFT=m
-CONFIG_FB_TFT_AGM1264K_FL=m
-CONFIG_FB_TFT_BD663474=m
-CONFIG_FB_TFT_HX8340BN=m
-CONFIG_FB_TFT_HX8347D=m
-CONFIG_FB_TFT_HX8353D=m
-CONFIG_FB_TFT_HX8357D=m
-CONFIG_FB_TFT_ILI9163=m
-CONFIG_FB_TFT_ILI9320=m
-CONFIG_FB_TFT_ILI9325=m
-CONFIG_FB_TFT_ILI9340=m
-CONFIG_FB_TFT_ILI9341=m
-CONFIG_FB_TFT_ILI9481=m
-CONFIG_FB_TFT_ILI9486=m
-CONFIG_FB_TFT_PCD8544=m
-CONFIG_FB_TFT_RA8875=m
-CONFIG_FB_TFT_S6D02A1=m
-CONFIG_FB_TFT_S6D1121=m
-CONFIG_FB_TFT_SEPS525=m
-CONFIG_FB_TFT_SH1106=m
-CONFIG_FB_TFT_SSD1289=m
-CONFIG_FB_TFT_SSD1305=m
-CONFIG_FB_TFT_SSD1306=m
-CONFIG_FB_TFT_SSD1331=m
-CONFIG_FB_TFT_SSD1351=m
-CONFIG_FB_TFT_ST7735R=m
-CONFIG_FB_TFT_ST7789V=m
-CONFIG_FB_TFT_TINYLCD=m
-CONFIG_FB_TFT_TLS8204=m
-CONFIG_FB_TFT_UC1611=m
-CONFIG_FB_TFT_UC1701=m
-CONFIG_FB_TFT_UPD161704=m
-CONFIG_FB_TFT_WATTEROTT=m
-# CONFIG_MOST_COMPONENTS is not set
-CONFIG_KS7010=m
-CONFIG_GREYBUS_AUDIO=m
-CONFIG_GREYBUS_AUDIO_APB_CODEC=m
-CONFIG_GREYBUS_BOOTROM=m
-CONFIG_GREYBUS_FIRMWARE=m
-CONFIG_GREYBUS_HID=m
-CONFIG_GREYBUS_LIGHT=m
-CONFIG_GREYBUS_LOG=m
-CONFIG_GREYBUS_LOOPBACK=m
-CONFIG_GREYBUS_POWER=m
-CONFIG_GREYBUS_RAW=m
-CONFIG_GREYBUS_VIBRATOR=m
-CONFIG_GREYBUS_BRIDGED_PHY=m
-CONFIG_GREYBUS_GPIO=m
-CONFIG_GREYBUS_I2C=m
-CONFIG_GREYBUS_PWM=m
-CONFIG_GREYBUS_SDIO=m
-CONFIG_GREYBUS_SPI=m
-CONFIG_GREYBUS_UART=m
-CONFIG_GREYBUS_USB=m
-CONFIG_PI433=m
-
-#
-# Gasket devices
-#
-# end of Gasket devices
-
-# CONFIG_FIELDBUS_DEV is not set
-# CONFIG_KPC2000 is not set
-CONFIG_QLGE=m
-CONFIG_WFX=m
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACPI_WMI=m
-CONFIG_WMI_BMOF=m
-CONFIG_ALIENWARE_WMI=m
-CONFIG_HUAWEI_WMI=m
-CONFIG_INTEL_WMI_SBL_FW_UPDATE=m
-CONFIG_INTEL_WMI_THUNDERBOLT=m
-CONFIG_MXM_WMI=m
-CONFIG_PEAQ_WMI=m
-# CONFIG_XIAOMI_WMI is not set
-CONFIG_ACERHDF=m
-# CONFIG_ACER_WIRELESS is not set
-CONFIG_ACER_WMI=m
-CONFIG_APPLE_GMUX=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_ASUS_WIRELESS=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_EEEPC_WMI=m
-CONFIG_DCDBAS=m
-CONFIG_DELL_SMBIOS=m
-CONFIG_DELL_SMBIOS_WMI=y
-CONFIG_DELL_SMBIOS_SMM=y
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_RBTN=m
-CONFIG_DELL_RBU=m
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_WMI=m
-CONFIG_DELL_WMI_DESCRIPTOR=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_DELL_WMI_LED=m
-CONFIG_AMILO_RFKILL=m
-CONFIG_FUJITSU_LAPTOP=m
-CONFIG_FUJITSU_TABLET=m
-CONFIG_GPD_POCKET_FAN=m
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-CONFIG_TC1100_WMI=m
-CONFIG_IBM_RTL=m
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_SENSORS_HDAPS=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_INTEL_ATOMISP2_LED=m
-CONFIG_INTEL_HID_EVENT=m
-# CONFIG_INTEL_INT0002_VGPIO is not set
-CONFIG_INTEL_MENLOW=m
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_INTEL_VBTN=m
-CONFIG_SURFACE3_WMI=m
-# CONFIG_SURFACE_3_POWER_OPREGION is not set
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_MSI_WMI=m
-CONFIG_PCENGINES_APU2=m
-CONFIG_SAMSUNG_LAPTOP=m
-# CONFIG_SAMSUNG_Q10 is not set
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_TOSHIBA_HAPS=m
-CONFIG_TOSHIBA_WMI=m
-# CONFIG_ACPI_CMPC is not set
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_LG_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-CONFIG_SYSTEM76_ACPI=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_I2C_MULTI_INSTANTIATE=m
-# CONFIG_MLX_PLATFORM is not set
-CONFIG_TOUCHSCREEN_DMI=y
-CONFIG_INTEL_IPS=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=m
-# CONFIG_INTEL_CHTDC_TI_PWRBTN is not set
-CONFIG_INTEL_MFLD_THERMAL=m
-CONFIG_INTEL_MID_POWER_BUTTON=m
-CONFIG_INTEL_MRFLD_PWRBTN=m
-CONFIG_INTEL_PMC_CORE=y
-CONFIG_INTEL_PUNIT_IPC=m
-CONFIG_INTEL_SCU_IPC=y
-CONFIG_INTEL_SCU=y
-CONFIG_INTEL_SCU_PCI=y
-CONFIG_INTEL_SCU_PLATFORM=m
-CONFIG_INTEL_SCU_IPC_UTIL=m
-CONFIG_PMC_ATOM=y
-CONFIG_MFD_CROS_EC=m
-CONFIG_CHROME_PLATFORMS=y
-CONFIG_CHROMEOS_LAPTOP=m
-CONFIG_CHROMEOS_PSTORE=m
-# CONFIG_CHROMEOS_TBMC is not set
-CONFIG_CROS_EC=m
-CONFIG_CROS_EC_I2C=m
-CONFIG_CROS_EC_SPI=m
-CONFIG_CROS_EC_LPC=m
-CONFIG_CROS_EC_PROTO=y
-CONFIG_CROS_KBD_LED_BACKLIGHT=m
-CONFIG_CROS_EC_CHARDEV=m
-CONFIG_CROS_EC_LIGHTBAR=m
-CONFIG_CROS_EC_DEBUGFS=m
-CONFIG_CROS_EC_SENSORHUB=m
-CONFIG_CROS_EC_SYSFS=m
-CONFIG_CROS_EC_TYPEC=m
-CONFIG_CROS_USBPD_LOGGER=m
-CONFIG_CROS_USBPD_NOTIFY=m
-# CONFIG_WILCO_EC is not set
-# CONFIG_MELLANOX_PLATFORM is not set
-CONFIG_HAVE_CLK=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-CONFIG_COMMON_CLK_WM831X=m
-# CONFIG_COMMON_CLK_MAX9485 is not set
-# CONFIG_COMMON_CLK_SI5341 is not set
-CONFIG_COMMON_CLK_SI5351=m
-# CONFIG_COMMON_CLK_SI544 is not set
-CONFIG_COMMON_CLK_CDCE706=m
-CONFIG_COMMON_CLK_CS2000_CP=m
-CONFIG_COMMON_CLK_PWM=m
-# CONFIG_HWSPINLOCK is not set
-
-#
-# Clock Source drivers
-#
-CONFIG_CLKSRC_I8253=y
-CONFIG_CLKEVT_I8253=y
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-# end of Clock Source drivers
-
-CONFIG_MAILBOX=y
-# CONFIG_PCC is not set
-CONFIG_ALTERA_MBOX=m
-CONFIG_IOMMU_IOVA=y
-CONFIG_IOASID=y
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-# end of Generic IOMMU Pagetable Support
-
-# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-CONFIG_INTEL_IOMMU_DEFAULT_ON=y
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
-CONFIG_HYPERV_IOMMU=y
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-CONFIG_RPMSG=m
-CONFIG_RPMSG_CHAR=m
-# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
-CONFIG_RPMSG_VIRTIO=m
-# end of Rpmsg drivers
-
-# CONFIG_SOUNDWIRE is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-# end of Qualcomm SoC drivers
-
-# CONFIG_SOC_TI is not set
-
-#
-# Xilinx SoC drivers
-#
-# CONFIG_XILINX_VCU is not set
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-CONFIG_PM_DEVFREQ=y
-
-#
-# DEVFREQ Governors
-#
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
-CONFIG_DEVFREQ_GOV_PERFORMANCE=y
-CONFIG_DEVFREQ_GOV_POWERSAVE=y
-CONFIG_DEVFREQ_GOV_USERSPACE=y
-CONFIG_DEVFREQ_GOV_PASSIVE=m
-
-#
-# DEVFREQ Drivers
-#
-CONFIG_PM_DEVFREQ_EVENT=y
-CONFIG_EXTCON=y
-
-#
-# Extcon Device Drivers
-#
-CONFIG_EXTCON_ADC_JACK=m
-CONFIG_EXTCON_ARIZONA=m
-CONFIG_EXTCON_AXP288=m
-# CONFIG_EXTCON_FSA9480 is not set
-CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_INTEL_INT3496=m
-CONFIG_EXTCON_INTEL_MRFLD=m
-CONFIG_EXTCON_MAX3355=m
-CONFIG_EXTCON_MAX77843=m
-CONFIG_EXTCON_PTN5150=m
-CONFIG_EXTCON_RT8973A=m
-# CONFIG_EXTCON_SM5502 is not set
-CONFIG_EXTCON_USB_GPIO=m
-CONFIG_EXTCON_USBC_CROS_EC=m
-CONFIG_MEMORY=y
-CONFIG_IIO=m
-CONFIG_IIO_BUFFER=y
-CONFIG_IIO_BUFFER_CB=m
-CONFIG_IIO_BUFFER_DMA=m
-CONFIG_IIO_BUFFER_DMAENGINE=m
-CONFIG_IIO_BUFFER_HW_CONSUMER=m
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-CONFIG_IIO_CONFIGFS=m
-CONFIG_IIO_TRIGGER=y
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-CONFIG_IIO_SW_DEVICE=m
-CONFIG_IIO_SW_TRIGGER=m
-CONFIG_IIO_TRIGGERED_EVENT=m
-
-#
-# Accelerometers
-#
-CONFIG_ADIS16201=m
-CONFIG_ADIS16209=m
-CONFIG_ADXL372=m
-CONFIG_ADXL372_SPI=m
-CONFIG_ADXL372_I2C=m
-CONFIG_BMA220=m
-CONFIG_BMA400=m
-CONFIG_BMA400_I2C=m
-CONFIG_BMA400_SPI=m
-CONFIG_BMC150_ACCEL=m
-CONFIG_BMC150_ACCEL_I2C=m
-CONFIG_BMC150_ACCEL_SPI=m
-CONFIG_DA280=m
-CONFIG_DA311=m
-CONFIG_DMARD09=m
-CONFIG_DMARD10=m
-CONFIG_HID_SENSOR_ACCEL_3D=m
-CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
-CONFIG_IIO_ST_ACCEL_3AXIS=m
-CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
-CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
-CONFIG_KXSD9=m
-CONFIG_KXSD9_SPI=m
-CONFIG_KXSD9_I2C=m
-# CONFIG_KXCJK1013 is not set
-CONFIG_MC3230=m
-CONFIG_MMA7455=m
-CONFIG_MMA7455_I2C=m
-CONFIG_MMA7455_SPI=m
-CONFIG_MMA7660=m
-# CONFIG_MMA8452 is not set
-CONFIG_MMA9551_CORE=m
-CONFIG_MMA9551=m
-CONFIG_MMA9553=m
-CONFIG_MXC4005=m
-CONFIG_MXC6255=m
-CONFIG_SCA3000=m
-CONFIG_STK8312=m
-CONFIG_STK8BA50=m
-# end of Accelerometers
-
-#
-# Analog to digital converters
-#
-CONFIG_AD_SIGMA_DELTA=m
-CONFIG_AD7091R5=m
-CONFIG_AD7124=m
-CONFIG_AD7192=m
-CONFIG_AD7266=m
-CONFIG_AD7291=m
-CONFIG_AD7292=m
-CONFIG_AD7298=m
-CONFIG_AD7476=m
-CONFIG_AD7606=m
-CONFIG_AD7606_IFACE_PARALLEL=m
-CONFIG_AD7606_IFACE_SPI=m
-CONFIG_AD7766=m
-CONFIG_AD7768_1=m
-CONFIG_AD7780=m
-CONFIG_AD7791=m
-CONFIG_AD7793=m
-CONFIG_AD7887=m
-CONFIG_AD7923=m
-CONFIG_AD7949=m
-CONFIG_AD799X=m
-CONFIG_AD9467=m
-CONFIG_ADI_AXI_ADC=m
-# CONFIG_AXP20X_ADC is not set
-CONFIG_AXP288_ADC=m
-CONFIG_CC10001_ADC=m
-CONFIG_DA9150_GPADC=m
-CONFIG_DLN2_ADC=m
-CONFIG_HI8435=m
-CONFIG_HX711=m
-CONFIG_INA2XX_ADC=m
-CONFIG_INTEL_MRFLD_ADC=m
-CONFIG_LTC2471=m
-CONFIG_LTC2485=m
-CONFIG_LTC2496=m
-# CONFIG_LTC2497 is not set
-# CONFIG_MAX1027 is not set
-CONFIG_MAX11100=m
-# CONFIG_MAX1118 is not set
-CONFIG_MAX1241=m
-CONFIG_MAX1363=m
-# CONFIG_MAX9611 is not set
-CONFIG_MCP320X=m
-CONFIG_MCP3422=m
-CONFIG_MCP3911=m
-CONFIG_MEN_Z188_ADC=m
-CONFIG_MP2629_ADC=m
-CONFIG_NAU7802=m
-CONFIG_QCOM_VADC_COMMON=m
-CONFIG_QCOM_SPMI_IADC=m
-CONFIG_QCOM_SPMI_VADC=m
-CONFIG_QCOM_SPMI_ADC5=m
-CONFIG_TI_ADC081C=m
-CONFIG_TI_ADC0832=m
-# CONFIG_TI_ADC084S021 is not set
-CONFIG_TI_ADC12138=m
-# CONFIG_TI_ADC108S102 is not set
-CONFIG_TI_ADC128S052=m
-CONFIG_TI_ADC161S626=m
-CONFIG_TI_ADS1015=m
-CONFIG_TI_ADS7950=m
-CONFIG_TI_AM335X_ADC=m
-CONFIG_TI_TLC4541=m
-CONFIG_VIPERBOARD_ADC=m
-# CONFIG_XILINX_XADC is not set
-# end of Analog to digital converters
-
-#
-# Analog Front Ends
-#
-# end of Analog Front Ends
-
-#
-# Amplifiers
-#
-CONFIG_AD8366=m
-CONFIG_HMC425=m
-# end of Amplifiers
-
-#
-# Chemical Sensors
-#
-CONFIG_ATLAS_PH_SENSOR=m
-CONFIG_ATLAS_EZO_SENSOR=m
-CONFIG_BME680=m
-CONFIG_BME680_I2C=m
-CONFIG_BME680_SPI=m
-CONFIG_CCS811=m
-CONFIG_IAQCORE=m
-CONFIG_PMS7003=m
-CONFIG_SCD30_CORE=m
-CONFIG_SCD30_I2C=m
-CONFIG_SCD30_SERIAL=m
-CONFIG_SENSIRION_SGP30=m
-CONFIG_SPS30=m
-CONFIG_VZ89X=m
-# end of Chemical Sensors
-
-CONFIG_IIO_CROS_EC_SENSORS_CORE=m
-CONFIG_IIO_CROS_EC_SENSORS=m
-# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
-
-#
-# Hid Sensor IIO Common
-#
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-# end of Hid Sensor IIO Common
-
-CONFIG_IIO_MS_SENSORS_I2C=m
-
-#
-# SSP Sensor Common
-#
-CONFIG_IIO_SSP_SENSORS_COMMONS=m
-CONFIG_IIO_SSP_SENSORHUB=m
-# end of SSP Sensor Common
-
-CONFIG_IIO_ST_SENSORS_I2C=m
-CONFIG_IIO_ST_SENSORS_SPI=m
-CONFIG_IIO_ST_SENSORS_CORE=m
-
-#
-# Digital to analog converters
-#
-CONFIG_AD5064=m
-CONFIG_AD5360=m
-CONFIG_AD5380=m
-CONFIG_AD5421=m
-CONFIG_AD5446=m
-CONFIG_AD5449=m
-CONFIG_AD5592R_BASE=m
-CONFIG_AD5592R=m
-CONFIG_AD5593R=m
-CONFIG_AD5504=m
-CONFIG_AD5624R_SPI=m
-# CONFIG_AD5686_SPI is not set
-# CONFIG_AD5696_I2C is not set
-CONFIG_AD5755=m
-# CONFIG_AD5758 is not set
-CONFIG_AD5761=m
-CONFIG_AD5764=m
-CONFIG_AD5770R=m
-CONFIG_AD5791=m
-CONFIG_AD7303=m
-CONFIG_AD8801=m
-CONFIG_DS4424=m
-CONFIG_LTC1660=m
-# CONFIG_LTC2632 is not set
-CONFIG_M62332=m
-CONFIG_MAX517=m
-CONFIG_MCP4725=m
-# CONFIG_MCP4922 is not set
-CONFIG_TI_DAC082S085=m
-# CONFIG_TI_DAC5571 is not set
-CONFIG_TI_DAC7311=m
-CONFIG_TI_DAC7612=m
-# end of Digital to analog converters
-
-#
-# IIO dummy driver
-#
-CONFIG_IIO_SIMPLE_DUMMY=m
-# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
-# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
-# end of IIO dummy driver
-
-#
-# Frequency Synthesizers DDS/PLL
-#
-
-#
-# Clock Generator/Distribution
-#
-CONFIG_AD9523=m
-# end of Clock Generator/Distribution
-
-#
-# Phase-Locked Loop (PLL) frequency synthesizers
-#
-CONFIG_ADF4350=m
-# CONFIG_ADF4371 is not set
-# end of Phase-Locked Loop (PLL) frequency synthesizers
-# end of Frequency Synthesizers DDS/PLL
-
-#
-# Digital gyroscope sensors
-#
-CONFIG_ADIS16080=m
-CONFIG_ADIS16130=m
-CONFIG_ADIS16136=m
-CONFIG_ADIS16260=m
-CONFIG_ADXRS450=m
-CONFIG_BMG160=m
-CONFIG_BMG160_I2C=m
-CONFIG_BMG160_SPI=m
-CONFIG_FXAS21002C=m
-CONFIG_FXAS21002C_I2C=m
-CONFIG_FXAS21002C_SPI=m
-CONFIG_HID_SENSOR_GYRO_3D=m
-CONFIG_MPU3050=m
-CONFIG_MPU3050_I2C=m
-CONFIG_IIO_ST_GYRO_3AXIS=m
-CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
-CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
-CONFIG_ITG3200=m
-# end of Digital gyroscope sensors
-
-#
-# Health Sensors
-#
-
-#
-# Heart Rate Monitors
-#
-CONFIG_AFE4403=m
-CONFIG_AFE4404=m
-CONFIG_MAX30100=m
-# CONFIG_MAX30102 is not set
-# end of Heart Rate Monitors
-# end of Health Sensors
-
-#
-# Humidity sensors
-#
-CONFIG_AM2315=m
-CONFIG_DHT11=m
-CONFIG_HDC100X=m
-# CONFIG_HID_SENSOR_HUMIDITY is not set
-CONFIG_HTS221=m
-CONFIG_HTS221_I2C=m
-CONFIG_HTS221_SPI=m
-CONFIG_HTU21=m
-CONFIG_SI7005=m
-CONFIG_SI7020=m
-# end of Humidity sensors
-
-#
-# Inertial measurement units
-#
-CONFIG_ADIS16400=m
-# CONFIG_ADIS16460 is not set
-CONFIG_ADIS16475=m
-CONFIG_ADIS16480=m
-CONFIG_BMI160=m
-CONFIG_BMI160_I2C=m
-CONFIG_BMI160_SPI=m
-CONFIG_FXOS8700=m
-CONFIG_FXOS8700_I2C=m
-CONFIG_FXOS8700_SPI=m
-CONFIG_KMX61=m
-CONFIG_INV_ICM42600=m
-CONFIG_INV_ICM42600_I2C=m
-CONFIG_INV_ICM42600_SPI=m
-CONFIG_INV_MPU6050_IIO=m
-CONFIG_INV_MPU6050_I2C=m
-CONFIG_INV_MPU6050_SPI=m
-CONFIG_IIO_ST_LSM6DSX=m
-CONFIG_IIO_ST_LSM6DSX_I2C=m
-CONFIG_IIO_ST_LSM6DSX_SPI=m
-CONFIG_IIO_ST_LSM6DSX_I3C=m
-# end of Inertial measurement units
-
-CONFIG_IIO_ADIS_LIB=m
-CONFIG_IIO_ADIS_LIB_BUFFER=y
-
-#
-# Light sensors
-#
-CONFIG_ACPI_ALS=m
-CONFIG_ADJD_S311=m
-CONFIG_ADUX1020=m
-CONFIG_AL3010=m
-CONFIG_AL3320A=m
-CONFIG_APDS9300=m
-CONFIG_APDS9960=m
-CONFIG_BH1750=m
-CONFIG_BH1780=m
-CONFIG_CM32181=m
-CONFIG_CM3232=m
-CONFIG_CM3323=m
-CONFIG_CM36651=m
-# CONFIG_IIO_CROS_EC_LIGHT_PROX is not set
-# CONFIG_GP2AP002 is not set
-CONFIG_GP2AP020A00F=m
-# CONFIG_IQS621_ALS is not set
-CONFIG_SENSORS_ISL29018=m
-CONFIG_SENSORS_ISL29028=m
-# CONFIG_ISL29125 is not set
-CONFIG_HID_SENSOR_ALS=m
-CONFIG_HID_SENSOR_PROX=m
-CONFIG_JSA1212=m
-CONFIG_RPR0521=m
-CONFIG_SENSORS_LM3533=m
-CONFIG_LTR501=m
-# CONFIG_LV0104CS is not set
-CONFIG_MAX44000=m
-CONFIG_MAX44009=m
-CONFIG_NOA1305=m
-CONFIG_OPT3001=m
-CONFIG_PA12203001=m
-# CONFIG_SI1133 is not set
-CONFIG_SI1145=m
-CONFIG_STK3310=m
-# CONFIG_ST_UVIS25 is not set
-# CONFIG_TCS3414 is not set
-CONFIG_TCS3472=m
-CONFIG_SENSORS_TSL2563=m
-CONFIG_TSL2583=m
-# CONFIG_TSL2772 is not set
-CONFIG_TSL4531=m
-CONFIG_US5182D=m
-CONFIG_VCNL4000=m
-CONFIG_VCNL4035=m
-CONFIG_VEML6030=m
-CONFIG_VEML6070=m
-# CONFIG_VL6180 is not set
-# CONFIG_ZOPT2201 is not set
-# end of Light sensors
-
-#
-# Magnetometer sensors
-#
-CONFIG_AK8975=m
-# CONFIG_AK09911 is not set
-CONFIG_BMC150_MAGN=m
-CONFIG_BMC150_MAGN_I2C=m
-CONFIG_BMC150_MAGN_SPI=m
-CONFIG_MAG3110=m
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-CONFIG_MMC35240=m
-CONFIG_IIO_ST_MAGN_3AXIS=m
-CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
-CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
-# CONFIG_SENSORS_HMC5843_I2C is not set
-# CONFIG_SENSORS_HMC5843_SPI is not set
-CONFIG_SENSORS_RM3100=m
-CONFIG_SENSORS_RM3100_I2C=m
-CONFIG_SENSORS_RM3100_SPI=m
-# end of Magnetometer sensors
-
-#
-# Multiplexers
-#
-# end of Multiplexers
-
-#
-# Inclinometer sensors
-#
-CONFIG_HID_SENSOR_INCLINOMETER_3D=m
-# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
-# end of Inclinometer sensors
-
-#
-# Triggers - standalone
-#
-CONFIG_IIO_HRTIMER_TRIGGER=m
-CONFIG_IIO_INTERRUPT_TRIGGER=m
-CONFIG_IIO_TIGHTLOOP_TRIGGER=m
-CONFIG_IIO_SYSFS_TRIGGER=m
-# end of Triggers - standalone
-
-#
-# Linear and angular position sensors
-#
-# CONFIG_IQS624_POS is not set
-# end of Linear and angular position sensors
-
-#
-# Digital potentiometers
-#
-# CONFIG_AD5272 is not set
-CONFIG_DS1803=m
-CONFIG_MAX5432=m
-CONFIG_MAX5481=m
-CONFIG_MAX5487=m
-# CONFIG_MCP4018 is not set
-CONFIG_MCP4131=m
-CONFIG_MCP4531=m
-CONFIG_MCP41010=m
-CONFIG_TPL0102=m
-# end of Digital potentiometers
-
-#
-# Digital potentiostats
-#
-CONFIG_LMP91000=m
-# end of Digital potentiostats
-
-#
-# Pressure sensors
-#
-CONFIG_ABP060MG=m
-CONFIG_BMP280=m
-CONFIG_BMP280_I2C=m
-CONFIG_BMP280_SPI=m
-CONFIG_IIO_CROS_EC_BARO=m
-CONFIG_DLHL60D=m
-# CONFIG_DPS310 is not set
-CONFIG_HID_SENSOR_PRESS=m
-CONFIG_HP03=m
-# CONFIG_ICP10100 is not set
-CONFIG_MPL115=m
-CONFIG_MPL115_I2C=m
-CONFIG_MPL115_SPI=m
-CONFIG_MPL3115=m
-CONFIG_MS5611=m
-CONFIG_MS5611_I2C=m
-CONFIG_MS5611_SPI=m
-CONFIG_MS5637=m
-CONFIG_IIO_ST_PRESS=m
-CONFIG_IIO_ST_PRESS_I2C=m
-CONFIG_IIO_ST_PRESS_SPI=m
-# CONFIG_T5403 is not set
-CONFIG_HP206C=m
-CONFIG_ZPA2326=m
-CONFIG_ZPA2326_I2C=m
-CONFIG_ZPA2326_SPI=m
-# end of Pressure sensors
-
-#
-# Lightning sensors
-#
-# CONFIG_AS3935 is not set
-# end of Lightning sensors
-
-#
-# Proximity and distance sensors
-#
-CONFIG_ISL29501=m
-CONFIG_LIDAR_LITE_V2=m
-CONFIG_MB1232=m
-CONFIG_PING=m
-CONFIG_RFD77402=m
-# CONFIG_SRF04 is not set
-CONFIG_SX9310=m
-CONFIG_SX9500=m
-CONFIG_SRF08=m
-CONFIG_VCNL3020=m
-CONFIG_VL53L0X_I2C=m
-# end of Proximity and distance sensors
-
-#
-# Resolver to digital converters
-#
-CONFIG_AD2S90=m
-CONFIG_AD2S1200=m
-# end of Resolver to digital converters
-
-#
-# Temperature sensors
-#
-# CONFIG_IQS620AT_TEMP is not set
-CONFIG_LTC2983=m
-CONFIG_MAXIM_THERMOCOUPLE=m
-# CONFIG_HID_SENSOR_TEMP is not set
-# CONFIG_MLX90614 is not set
-# CONFIG_MLX90632 is not set
-CONFIG_TMP006=m
-CONFIG_TMP007=m
-CONFIG_TSYS01=m
-CONFIG_TSYS02D=m
-CONFIG_MAX31856=m
-# end of Temperature sensors
-
-CONFIG_NTB=m
-# CONFIG_NTB_MSI is not set
-# CONFIG_NTB_IDT is not set
-CONFIG_NTB_SWITCHTEC=m
-CONFIG_NTB_PINGPONG=m
-CONFIG_NTB_TOOL=m
-CONFIG_NTB_PERF=m
-CONFIG_NTB_TRANSPORT=m
-# CONFIG_VME_BUS is not set
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
-# CONFIG_PWM_DEBUG is not set
-CONFIG_PWM_CROS_EC=m
-CONFIG_PWM_IQS620A=m
-CONFIG_PWM_LP3943=m
-CONFIG_PWM_LPSS=m
-CONFIG_PWM_LPSS_PCI=m
-CONFIG_PWM_LPSS_PLATFORM=m
-CONFIG_PWM_PCA9685=m
-
-#
-# IRQ chip support
-#
-CONFIG_MADERA_IRQ=m
-# end of IRQ chip support
-
-CONFIG_IPACK_BUS=m
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
-CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
-# CONFIG_RESET_TI_SYSCON is not set
-
-#
-# PHY Subsystem
-#
-CONFIG_GENERIC_PHY=y
-# CONFIG_BCM_KONA_USB2_PHY is not set
-CONFIG_PHY_PXA_28NM_HSIC=m
-CONFIG_PHY_PXA_28NM_USB2=m
-# CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHY_QCOM_USB_HS=m
-CONFIG_PHY_QCOM_USB_HSIC=m
-CONFIG_PHY_TUSB1210=m
-CONFIG_PHY_INTEL_EMMC=m
-# end of PHY Subsystem
-
-CONFIG_POWERCAP=y
-CONFIG_INTEL_RAPL_CORE=m
-CONFIG_INTEL_RAPL=m
-CONFIG_IDLE_INJECT=y
-CONFIG_MCB=m
-CONFIG_MCB_PCI=m
-CONFIG_MCB_LPC=m
-
-#
-# Performance monitor support
-#
-# end of Performance monitor support
-
-CONFIG_RAS=y
-CONFIG_USB4=m
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-# end of Android
-
-# CONFIG_LIBNVDIMM is not set
-CONFIG_DAX=y
-CONFIG_DEV_DAX=m
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-CONFIG_NVMEM_SPMI_SDAM=m
-
-#
-# HW tracing support
-#
-CONFIG_STM=m
-CONFIG_STM_PROTO_BASIC=m
-CONFIG_STM_PROTO_SYS_T=m
-CONFIG_STM_DUMMY=m
-CONFIG_STM_SOURCE_CONSOLE=m
-CONFIG_STM_SOURCE_HEARTBEAT=m
-# CONFIG_STM_SOURCE_FTRACE is not set
-CONFIG_INTEL_TH=m
-CONFIG_INTEL_TH_PCI=m
-# CONFIG_INTEL_TH_ACPI is not set
-CONFIG_INTEL_TH_GTH=m
-CONFIG_INTEL_TH_STH=m
-CONFIG_INTEL_TH_MSU=m
-CONFIG_INTEL_TH_PTI=m
-# CONFIG_INTEL_TH_DEBUG is not set
-# end of HW tracing support
-
-CONFIG_FPGA=m
-# CONFIG_ALTERA_PR_IP_CORE is not set
-CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
-CONFIG_FPGA_MGR_ALTERA_CVP=m
-# CONFIG_FPGA_MGR_XILINX_SPI is not set
-# CONFIG_FPGA_MGR_MACHXO2_SPI is not set
-CONFIG_FPGA_BRIDGE=m
-CONFIG_ALTERA_FREEZE_BRIDGE=m
-CONFIG_XILINX_PR_DECOUPLER=m
-CONFIG_FPGA_REGION=m
-CONFIG_FPGA_DFL=m
-CONFIG_FPGA_DFL_FME=m
-CONFIG_FPGA_DFL_FME_MGR=m
-CONFIG_FPGA_DFL_FME_BRIDGE=m
-CONFIG_FPGA_DFL_FME_REGION=m
-CONFIG_FPGA_DFL_AFU=m
-CONFIG_FPGA_DFL_PCI=m
-CONFIG_TEE=m
-
-#
-# TEE drivers
-#
-# end of TEE drivers
-
-CONFIG_MULTIPLEXER=m
-
-#
-# Multiplexer drivers
-#
-# CONFIG_MUX_ADG792A is not set
-# CONFIG_MUX_ADGS1408 is not set
-# CONFIG_MUX_GPIO is not set
-# end of Multiplexer drivers
-
-CONFIG_PM_OPP=y
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-CONFIG_INTERCONNECT=y
-# CONFIG_COUNTER is not set
-CONFIG_MOST=m
-CONFIG_MOST_USB_HDM=m
-# end of Device Drivers
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-CONFIG_VALIDATE_FS_PARSER=y
-CONFIG_FS_IOMAP=y
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_USE_FOR_EXT2=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-# CONFIG_OCFS2_DEBUG_MASKLOG is not set
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_FS_REF_VERIFY is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_F2FS_CHECK_FS=y
-# CONFIG_F2FS_IO_TRACE is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-CONFIG_F2FS_FS_COMPRESSION=y
-CONFIG_F2FS_FS_LZO=y
-CONFIG_F2FS_FS_LZ4=y
-CONFIG_F2FS_FS_ZSTD=y
-CONFIG_F2FS_FS_LZORLE=y
-CONFIG_ZONEFS_FS=m
-CONFIG_FS_DAX=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_EXPORTFS_BLOCK_OPS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_MANDATORY_FILE_LOCKING=y
-CONFIG_FS_ENCRYPTION=y
-CONFIG_FS_ENCRYPTION_ALGS=m
-CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_AUTOFS_FS=y
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_VIRTIO_FS=m
-CONFIG_OVERLAY_FS=m
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
-# CONFIG_OVERLAY_FS_INDEX is not set
-# CONFIG_OVERLAY_FS_METACOPY is not set
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/EXFAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_FAT_DEFAULT_UTF8=y
-CONFIG_EXFAT_FS=m
-CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
-# end of DOS/FAT/EXFAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_VMCORE=y
-# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_PROC_CHILDREN=y
-CONFIG_PROC_PID_ARCH_STATUS=y
-CONFIG_PROC_CPU_RESCTRL=y
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_CONFIGFS_FS=m
-CONFIG_EFIVAR_FS=y
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_ORANGEFS_FS=m
-CONFIG_ADFS_FS=m
-# CONFIG_ADFS_FS_RW is not set
-# CONFIG_AFFS_FS is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-CONFIG_CRAMFS=m
-CONFIG_CRAMFS_BLOCKDEV=y
-# CONFIG_CRAMFS_MTD is not set
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_FILE_CACHE=y
-# CONFIG_SQUASHFS_FILE_DIRECT is not set
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-CONFIG_SQUASHFS_DECOMP_MULTI=y
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_ZSTD=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-CONFIG_HPFS_FS=m
-# CONFIG_QNX4FS_FS is not set
-CONFIG_QNX6FS_FS=m
-# CONFIG_QNX6FS_DEBUG is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_PSTORE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=y
-# CONFIG_PSTORE_LZO_COMPRESS is not set
-# CONFIG_PSTORE_LZ4_COMPRESS is not set
-# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
-# CONFIG_PSTORE_842_COMPRESS is not set
-CONFIG_PSTORE_ZSTD_COMPRESS=y
-CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
-# CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT is not set
-CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
-# CONFIG_SYSV_FS is not set
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EROFS_FS=m
-# CONFIG_EROFS_FS_DEBUG is not set
-CONFIG_EROFS_FS_XATTR=y
-CONFIG_EROFS_FS_POSIX_ACL=y
-CONFIG_EROFS_FS_SECURITY=y
-# CONFIG_EROFS_FS_ZIP is not set
-CONFIG_VBOXSF_FS=m
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-CONFIG_NFS_SWAP=y
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-CONFIG_NFS_V4_1_MIGRATION=y
-CONFIG_NFS_V4_SECURITY_LABEL=y
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFS_DISABLE_UDP_SUPPORT=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_BLOCKLAYOUT=y
-CONFIG_NFSD_SCSILAYOUT=y
-CONFIG_NFSD_FLEXFILELAYOUT=y
-CONFIG_NFSD_V4_2_INTER_SSC=y
-CONFIG_NFSD_V4_SECURITY_LABEL=y
-CONFIG_GRACE_PERIOD=m
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_SUNRPC_SWAP=y
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
-# CONFIG_SUNRPC_DEBUG is not set
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-# CONFIG_CEPH_FS_SECURITY_LABEL is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_UPCALL is not set
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG is not set
-CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_SMB_DIRECT is not set
-CONFIG_CIFS_FSCACHE=y
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-CONFIG_AFS_FSCACHE=y
-# CONFIG_AFS_DEBUG_CURSOR is not set
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-CONFIG_9P_FS_SECURITY=y
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-CONFIG_UNICODE=y
-# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
-CONFIG_IO_WQ=y
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_KEYS_REQUEST_CACHE is not set
-# CONFIG_PERSISTENT_KEYRINGS is not set
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_KEY_DH_OPERATIONS=y
-CONFIG_KEY_NOTIFICATIONS=y
-CONFIG_SECURITY_DMESG_RESTRICT=y
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_PAGE_TABLE_ISOLATION=y
-# CONFIG_SECURITY_INFINIBAND is not set
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-CONFIG_INTEL_TXT=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_HARDENED_USERCOPY_FALLBACK=y
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-CONFIG_FORTIFY_SOURCE=y
-# CONFIG_STATIC_USERMODEHELPER is not set
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-# CONFIG_SECURITY_SELINUX_DISABLE is not set
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
-CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
-CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_HASH=y
-CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
-# CONFIG_SECURITY_APPARMOR_DEBUG is not set
-# CONFIG_SECURITY_LOADPIN is not set
-CONFIG_SECURITY_YAMA=y
-# CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-CONFIG_INTEGRITY=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_AUDIT=y
-# CONFIG_IMA is not set
-# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
-# CONFIG_EVM is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="yama,loadpin,safesetid,integrity"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_SKCIPHER=y
-CONFIG_CRYPTO_SKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_GLUE_HELPER_X86=y
-CONFIG_CRYPTO_ENGINE=m
-
-#
-# Public-key cryptography
-#
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECC=m
-CONFIG_CRYPTO_ECDH=m
-CONFIG_CRYPTO_ECRDSA=m
-CONFIG_CRYPTO_CURVE25519=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_AEGIS128 is not set
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-# CONFIG_CRYPTO_CFB is not set
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_OFB=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
-CONFIG_CRYPTO_NHPOLY1305=m
-CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_ESSIV=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_XXHASH=m
-CONFIG_CRYPTO_BLAKE2B=m
-CONFIG_CRYPTO_BLAKE2S=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA3=m
-# CONFIG_CRYPTO_SM3 is not set
-CONFIG_CRYPTO_STREEBOG=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_TI=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=y
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=y
-CONFIG_CRYPTO_SERPENT_SSE2_586=y
-# CONFIG_CRYPTO_SM4 is not set
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=y
-CONFIG_CRYPTO_TWOFISH_586=y
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-CONFIG_CRYPTO_ZSTD=y
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=m
-CONFIG_CRYPTO_DRBG_HMAC=y
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=m
-CONFIG_CRYPTO_JITTERENTROPY=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
-CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_GEODE=m
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_SP_CCP=y
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
-CONFIG_CRYPTO_DEV_QAT=m
-# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
-CONFIG_CRYPTO_DEV_QAT_C3XXX=m
-CONFIG_CRYPTO_DEV_QAT_C62X=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
-CONFIG_CRYPTO_DEV_QAT_C62XVF=m
-CONFIG_CRYPTO_DEV_CHELSIO=m
-# CONFIG_CHELSIO_IPSEC_INLINE is not set
-CONFIG_CHELSIO_TLS_DEVICE=y
-CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DEV_SAFEXCEL=m
-CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
-# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set
-CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
-CONFIG_X509_CERTIFICATE_PARSER=y
-CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
-CONFIG_TPM_KEY_PARSER=m
-CONFIG_PKCS7_MESSAGE_PARSER=y
-# CONFIG_PKCS7_TEST_KEY is not set
-# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
-
-#
-# Certificates for signature checking
-#
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
-# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# end of Certificates for signature checking
-
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_RAID6_PQ_BENCHMARK=y
-CONFIG_LINEAR_RANGES=y
-CONFIG_PACKING=y
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_CORDIC=m
-# CONFIG_PRIME_NUMBERS is not set
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
-CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=m
-CONFIG_CRC4=m
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_XXHASH=y
-CONFIG_AUDIT_GENERIC=y
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_842_COMPRESS=m
-CONFIG_842_DECOMPRESS=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=y
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMPRESS=y
-CONFIG_ZSTD_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-CONFIG_XZ_DEC_TEST=m
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_DECOMPRESS_ZSTD=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_BCH=m
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_INTERVAL_TREE=y
-CONFIG_XARRAY_MULTI=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_DMA_OPS=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_SWIOTLB=y
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
-CONFIG_CLZ_TAB=y
-CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
-CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
-CONFIG_HAVE_GENERIC_VDSO=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_GENERIC_VDSO_32=y
-CONFIG_GENERIC_VDSO_TIME_NS=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_6x10 is not set
-# CONFIG_FONT_10x18 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-CONFIG_FONT_TER16x32=y
-CONFIG_SG_POOL=y
-CONFIG_ARCH_STACKWALK=y
-CONFIG_SBITMAP=y
-CONFIG_PARMAN=m
-CONFIG_OBJAGG=m
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=4
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DYNAMIC_DEBUG_CORE=y
-CONFIG_SYMBOLIC_ERRNAME=y
-CONFIG_DEBUG_BUGVERBOSE=y
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_DEBUG_INFO_COMPRESSED is not set
-# CONFIG_DEBUG_INFO_SPLIT is not set
-# CONFIG_DEBUG_INFO_DWARF4 is not set
-CONFIG_DEBUG_INFO_BTF=y
-# CONFIG_GDB_SCRIPTS is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_READABLE_ASM is not set
-# CONFIG_HEADERS_INSTALL is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B is not set
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# end of Compile-time checks and compiler options
-
-#
-# Generic Kernel Debugging Instruments
-#
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
-CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_FS_ALLOW_ALL=y
-# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
-# CONFIG_DEBUG_FS_ALLOW_NONE is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_UBSAN is not set
-# end of Generic Kernel Debugging Instruments
-
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-CONFIG_PAGE_EXTENSION=y
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
-CONFIG_PAGE_POISONING=y
-CONFIG_PAGE_POISONING_NO_SANITY=y
-CONFIG_PAGE_POISONING_ZERO=y
-# CONFIG_DEBUG_PAGE_REF is not set
-# CONFIG_DEBUG_RODATA_TEST is not set
-CONFIG_ARCH_HAS_DEBUG_WX=y
-CONFIG_DEBUG_WX=y
-CONFIG_GENERIC_PTDUMP=y
-CONFIG_PTDUMP_CORE=y
-# CONFIG_PTDUMP_DEBUGFS is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-CONFIG_SCHED_STACK_END_CHECK=y
-# CONFIG_DEBUG_VM is not set
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
-# end of Memory Debugging
-
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Oops, Lockups and Hangs
-#
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_SOFTLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_HARDLOCKUP_DETECTOR_PERF=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_WQ_WATCHDOG is not set
-# CONFIG_TEST_LOCKUP is not set
-# end of Debug Oops, Lockups and Hangs
-
-#
-# Scheduler Debugging
-#
-# CONFIG_SCHED_DEBUG is not set
-CONFIG_SCHED_INFO=y
-CONFIG_SCHEDSTATS=y
-# end of Scheduler Debugging
-
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-CONFIG_WW_MUTEX_SELFTEST=m
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-CONFIG_STACKTRACE=y
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-
-#
-# Debug kernel data structures
-#
-CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_SG=y
-CONFIG_DEBUG_NOTIFIERS=y
-CONFIG_BUG_ON_DATA_CORRUPTION=y
-# end of Debug kernel data structures
-
-CONFIG_DEBUG_CREDENTIALS=y
-
-#
-# RCU Debugging
-#
-CONFIG_TORTURE_TEST=m
-CONFIG_RCU_PERF_TEST=m
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_REF_SCALE_TEST=m
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_FENTRY=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACER_MAX_TRACE=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_BOOTTIME_TRACING is not set
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_FUNCTION_PROFILER=y
-# CONFIG_STACK_TRACER is not set
-# CONFIG_IRQSOFF_TRACER is not set
-CONFIG_SCHED_TRACER=y
-CONFIG_HWLAT_TRACER=y
-CONFIG_MMIOTRACE=y
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_TRACER_SNAPSHOT=y
-# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_KPROBE_EVENTS=y
-# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_BPF_KPROBE_OVERRIDE=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_TRACING_MAP=y
-CONFIG_SYNTH_EVENTS=y
-CONFIG_HIST_TRIGGERS=y
-CONFIG_TRACE_EVENT_INJECT=y
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_MMIOTRACE_TEST is not set
-CONFIG_PREEMPTIRQ_DELAY_TEST=m
-# CONFIG_SYNTH_EVENT_GEN_TEST is not set
-CONFIG_KPROBE_EVENT_GEN_TEST=m
-# CONFIG_HIST_TRIGGERS_DEBUG is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_SAMPLES is not set
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_IO_STRICT_DEVMEM=y
-
-#
-# x86 Debugging
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_EARLY_PRINTK_USB_XDBC is not set
-# CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_DEBUG_TLBFLUSH is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-# CONFIG_X86_DECODER_SELFTEST is not set
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-# CONFIG_DEBUG_ENTRY is not set
-# CONFIG_DEBUG_NMI_SELFTEST is not set
-CONFIG_X86_DEBUG_FPU=y
-CONFIG_PUNIT_ATOM_DEBUG=m
-CONFIG_UNWINDER_FRAME_POINTER=y
-# CONFIG_UNWINDER_GUESS is not set
-# end of x86 Debugging
-
-#
-# Kernel Testing and Coverage
-#
-# CONFIG_KUNIT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-CONFIG_FUNCTION_ERROR_INJECTION=y
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-CONFIG_RUNTIME_TESTING_MENU=y
-CONFIG_LKDTM=m
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_TEST_MIN_HEAP is not set
-# CONFIG_TEST_SORT is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_REED_SOLOMON_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_PERCPU_TEST is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
-CONFIG_TEST_HEXDUMP=m
-CONFIG_TEST_STRING_HELPERS=m
-# CONFIG_TEST_STRSCPY is not set
-CONFIG_TEST_KSTRTOX=m
-CONFIG_TEST_PRINTF=m
-CONFIG_TEST_BITMAP=m
-# CONFIG_TEST_BITFIELD is not set
-CONFIG_TEST_UUID=m
-# CONFIG_TEST_XARRAY is not set
-# CONFIG_TEST_OVERFLOW is not set
-# CONFIG_TEST_RHASHTABLE is not set
-CONFIG_TEST_HASH=m
-# CONFIG_TEST_IDA is not set
-CONFIG_TEST_PARMAN=m
-# CONFIG_TEST_LKM is not set
-# CONFIG_TEST_BITOPS is not set
-# CONFIG_TEST_VMALLOC is not set
-# CONFIG_TEST_USER_COPY is not set
-# CONFIG_TEST_BPF is not set
-# CONFIG_TEST_BLACKHOLE_DEV is not set
-# CONFIG_FIND_BIT_BENCHMARK is not set
-# CONFIG_TEST_FIRMWARE is not set
-# CONFIG_TEST_SYSCTL is not set
-# CONFIG_TEST_UDELAY is not set
-CONFIG_TEST_STATIC_KEYS=m
-# CONFIG_TEST_KMOD is not set
-# CONFIG_TEST_MEMCAT_P is not set
-# CONFIG_TEST_OBJAGG is not set
-# CONFIG_TEST_STACKINIT is not set
-# CONFIG_TEST_MEMINIT is not set
-# CONFIG_TEST_FREE_PAGES is not set
-CONFIG_TEST_FPU=m
-# CONFIG_MEMTEST is not set
-# CONFIG_HYPERV_TESTING is not set
-# end of Kernel Testing and Coverage
-# end of Kernel hacking
diff --git a/srcpkgs/linux5.9/files/mv-debug b/srcpkgs/linux5.9/files/mv-debug
deleted file mode 100755
index 8898c928d119..000000000000
--- a/srcpkgs/linux5.9/files/mv-debug
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-mod=$1
-mkdir -p usr/lib/debug/${mod%/*}
-$OBJCOPY --only-keep-debug --compress-debug-sections $mod usr/lib/debug/$mod
-$OBJCOPY --add-gnu-debuglink=${DESTDIR}/usr/lib/debug/$mod $mod
-/usr/bin/$STRIP --strip-debug $mod
-gzip -9 $mod
diff --git a/srcpkgs/linux5.9/files/ppc-dotconfig b/srcpkgs/linux5.9/files/ppc-dotconfig
deleted file mode 100644
index edd047e72dc6..000000000000
--- a/srcpkgs/linux5.9/files/ppc-dotconfig
+++ /dev/null
@@ -1,7972 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.9.6 Kernel Configuration
-#
-CONFIG_CC_VERSION_TEXT="powerpc-linux-musl-gcc (GCC) 9.3.0"
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=232000000
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_TABLE_SORT=y
-CONFIG_THREAD_INFO_IN_TASK=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_1"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT=""
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_XZ=y
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_XZ=y
-CONFIG_DEFAULT_INIT=""
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_WATCH_QUEUE=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-# CONFIG_USELIB is not set
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_GENERIC_IRQ_INJECTION=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
-# end of IRQ subsystem
-
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_ARCH_HAS_TICK_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ is not set
-CONFIG_HIGH_RES_TIMERS=y
-# end of Timers subsystem
-
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_PSI=y
-CONFIG_PSI_DEFAULT_DISABLED=y
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
-CONFIG_TASKS_TRACE_RCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKHEADERS=m
-CONFIG_LOG_BUF_SHIFT=17
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-
-#
-# Scheduler features
-#
-# CONFIG_UCLAMP_TASK is not set
-# end of Scheduler features
-
-CONFIG_CGROUPS=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_RDMA=y
-CONFIG_CGROUP_FREEZER=y
-# CONFIG_CPUSETS is not set
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_RD_ZSTD=y
-CONFIG_BOOT_CONFIG=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
-# CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set
-CONFIG_SYSCTL=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_MULTIUSER=y
-CONFIG_SGETMASK_SYSCALL=y
-CONFIG_SYSFS_SYSCALL=y
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_LSM=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_USERFAULTFD=y
-CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y
-CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLAB_FREELIST_RANDOM=y
-CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_SYSTEM_DATA_VERIFICATION=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-# end of General setup
-
-CONFIG_PPC32=y
-# CONFIG_PPC64 is not set
-CONFIG_PPC_BOOK3S_32=y
-
-#
-# Processor support
-#
-CONFIG_PPC_BOOK3S_6xx=y
-# CONFIG_PPC_BOOK3S_601 is not set
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_GENERIC_CPU=y
-# CONFIG_E300C2_CPU is not set
-# CONFIG_E300C3_CPU is not set
-# CONFIG_G4_CPU is not set
-CONFIG_PPC_BOOK3S=y
-CONFIG_PPC_FPU=y
-CONFIG_ALTIVEC=y
-CONFIG_PPC_HAVE_KUEP=y
-CONFIG_PPC_KUEP=y
-CONFIG_PPC_HAVE_KUAP=y
-CONFIG_PPC_KUAP=y
-# CONFIG_PPC_KUAP_DEBUG is not set
-CONFIG_PPC_HAVE_PMU_SUPPORT=y
-CONFIG_PMU_SYSFS=y
-CONFIG_PPC_PERF_CTRS=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=2048
-# end of Processor support
-
-CONFIG_VDSO32=y
-CONFIG_CPU_BIG_ENDIAN=y
-CONFIG_32BIT=y
-CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MAX=17
-CONFIG_ARCH_MMAP_RND_BITS_MIN=11
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
-CONFIG_NR_IRQS=512
-CONFIG_NMI_IPI=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_PPC=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_PPC_UDBG_16550=y
-CONFIG_GENERIC_TBSYNC=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_GENERIC_BUG=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_ZONE_DMA=y
-CONFIG_PGTABLE_LEVELS=2
-CONFIG_PPC_MSI_BITMAP=y
-
-#
-# Platform support
-#
-# CONFIG_SCOM_DEBUGFS is not set
-CONFIG_PPC_CHRP=y
-# CONFIG_PPC_MPC512x is not set
-CONFIG_PPC_MPC52xx=y
-# CONFIG_PPC_MPC5200_SIMPLE is not set
-CONFIG_PPC_EFIKA=y
-# CONFIG_PPC_LITE5200 is not set
-# CONFIG_PPC_MEDIA5200 is not set
-CONFIG_PPC_MPC5200_BUGFIX=y
-# CONFIG_PPC_MPC5200_LPBFIFO is not set
-CONFIG_PPC_PMAC=y
-CONFIG_PPC_PMAC32_PSURGE=y
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_86xx is not set
-CONFIG_KVM_GUEST=y
-CONFIG_EPAPR_PARAVIRT=y
-CONFIG_PPC_NATIVE=y
-CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
-# CONFIG_UDBG_RTAS_CONSOLE is not set
-CONFIG_PPC_SMP_MUXED_IPI=y
-CONFIG_MPIC=y
-# CONFIG_MPIC_MSGR is not set
-CONFIG_PPC_I8259=y
-CONFIG_PPC_RTAS=y
-CONFIG_RTAS_ERROR_LOGGING=y
-CONFIG_PPC_RTAS_DAEMON=y
-CONFIG_RTAS_PROC=y
-CONFIG_PPC_MPC106=y
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-
-#
-# CPU frequency scaling drivers
-#
-# CONFIG_CPUFREQ_DT is not set
-CONFIG_CPU_FREQ_PMAC=y
-# end of CPU Frequency scaling
-
-#
-# CPUIdle driver
-#
-
-#
-# CPU Idle
-#
-# CONFIG_CPU_IDLE is not set
-# end of CPU Idle
-# end of CPUIdle driver
-
-CONFIG_TAU=y
-# CONFIG_TAU_INT is not set
-# CONFIG_TAU_AVERAGE is not set
-CONFIG_QE_GPIO=y
-# CONFIG_GEN_RTC is not set
-# end of Platform support
-
-#
-# Kernel options
-#
-CONFIG_HIGHMEM=y
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=250
-CONFIG_SCHED_HRTICK=y
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_PPC_QUEUED_SPINLOCKS is not set
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_KEXEC=y
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_IRQ_ALL_CPUS is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ILLEGAL_POINTER_VALUE=0
-CONFIG_PPC_4K_PAGES=y
-CONFIG_PPC_PAGE_SHIFT=12
-CONFIG_THREAD_SHIFT=13
-CONFIG_DATA_SHIFT=12
-CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_CMDLINE=""
-CONFIG_EXTRA_TARGETS=""
-CONFIG_ARCH_WANTS_FREEZER_CONTROL=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_HIBERNATION_SNAPSHOT_DEV=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_PM_SLEEP_DEBUG=y
-# CONFIG_DPM_WATCHDOG is not set
-CONFIG_APM_EMULATION=m
-CONFIG_PM_CLK=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_ENERGY_MODEL=y
-CONFIG_SECCOMP=y
-CONFIG_PPC_RTAS_FILTER=y
-# end of Kernel options
-
-CONFIG_ISA_DMA_API=y
-
-#
-# Bus options
-#
-# CONFIG_ISA is not set
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_PPC_INDIRECT_PCI=y
-# CONFIG_FSL_LBC is not set
-CONFIG_FSL_GTM=y
-# end of Bus options
-
-#
-# Advanced setup
-#
-# CONFIG_ADVANCED_OPTIONS is not set
-
-#
-# Default settings for advanced configuration options are used
-#
-CONFIG_LOWMEM_SIZE=0x30000000
-CONFIG_PAGE_OFFSET=0xc0000000
-CONFIG_KERNEL_START=0xc0000000
-CONFIG_PHYSICAL_START=0x00000000
-CONFIG_TASK_SIZE=0xc0000000
-# end of Advanced setup
-
-CONFIG_PPC_LIB_RHEAP=y
-CONFIG_VIRTUALIZATION=y
-
-#
-# General architecture-dependent options
-#
-CONFIG_CRASH_CORE=y
-CONFIG_KEXEC_CORE=y
-CONFIG_OPROFILE=m
-CONFIG_HAVE_OPROFILE=y
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_KRETPROBES=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_KPROBES_ON_FTRACE=y
-CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_HAVE_ASM_MODVERSIONS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_MMU_GATHER_TABLE_FREE=y
-CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
-CONFIG_MMU_GATHER_PAGE_SIZE=y
-CONFIG_ARCH_WANT_IRQS_OFF_ACTIVATE_MM=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_ARCH_MMAP_RND_BITS=11
-CONFIG_HAVE_ARCH_NVRAM_OPS=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGSUSPEND=y
-CONFIG_OLD_SIGACTION=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_ARCH_HAS_PHYS_TO_DMA=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# end of GCOV-based kernel profiling
-
-CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_ASM_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
-CONFIG_BLK_CGROUP_RWSTAT=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=m
-CONFIG_BLK_DEV_ZONED=y
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
-CONFIG_BLK_CMDLINE_PARSER=y
-CONFIG_BLK_WBT=y
-# CONFIG_BLK_CGROUP_IOLATENCY is not set
-# CONFIG_BLK_CGROUP_IOCOST is not set
-CONFIG_BLK_WBT_MQ=y
-CONFIG_BLK_DEBUG_FS=y
-CONFIG_BLK_DEBUG_FS_ZONED=y
-CONFIG_BLK_SED_OPAL=y
-CONFIG_BLK_INLINE_ENCRYPTION=y
-CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AIX_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-CONFIG_AMIGA_PARTITION=y
-CONFIG_ATARI_PARTITION=y
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_CMDLINE_PARTITION=y
-# end of Partition Types
-
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-CONFIG_IOSCHED_BFQ=y
-CONFIG_BFQ_GROUP_IOSCHED=y
-# CONFIG_BFQ_CGROUP_DEBUG is not set
-# end of IO Schedulers
-
-CONFIG_ASN1=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_ELFCORE=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_HAVE_FAST_GUP=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_PAGE_REPORTING=y
-CONFIG_MIGRATION=y
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_CLEANCACHE is not set
-CONFIG_FRONTSWAP=y
-# CONFIG_CMA is not set
-CONFIG_ZSWAP=y
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
-CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
-CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
-CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
-CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
-# CONFIG_ZSWAP_DEFAULT_ON is not set
-CONFIG_ZPOOL=y
-CONFIG_ZBUD=y
-CONFIG_Z3FOLD=m
-# CONFIG_ZSMALLOC is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-# CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_FRAME_VECTOR=y
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-CONFIG_ARCH_HAS_PTE_SPECIAL=y
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-CONFIG_NET_REDIRECT=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-CONFIG_UNIX_DIAG=m
-# CONFIG_TLS is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_OFFLOAD=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-CONFIG_XFRM_INTERFACE=m
-CONFIG_XFRM_SUB_POLICY=y
-CONFIG_XFRM_MIGRATE=y
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_AH=m
-CONFIG_XFRM_ESP=m
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_XFRM_ESPINTCP=y
-CONFIG_XDP_SOCKETS=y
-CONFIG_XDP_SOCKETS_DIAG=m
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_FIB_TRIE_STATS=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_ESP_OFFLOAD=m
-CONFIG_INET_ESPINTCP=y
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
-CONFIG_INET_DIAG_DESTROY=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_NV=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_TCP_CONG_DCTCP=m
-CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_ESP_OFFLOAD=m
-CONFIG_INET6_ESPINTCP=y
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=y
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_FOU=m
-CONFIG_IPV6_FOU_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-CONFIG_IPV6_SEG6_LWTUNNEL=y
-CONFIG_IPV6_SEG6_HMAC=y
-CONFIG_IPV6_SEG6_BPF=y
-CONFIG_IPV6_RPL_LWTUNNEL=y
-# CONFIG_NETLABEL is not set
-CONFIG_MPTCP=y
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_MPTCP_IPV6=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NET_PTP_CLASSIFY=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_FAMILY_BRIDGE=y
-CONFIG_NETFILTER_FAMILY_ARP=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-CONFIG_NF_LOG_NETDEV=m
-CONFIG_NETFILTER_CONNCOUNT=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NF_NAT_MASQUERADE=y
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CONNLIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_TUNNEL=m
-CONFIG_NFT_OBJREF=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
-CONFIG_NFT_XFRM=m
-CONFIG_NFT_SOCKET=m
-CONFIG_NFT_OSF=m
-CONFIG_NFT_TPROXY=m
-# CONFIG_NFT_SYNPROXY is not set
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_FIB_NETDEV=m
-CONFIG_NF_FLOW_TABLE_INET=m
-CONFIG_NF_FLOW_TABLE=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-# end of Core Netfilter Configuration
-
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_MH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS MH scheduler
-#
-CONFIG_IP_VS_MH_TAB_INDEX=12
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_SOCKET_IPV4=m
-CONFIG_NF_TPROXY_IPV4=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_FLOW_TABLE_IPV4=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# end of IP: Netfilter Configuration
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_SOCKET_IPV6=m
-CONFIG_NF_TPROXY_IPV6=m
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_FLOW_TABLE_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-# CONFIG_IP6_NF_MATCH_SRH is not set
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-# end of IPv6: Netfilter Configuration
-
-CONFIG_NF_DEFRAG_IPV6=m
-
-#
-# DECnet: Netfilter Configuration
-#
-CONFIG_DECNET_NF_GRABULATOR=m
-# end of DECnet: Netfilter Configuration
-
-CONFIG_NF_TABLES_BRIDGE=m
-# CONFIG_NFT_BRIDGE_META is not set
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-# CONFIG_BPFILTER is not set
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-# end of DCCP CCIDs Configuration
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-# end of DCCP Kernel Hacking
-
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_INET_SCTP_DIAG=m
-CONFIG_RDS=m
-CONFIG_RDS_TCP=m
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-CONFIG_TIPC_MEDIA_UDP=y
-CONFIG_TIPC_CRYPTO=y
-CONFIG_TIPC_DIAG=m
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-CONFIG_L2TP_DEBUGFS=m
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_MRP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_BRIDGE_MRP=y
-CONFIG_HAVE_NET_DSA=y
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VLAN_8021Q_MVRP=y
-CONFIG_DECNET=m
-CONFIG_DECNET_ROUTER=y
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-# CONFIG_X25 is not set
-CONFIG_LAPB=m
-CONFIG_PHONET=m
-CONFIG_6LOWPAN=m
-# CONFIG_6LOWPAN_DEBUGFS is not set
-CONFIG_6LOWPAN_NHC=m
-CONFIG_6LOWPAN_NHC_DEST=m
-CONFIG_6LOWPAN_NHC_FRAGMENT=m
-CONFIG_6LOWPAN_NHC_HOP=m
-CONFIG_6LOWPAN_NHC_IPV6=m
-CONFIG_6LOWPAN_NHC_MOBILITY=m
-CONFIG_6LOWPAN_NHC_ROUTING=m
-CONFIG_6LOWPAN_NHC_UDP=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
-CONFIG_6LOWPAN_GHC_UDP=m
-CONFIG_6LOWPAN_GHC_ICMPV6=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
-CONFIG_IEEE802154=m
-# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
-CONFIG_IEEE802154_SOCKET=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_CBS=m
-CONFIG_NET_SCH_ETF=m
-CONFIG_NET_SCH_TAPRIO=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_SKBPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_CAKE=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_FQ_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-CONFIG_NET_SCH_ETS=m
-# CONFIG_NET_SCH_DEFAULT is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_MATCHALL=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_CANID=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_IPT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_SAMPLE=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-# CONFIG_NET_ACT_MPLS is not set
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_ACT_CTINFO is not set
-CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-# CONFIG_NET_ACT_CT is not set
-CONFIG_NET_ACT_GATE=m
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IFE_SKBTCINDEX=m
-# CONFIG_NET_TC_SKB_EXT is not set
-CONFIG_NET_SCH_FIFO=y
-CONFIG_DCB=y
-CONFIG_DNS_RESOLVER=m
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_BATMAN_V is not set
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-CONFIG_BATMAN_ADV_NC=y
-CONFIG_BATMAN_ADV_MCAST=y
-CONFIG_BATMAN_ADV_DEBUGFS=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_BATMAN_ADV_SYSFS=y
-# CONFIG_BATMAN_ADV_TRACING is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
-CONFIG_VSOCKETS_DIAG=m
-CONFIG_VSOCKETS_LOOPBACK=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-CONFIG_NETLINK_DIAG=m
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=y
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_NET_NSH=m
-# CONFIG_HSR is not set
-# CONFIG_NET_SWITCHDEV is not set
-CONFIG_NET_L3_MASTER_DEV=y
-CONFIG_QRTR=m
-CONFIG_QRTR_TUN=m
-CONFIG_QRTR_MHI=m
-# CONFIG_NET_NCSI is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-CONFIG_BPF_STREAM_PARSER=y
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_DROP_MONITOR=y
-# end of Network testing
-# end of Networking options
-
-CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
-CONFIG_AX25=m
-CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_MKISS=m
-CONFIG_6PACK=m
-CONFIG_BPQETHER=m
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_BAYCOM_EPP=m
-CONFIG_YAM=m
-# end of AX.25 network device drivers
-
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_GW=m
-# CONFIG_CAN_J1939 is not set
-
-#
-# CAN Device Drivers
-#
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_VXCAN=m
-CONFIG_CAN_SLCAN=m
-CONFIG_CAN_DEV=m
-CONFIG_CAN_CALC_BITTIMING=y
-# CONFIG_CAN_FLEXCAN is not set
-# CONFIG_CAN_GRCAN is not set
-# CONFIG_CAN_KVASER_PCIEFD is not set
-# CONFIG_CAN_C_CAN is not set
-# CONFIG_CAN_CC770 is not set
-# CONFIG_CAN_IFI_CANFD is not set
-# CONFIG_CAN_M_CAN is not set
-# CONFIG_CAN_MSCAN is not set
-CONFIG_CAN_PEAK_PCIEFD=m
-CONFIG_CAN_SJA1000=m
-CONFIG_CAN_EMS_PCI=m
-CONFIG_CAN_EMS_PCMCIA=m
-# CONFIG_CAN_F81601 is not set
-CONFIG_CAN_KVASER_PCI=m
-CONFIG_CAN_PEAK_PCI=m
-CONFIG_CAN_PEAK_PCIEC=y
-CONFIG_CAN_PEAK_PCMCIA=m
-CONFIG_CAN_PLX_PCI=m
-CONFIG_CAN_SJA1000_ISA=m
-# CONFIG_CAN_SJA1000_PLATFORM is not set
-CONFIG_CAN_SOFTING=m
-CONFIG_CAN_SOFTING_CS=m
-
-#
-# CAN SPI interfaces
-#
-# CONFIG_CAN_HI311X is not set
-# CONFIG_CAN_MCP251X is not set
-# end of CAN SPI interfaces
-
-#
-# CAN USB interfaces
-#
-CONFIG_CAN_8DEV_USB=m
-CONFIG_CAN_EMS_USB=m
-CONFIG_CAN_ESD_USB2=m
-CONFIG_CAN_GS_USB=m
-CONFIG_CAN_KVASER_USB=m
-CONFIG_CAN_MCBA_USB=m
-CONFIG_CAN_PEAK_USB=m
-CONFIG_CAN_UCAN=m
-# end of CAN USB interfaces
-
-# CONFIG_CAN_DEBUG_DEVICES is not set
-# end of CAN Device Drivers
-
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_LEDS is not set
-CONFIG_BT_MSFTEXT=y
-CONFIG_BT_DEBUGFS=y
-# CONFIG_BT_SELFTEST is not set
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
-CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_SERDEV=y
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_NOKIA=m
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
-# CONFIG_BT_HCIUART_INTEL is not set
-CONFIG_BT_HCIUART_BCM=y
-CONFIG_BT_HCIUART_RTL=y
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIUART_MRVL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_MTKSDIO=m
-CONFIG_BT_MTKUART=m
-CONFIG_BT_HCIRSI=m
-# end of Bluetooth device drivers
-
-CONFIG_AF_RXRPC=m
-CONFIG_AF_RXRPC_IPV6=y
-# CONFIG_AF_RXRPC_INJECT_LOSS is not set
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=y
-CONFIG_AF_KCM=m
-CONFIG_STREAM_PARSER=y
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
-CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
-CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_CFG80211_CRDA_SUPPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_GPIO=m
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_DEBUG is not set
-CONFIG_CAIF=m
-# CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_NETDEV=m
-# CONFIG_CAIF_USB is not set
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
-CONFIG_NFC=m
-CONFIG_NFC_DIGITAL=m
-# CONFIG_NFC_NCI is not set
-# CONFIG_NFC_HCI is not set
-
-#
-# Near Field Communication (NFC) devices
-#
-# CONFIG_NFC_TRF7970A is not set
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PORT100=m
-CONFIG_NFC_PN533=m
-CONFIG_NFC_PN533_USB=m
-# CONFIG_NFC_PN533_I2C is not set
-CONFIG_NFC_PN532_UART=m
-# CONFIG_NFC_ST95HF is not set
-# end of Near Field Communication (NFC) devices
-
-CONFIG_PSAMPLE=m
-CONFIG_NET_IFE=m
-CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_NET_SOCK_MSG=y
-CONFIG_NET_DEVLINK=y
-CONFIG_PAGE_POOL=y
-CONFIG_FAILOVER=m
-CONFIG_ETHTOOL_NETLINK=y
-CONFIG_HAVE_CBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_HAVE_PCI=y
-CONFIG_FORCE_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_SYSCALL=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCIEAER=y
-CONFIG_PCIEAER_INJECT=m
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEASPM=y
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-CONFIG_PCIE_DPC=y
-CONFIG_PCIE_PTM=y
-CONFIG_PCIE_BW=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_REALLOC_ENABLE_AUTO=y
-CONFIG_PCI_STUB=m
-CONFIG_PCI_PF_STUB=m
-CONFIG_PCI_ATS=y
-CONFIG_PCI_IOV=y
-# CONFIG_PCI_PRI is not set
-# CONFIG_PCI_PASID is not set
-# CONFIG_HOTPLUG_PCI is not set
-
-#
-# PCI controller drivers
-#
-# CONFIG_PCI_FTPCI100 is not set
-# CONFIG_PCI_HOST_GENERIC is not set
-# CONFIG_PCIE_XILINX is not set
-
-#
-# DesignWare PCI Core Support
-#
-# CONFIG_PCIE_DW_PLAT_HOST is not set
-# CONFIG_PCI_MESON is not set
-# end of DesignWare PCI Core Support
-
-#
-# Mobiveil PCIe Core Support
-#
-# end of Mobiveil PCIe Core Support
-
-#
-# Cadence PCIe controllers support
-#
-CONFIG_PCIE_CADENCE=y
-CONFIG_PCIE_CADENCE_HOST=y
-# CONFIG_PCIE_CADENCE_PLAT_HOST is not set
-CONFIG_PCI_J721E=y
-CONFIG_PCI_J721E_HOST=y
-# end of Cadence PCIe controllers support
-# end of PCI controller drivers
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-# end of PCI Endpoint
-
-#
-# PCI switch controller drivers
-#
-# CONFIG_PCI_SW_SWITCHTEC is not set
-# end of PCI switch controller drivers
-
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
-# CONFIG_RAPIDIO is not set
-
-#
-# Generic Driver Options
-#
-# CONFIG_UEVENT_HELPER is not set
-CONFIG_DEVTMPFS=y
-# CONFIG_DEVTMPFS_MOUNT is not set
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-CONFIG_FW_CACHE=y
-# end of Firmware loader
-
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_ALLOW_DEV_COREDUMP=y
-CONFIG_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_SPI=m
-CONFIG_REGMAP_IRQ=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-# CONFIG_MOXTET is not set
-# CONFIG_SIMPLE_PM_BUS is not set
-CONFIG_MHI_BUS=m
-# end of Bus devices
-
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_GNSS=m
-CONFIG_GNSS_SERIAL=m
-CONFIG_GNSS_MTK_SERIAL=m
-CONFIG_GNSS_SIRF_SERIAL=m
-CONFIG_GNSS_UBX_SERIAL=m
-# CONFIG_MTD is not set
-CONFIG_DTC=y
-CONFIG_OF=y
-# CONFIG_OF_UNITTEST is not set
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-CONFIG_OF_MDIO=m
-CONFIG_OF_RESERVED_MEM=y
-# CONFIG_OF_OVERLAY is not set
-CONFIG_OF_DMA_DEFAULT_COHERENT=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_AX88796 is not set
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_NULL_BLK=m
-CONFIG_BLK_DEV_FD=m
-CONFIG_MAC_FLOPPY=y
-CONFIG_CDROM=m
-# CONFIG_PARIDE is not set
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_DEV_UMEM=m
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_VIRTIO_BLK=m
-CONFIG_BLK_DEV_RBD=m
-# CONFIG_BLK_DEV_RSXX is not set
-
-#
-# NVME Support
-#
-CONFIG_NVME_CORE=m
-CONFIG_BLK_DEV_NVME=m
-CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_HWMON=y
-CONFIG_NVME_FABRICS=m
-CONFIG_NVME_FC=m
-CONFIG_NVME_TCP=m
-CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_PASSTHRU=y
-# CONFIG_NVME_TARGET_LOOP is not set
-CONFIG_NVME_TARGET_FC=m
-# CONFIG_NVME_TARGET_FCLOOP is not set
-CONFIG_NVME_TARGET_TCP=m
-# end of NVME Support
-
-#
-# Misc devices
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT_SPI=m
-# CONFIG_DUMMY_IRQ is not set
-CONFIG_PHANTOM=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-# CONFIG_LATTICE_ECP3_CONFIG is not set
-# CONFIG_SRAM is not set
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
-CONFIG_MISC_RTSX=m
-CONFIG_PVPANIC=m
-CONFIG_C2PORT=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_AT25=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-# CONFIG_EEPROM_93XX46 is not set
-# CONFIG_EEPROM_IDT_89HPESX is not set
-CONFIG_EEPROM_EE1004=m
-# end of EEPROM support
-
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-
-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_TI_ST is not set
-# end of Texas Instruments shared transport line discipline
-
-# CONFIG_SENSORS_LIS3_SPI is not set
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_ALTERA_STAPL=m
-
-#
-# Intel MIC & related support
-#
-CONFIG_VOP_BUS=m
-CONFIG_VOP=m
-# end of Intel MIC & related support
-
-# CONFIG_ECHO is not set
-CONFIG_MISC_ALCOR_PCI=m
-CONFIG_MISC_RTSX_PCI=m
-CONFIG_MISC_RTSX_USB=m
-CONFIG_HABANA_AI=m
-CONFIG_UACCE=m
-# end of Misc devices
-
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-# CONFIG_SCSI_PROC_FS is not set
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-# end of SCSI Transports
-
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-CONFIG_AIC7XXX_DEBUG_ENABLE=y
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-CONFIG_AIC79XX_DEBUG_ENABLE=y
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_MVSAS_TASKLET is not set
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ESAS2R=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-# CONFIG_MEGARAID_LEGACY is not set
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_SMARTPQI=m
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
-CONFIG_SCSI_UFS_BSG=y
-CONFIG_SCSI_UFS_CRYPTO=y
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_FLASHPOINT is not set
-CONFIG_SCSI_MYRB=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_SCSI_SNIC=m
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-CONFIG_SCSI_DMX3191D=m
-# CONFIG_SCSI_FDOMAIN_PCI is not set
-# CONFIG_SCSI_GDTH is not set
-CONFIG_SCSI_IPS=m
-# CONFIG_SCSI_INITIO is not set
-CONFIG_SCSI_INIA100=m
-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
-# CONFIG_TCM_QLA2XXX_DEBUG is not set
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_QEDI=m
-CONFIG_QEDF=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_NSP32=m
-CONFIG_SCSI_WD719X=m
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_MESH=m
-CONFIG_SCSI_MESH_SYNC_RATE=5
-CONFIG_SCSI_MESH_RESET_DELAY_MS=4000
-CONFIG_SCSI_MAC53C94=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-# CONFIG_PCMCIA_FDOMAIN is not set
-CONFIG_PCMCIA_NINJA_SCSI=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=y
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-# end of SCSI device support
-
-CONFIG_ATA=m
-CONFIG_SATA_HOST=y
-CONFIG_PATA_TIMINGS=y
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_FORCE=y
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=3
-# CONFIG_SATA_AHCI_PLATFORM is not set
-# CONFIG_AHCI_CEVA is not set
-# CONFIG_AHCI_QORIQ is not set
-# CONFIG_SATA_INIC162X is not set
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SX4=m
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-# CONFIG_SATA_DWC is not set
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-CONFIG_PATA_ARTOP=m
-# CONFIG_PATA_ATIIXP is not set
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MACIO=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPC52xx=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SCH=m
-# CONFIG_PATA_SERVERWORKS is not set
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-# CONFIG_PATA_TRIFLEX is not set
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-
-#
-# PIO-only SFF controllers
-#
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_MPIIX is not set
-CONFIG_PATA_NS87410=m
-# CONFIG_PATA_OPTI is not set
-CONFIG_PATA_PCMCIA=m
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_RZ1000 is not set
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_ATA_GENERIC=m
-# CONFIG_PATA_LEGACY is not set
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-# CONFIG_MD_CLUSTER is not set
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_UNSTRIPED=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_WRITECACHE=m
-CONFIG_DM_EBS=m
-CONFIG_DM_ERA=m
-# CONFIG_DM_CLONE is not set
-CONFIG_DM_MIRROR=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_MULTIPATH_HST=m
-CONFIG_DM_DELAY=m
-CONFIG_DM_DUST=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
-# CONFIG_DM_VERITY_FEC is not set
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_DM_INTEGRITY=m
-CONFIG_DM_ZONED=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_TCM_USER2=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_ISCSI_TARGET_CXGB4=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-# end of IEEE 1394 (FireWire) support
-
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_ADB=y
-CONFIG_ADB_CUDA=y
-CONFIG_ADB_PMU=y
-CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
-CONFIG_PMAC_APM_EMU=m
-CONFIG_PMAC_MEDIABAY=y
-CONFIG_PMAC_BACKLIGHT=y
-# CONFIG_PMAC_BACKLIGHT_LEGACY is not set
-CONFIG_ADB_MACIO=y
-CONFIG_INPUT_ADBHID=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_THERM_WINDTUNNEL=m
-CONFIG_THERM_ADT746X=m
-CONFIG_WINDFARM=m
-CONFIG_ANSLCD=m
-CONFIG_PMAC_RACKMETER=m
-CONFIG_SENSORS_AMS=m
-CONFIG_SENSORS_AMS_PMU=y
-CONFIG_SENSORS_AMS_I2C=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_WIREGUARD=m
-# CONFIG_WIREGUARD_DEBUG is not set
-CONFIG_EQUALIZER=m
-CONFIG_NET_FC=y
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
-CONFIG_IPVTAP=m
-CONFIG_VXLAN=m
-CONFIG_GENEVE=m
-CONFIG_BAREUDP=m
-CONFIG_GTP=m
-CONFIG_MACSEC=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_TUN=m
-CONFIG_TAP=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_NET_VRF=m
-CONFIG_VSOCKMON=m
-CONFIG_SUNGEM_PHY=m
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-# CONFIG_ARCNET_COM90xx is not set
-CONFIG_ARCNET_COM90xxIO=m
-# CONFIG_ARCNET_RIM_I is not set
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_ARCNET_COM20020_CS=m
-CONFIG_ATM_DRIVERS=y
-CONFIG_ATM_DUMMY=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-CONFIG_ATM_ZATM_DEBUG=y
-CONFIG_ATM_NICSTAR=m
-CONFIG_ATM_NICSTAR_USE_SUNI=y
-CONFIG_ATM_NICSTAR_USE_IDT77105=y
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-CONFIG_ATM_FORE200E_USE_TASKLET=y
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-# CONFIG_CAIF_DRIVERS is not set
-
-#
-# Distributed Switch Architecture drivers
-#
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_AGERE=y
-CONFIG_ET131X=m
-CONFIG_NET_VENDOR_ALACRITECH=y
-# CONFIG_SLICOSS is not set
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-# CONFIG_ALTERA_TSE is not set
-CONFIG_NET_VENDOR_AMAZON=y
-CONFIG_NET_VENDOR_AMD=y
-# CONFIG_AMD8111_ETH is not set
-CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_NET_VENDOR_APPLE=y
-CONFIG_MACE=m
-# CONFIG_MACE_AAUI_PORT is not set
-CONFIG_BMAC=m
-CONFIG_NET_VENDOR_AQUANTIA=y
-# CONFIG_NET_VENDOR_ARC is not set
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-# CONFIG_NET_VENDOR_AURORA is not set
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-# CONFIG_BCMGENET is not set
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_TIGON3=m
-CONFIG_TIGON3_HWMON=y
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-# CONFIG_SYSTEMPORT is not set
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_BNXT_FLOWER_OFFLOAD=y
-CONFIG_BNXT_DCB=y
-CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
-CONFIG_NET_VENDOR_CADENCE=y
-# CONFIG_MACB is not set
-CONFIG_NET_VENDOR_CAVIUM=y
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4_DCB=y
-CONFIG_CHELSIO_T4_FCOE=y
-CONFIG_CHELSIO_T4VF=m
-CONFIG_CHELSIO_LIB=m
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-CONFIG_NET_VENDOR_CORTINA=y
-# CONFIG_GEMINI_ETHERNET is not set
-# CONFIG_DNET is not set
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-CONFIG_TULIP_NAPI=y
-CONFIG_TULIP_NAPI_HW_MITIGATION=y
-# CONFIG_DE4X5 is not set
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-CONFIG_SUNDANCE_MMIO=y
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET_BE2=y
-CONFIG_BE2NET_BE3=y
-CONFIG_BE2NET_LANCER=y
-CONFIG_BE2NET_SKYHAWK=y
-CONFIG_NET_VENDOR_EZCHIP=y
-# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
-CONFIG_NET_VENDOR_FREESCALE=y
-CONFIG_FEC_MPC52xx=m
-CONFIG_FEC_MPC52xx_MDIO=y
-# CONFIG_FSL_PQ_MDIO is not set
-# CONFIG_FSL_XGMAC_MDIO is not set
-# CONFIG_UCC_GETH is not set
-# CONFIG_GIANFAR is not set
-CONFIG_FSL_ENETC=m
-CONFIG_FSL_ENETC_VF=m
-CONFIG_FSL_ENETC_MDIO=m
-CONFIG_FSL_ENETC_PTP_CLOCK=m
-# CONFIG_FSL_ENETC_QOS is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_GVE is not set
-CONFIG_NET_VENDOR_HUAWEI=y
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IGB=m
-CONFIG_IGB_HWMON=y
-CONFIG_IGBVF=m
-CONFIG_IXGB=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE_DCB=y
-CONFIG_IXGBE_IPSEC=y
-CONFIG_IXGBEVF=m
-CONFIG_IXGBEVF_IPSEC=y
-CONFIG_I40E=m
-CONFIG_I40E_DCB=y
-CONFIG_IAVF=m
-CONFIG_I40EVF=m
-CONFIG_ICE=m
-# CONFIG_FM10K is not set
-CONFIG_IGC=m
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_MV643XX_ETH=m
-CONFIG_MVMDIO=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_DCB=y
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX4_CORE_GEN2=y
-CONFIG_MLX5_CORE=m
-CONFIG_MLX5_ACCEL=y
-CONFIG_MLX5_FPGA=y
-CONFIG_MLX5_CORE_EN=y
-CONFIG_MLX5_EN_ARFS=y
-CONFIG_MLX5_EN_RXNFC=y
-CONFIG_MLX5_MPFS=y
-CONFIG_MLX5_CORE_EN_DCB=y
-CONFIG_MLX5_CORE_IPOIB=y
-# CONFIG_MLX5_FPGA_IPSEC is not set
-# CONFIG_MLX5_IPSEC is not set
-# CONFIG_MLXSW_CORE is not set
-CONFIG_MLXFW=m
-CONFIG_NET_VENDOR_MICREL=y
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851 is not set
-# CONFIG_KS8851_MLL is not set
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCX24J600 is not set
-CONFIG_LAN743X=m
-CONFIG_NET_VENDOR_MICROSEMI=y
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_NETERION=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_NETRONOME=y
-CONFIG_NFP=m
-# CONFIG_NFP_DEBUG is not set
-CONFIG_NET_VENDOR_NI=y
-# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
-CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_NET_VENDOR_NVIDIA=y
-# CONFIG_FORCEDETH is not set
-CONFIG_NET_VENDOR_OKI=y
-# CONFIG_ETHOC is not set
-CONFIG_NET_VENDOR_PACKET_ENGINES=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_PENSANDO=y
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLCNIC_DCB=y
-CONFIG_QLCNIC_HWMON=y
-CONFIG_NETXEN_NIC=m
-CONFIG_QED=m
-CONFIG_QED_LL2=y
-CONFIG_QED_SRIOV=y
-CONFIG_QEDE=m
-CONFIG_QED_ISCSI=y
-CONFIG_QED_FCOE=y
-CONFIG_QED_OOO=y
-CONFIG_NET_VENDOR_QUALCOMM=y
-# CONFIG_QCA7000_SPI is not set
-# CONFIG_QCA7000_UART is not set
-# CONFIG_QCOM_EMAC is not set
-# CONFIG_RMNET is not set
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_ROCKER=y
-CONFIG_NET_VENDOR_SAMSUNG=y
-# CONFIG_SXGBE_ETH is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-CONFIG_NET_VENDOR_SOLARFLARE=y
-CONFIG_SFC=m
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_SFC_MCDI_LOGGING=y
-CONFIG_SFC_FALCON=m
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-# CONFIG_SMSC911X is not set
-CONFIG_SMSC9420=m
-CONFIG_NET_VENDOR_SOCIONEXT=y
-CONFIG_NET_VENDOR_STMICRO=y
-# CONFIG_STMMAC_ETH is not set
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_SYNOPSYS=y
-# CONFIG_DWC_XLGMAC is not set
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-# CONFIG_TI_CPSW_PHY_SEL is not set
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-# CONFIG_WIZNET_W5100 is not set
-# CONFIG_WIZNET_W5300 is not set
-CONFIG_NET_VENDOR_XILINX=y
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_XILINX_AXI_EMAC is not set
-# CONFIG_XILINX_LL_TEMAC is not set
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-# CONFIG_DEFXX_MMIO is not set
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-# CONFIG_ROADRUNNER is not set
-CONFIG_MDIO_DEVICE=m
-CONFIG_MDIO_BUS=m
-CONFIG_MDIO_DEVRES=m
-# CONFIG_MDIO_BCM_UNIMAC is not set
-# CONFIG_MDIO_BITBANG is not set
-CONFIG_MDIO_BUS_MUX=m
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
-# CONFIG_MDIO_HISI_FEMAC is not set
-CONFIG_MDIO_IPQ4019=m
-# CONFIG_MDIO_MSCC_MIIM is not set
-CONFIG_MDIO_MVUSB=m
-CONFIG_MDIO_XPCS=m
-CONFIG_PHYLIB=m
-CONFIG_SWPHY=y
-CONFIG_LED_TRIGGER_PHY=y
-
-#
-# MII PHY device drivers
-#
-# CONFIG_ADIN_PHY is not set
-CONFIG_AMD_PHY=m
-CONFIG_AQUANTIA_PHY=m
-CONFIG_AX88796B_PHY=m
-# CONFIG_BCM7XXX_PHY is not set
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM54140_PHY=m
-CONFIG_BCM84881_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_CORTINA_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_DP83822_PHY=m
-CONFIG_DP83TC811_PHY=m
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_DP83869_PHY=m
-CONFIG_FIXED_PHY=m
-CONFIG_ICPLUS_PHY=m
-# CONFIG_INTEL_XWAY_PHY is not set
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_MARVELL_10G_PHY=m
-CONFIG_MICREL_PHY=m
-CONFIG_MICROCHIP_PHY=m
-CONFIG_MICROCHIP_T1_PHY=m
-CONFIG_MICROSEMI_PHY=m
-CONFIG_NATIONAL_PHY=m
-# CONFIG_NXP_TJA11XX_PHY is not set
-CONFIG_QSEMI_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_RENESAS_PHY=m
-CONFIG_ROCKCHIP_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_STE10XP=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_VITESSE_PHY=m
-# CONFIG_XILINX_GMII2RGMII is not set
-# CONFIG_MICREL_KS8995MA is not set
-# CONFIG_PLIP is not set
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#
-CONFIG_USB_NET_DRIVERS=m
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_USB_NET_CH9200=m
-CONFIG_USB_NET_AQC111=m
-CONFIG_WLAN=y
-# CONFIG_WIRELESS_WDS is not set
-CONFIG_WLAN_VENDOR_ADMTEK=y
-CONFIG_ADM8211=m
-CONFIG_ATH_COMMON=m
-CONFIG_WLAN_VENDOR_ATH=y
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-# CONFIG_ATH9K_AHB is not set
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DYNACK is not set
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH9K_RFKILL=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_PCI_NO_EEPROM=m
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-# CONFIG_ATH9K_HWRNG is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-# CONFIG_CARL9170_HWRNG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-# CONFIG_ATH6KL_DEBUG is not set
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-CONFIG_WIL6210_TRACING=y
-CONFIG_WIL6210_DEBUGFS=y
-CONFIG_ATH10K=m
-CONFIG_ATH10K_CE=y
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_SDIO is not set
-CONFIG_ATH10K_USB=m
-# CONFIG_ATH10K_DEBUG is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_TRACING is not set
-# CONFIG_WCN36XX is not set
-CONFIG_WLAN_VENDOR_ATMEL=y
-CONFIG_ATMEL=m
-# CONFIG_PCI_ATMEL is not set
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_WLAN_VENDOR_BROADCOM=y
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-# CONFIG_BRCMFMAC_SDIO is not set
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMFMAC_PCIE=y
-# CONFIG_BRCM_TRACING is not set
-# CONFIG_BRCMDBG is not set
-CONFIG_WLAN_VENDOR_CISCO=y
-CONFIG_AIRO=m
-CONFIG_AIRO_CS=m
-CONFIG_WLAN_VENDOR_INTEL=y
-# CONFIG_IPW2100 is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-
-#
-# iwl3945 / iwl4965 Debugging Options
-#
-# CONFIG_IWLEGACY_DEBUG is not set
-# end of iwl3945 / iwl4965 Debugging Options
-
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLDVM=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-# CONFIG_IWLWIFI_BCAST_FILTERING is not set
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
-# end of Debugging Options
-
-CONFIG_WLAN_VENDOR_INTERSIL=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_HERMES=m
-# CONFIG_HERMES_PRISM is not set
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_APPLE_AIRPORT=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-# CONFIG_P54_SPI is not set
-CONFIG_P54_LEDS=y
-# CONFIG_PRISM54 is not set
-CONFIG_WLAN_VENDOR_MARVELL=y
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_SPI is not set
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-# CONFIG_MWIFIEX_USB is not set
-CONFIG_MWL8K=m
-CONFIG_WLAN_VENDOR_MEDIATEK=y
-CONFIG_MT7601U=m
-CONFIG_MT76_CORE=m
-CONFIG_MT76_LEDS=y
-CONFIG_MT76_USB=m
-CONFIG_MT76_SDIO=m
-CONFIG_MT76x02_LIB=m
-CONFIG_MT76x02_USB=m
-CONFIG_MT76x0_COMMON=m
-CONFIG_MT76x0U=m
-CONFIG_MT76x0E=m
-CONFIG_MT76x2_COMMON=m
-CONFIG_MT76x2E=m
-CONFIG_MT76x2U=m
-CONFIG_MT7603E=m
-CONFIG_MT7615_COMMON=m
-CONFIG_MT7615E=m
-CONFIG_MT7663_USB_SDIO_COMMON=m
-CONFIG_MT7663U=m
-CONFIG_MT7663S=m
-CONFIG_MT7915E=m
-CONFIG_WLAN_VENDOR_MICROCHIP=y
-# CONFIG_WILC1000_SDIO is not set
-# CONFIG_WILC1000_SPI is not set
-CONFIG_WLAN_VENDOR_RALINK=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-# CONFIG_RT2800USB_UNKNOWN is not set
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WLAN_VENDOR_REALTEK=y
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8821AE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL8XXXU=m
-# CONFIG_RTL8XXXU_UNTESTED is not set
-CONFIG_RTW88=m
-CONFIG_RTW88_CORE=m
-CONFIG_RTW88_PCI=m
-CONFIG_RTW88_8822B=m
-CONFIG_RTW88_8822C=m
-CONFIG_RTW88_8723D=m
-CONFIG_RTW88_8821C=m
-CONFIG_RTW88_8822BE=m
-CONFIG_RTW88_8822CE=m
-CONFIG_RTW88_8723DE=m
-CONFIG_RTW88_8821CE=m
-# CONFIG_RTW88_DEBUG is not set
-# CONFIG_RTW88_DEBUGFS is not set
-CONFIG_WLAN_VENDOR_RSI=y
-CONFIG_RSI_91X=m
-CONFIG_RSI_DEBUGFS=y
-# CONFIG_RSI_SDIO is not set
-CONFIG_RSI_USB=m
-CONFIG_RSI_COEX=y
-CONFIG_WLAN_VENDOR_ST=y
-# CONFIG_CW1200 is not set
-# CONFIG_WLAN_VENDOR_TI is not set
-CONFIG_WLAN_VENDOR_ZYDAS=y
-CONFIG_USB_ZD1201=m
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_WLAN_VENDOR_QUANTENNA=y
-CONFIG_QTNFMAC=m
-CONFIG_QTNFMAC_PCIE=m
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_MAC80211_HWSIM=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_VIRT_WIFI=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-# end of WiMAX Wireless Broadband devices
-
-CONFIG_WAN=y
-CONFIG_LANMEDIA=m
-CONFIG_HDLC=m
-CONFIG_HDLC_RAW=m
-CONFIG_HDLC_RAW_ETH=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-# CONFIG_HDLC_X25 is not set
-CONFIG_PCI200SYN=m
-CONFIG_WANXL=m
-# CONFIG_PC300TOO is not set
-CONFIG_FARSYNC=m
-CONFIG_FSL_UCC_HDLC=m
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKELB=m
-CONFIG_IEEE802154_AT86RF230=m
-# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
-CONFIG_IEEE802154_MRF24J40=m
-CONFIG_IEEE802154_CC2520=m
-CONFIG_IEEE802154_ATUSB=m
-CONFIG_IEEE802154_ADF7242=m
-# CONFIG_IEEE802154_CA8210 is not set
-# CONFIG_IEEE802154_MCR20A is not set
-CONFIG_IEEE802154_HWSIM=m
-# CONFIG_VMXNET3 is not set
-CONFIG_USB4_NET=m
-# CONFIG_NETDEVSIM is not set
-CONFIG_NET_FAILOVER=m
-CONFIG_ISDN=y
-CONFIG_ISDN_CAPI=y
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-# CONFIG_MISDN_NETJET is not set
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-# CONFIG_NVM is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_LEDS=y
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_APMPOWER is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ADC is not set
-CONFIG_KEYBOARD_ADP5588=m
-# CONFIG_KEYBOARD_ADP5589 is not set
-CONFIG_KEYBOARD_ATKBD=m
-CONFIG_KEYBOARD_QT1050=m
-# CONFIG_KEYBOARD_QT1070 is not set
-CONFIG_KEYBOARD_QT2160=m
-# CONFIG_KEYBOARD_DLINK_DIR685 is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_GPIO_POLLED=m
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-CONFIG_KEYBOARD_MATRIX=m
-CONFIG_KEYBOARD_LM8323=m
-# CONFIG_KEYBOARD_LM8333 is not set
-CONFIG_KEYBOARD_MAX7359=m
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_OPENCORES=m
-# CONFIG_KEYBOARD_SAMSUNG is not set
-CONFIG_KEYBOARD_STOWAWAY=m
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
-# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_CAP11XX is not set
-# CONFIG_KEYBOARD_BCM is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_BYD=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
-CONFIG_MOUSE_PS2_CYPRESS=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_PS2_FOCALTECH=y
-CONFIG_MOUSE_PS2_SMBUS=y
-# CONFIG_MOUSE_SERIAL is not set
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=m
-CONFIG_JOYSTICK_IFORCE_232=m
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-# CONFIG_JOYSTICK_AS5011 is not set
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-CONFIG_JOYSTICK_PXRC=m
-CONFIG_JOYSTICK_FSIA6B=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_PEGASUS=m
-CONFIG_TABLET_SERIAL_WACOM4=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_PROPERTIES=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-# CONFIG_TOUCHSCREEN_ADC is not set
-# CONFIG_TOUCHSCREEN_AR1021_I2C is not set
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
-# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
-# CONFIG_TOUCHSCREEN_BU21013 is not set
-# CONFIG_TOUCHSCREEN_BU21029 is not set
-# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set
-CONFIG_TOUCHSCREEN_CY8CTMA140=m
-# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
-# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
-# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-# CONFIG_TOUCHSCREEN_EGALAX is not set
-# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
-# CONFIG_TOUCHSCREEN_EXC3000 is not set
-CONFIG_TOUCHSCREEN_FUJITSU=m
-# CONFIG_TOUCHSCREEN_GOODIX is not set
-# CONFIG_TOUCHSCREEN_HIDEEP is not set
-# CONFIG_TOUCHSCREEN_ILI210X is not set
-# CONFIG_TOUCHSCREEN_S6SY761 is not set
-CONFIG_TOUCHSCREEN_GUNZE=m
-# CONFIG_TOUCHSCREEN_EKTF2127 is not set
-# CONFIG_TOUCHSCREEN_ELAN is not set
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
-# CONFIG_TOUCHSCREEN_MAX11801 is not set
-CONFIG_TOUCHSCREEN_MCS5000=m
-# CONFIG_TOUCHSCREEN_MMS114 is not set
-# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
-CONFIG_TOUCHSCREEN_MTOUCH=m
-# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-# CONFIG_TOUCHSCREEN_PIXCIR is not set
-# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
-# CONFIG_TOUCHSCREEN_TSC2004 is not set
-# CONFIG_TOUCHSCREEN_TSC2005 is not set
-CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
-# CONFIG_TOUCHSCREEN_RM_TS is not set
-# CONFIG_TOUCHSCREEN_SILEAD is not set
-# CONFIG_TOUCHSCREEN_SIS_I2C is not set
-# CONFIG_TOUCHSCREEN_ST1232 is not set
-# CONFIG_TOUCHSCREEN_STMFTS is not set
-CONFIG_TOUCHSCREEN_SUR40=m
-# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
-# CONFIG_TOUCHSCREEN_SX8654 is not set
-CONFIG_TOUCHSCREEN_TPS6507X=m
-# CONFIG_TOUCHSCREEN_ZET6223 is not set
-# CONFIG_TOUCHSCREEN_ZFORCE is not set
-# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
-CONFIG_TOUCHSCREEN_IQS5XX=m
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_AD714X is not set
-# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BMA150 is not set
-# CONFIG_INPUT_E3X0_BUTTON is not set
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MAX77650_ONKEY=m
-# CONFIG_INPUT_MMA8450 is not set
-# CONFIG_INPUT_GPIO_BEEPER is not set
-# CONFIG_INPUT_GPIO_DECODER is not set
-# CONFIG_INPUT_GPIO_VIBRA is not set
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-# CONFIG_INPUT_KXTJ9 is not set
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_UINPUT=m
-# CONFIG_INPUT_PCF8574 is not set
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_INPUT_ADXL34X is not set
-# CONFIG_INPUT_IMS_PCU is not set
-CONFIG_INPUT_IQS269A=m
-# CONFIG_INPUT_CMA3000 is not set
-# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
-# CONFIG_INPUT_DRV260X_HAPTICS is not set
-# CONFIG_INPUT_DRV2665_HAPTICS is not set
-# CONFIG_INPUT_DRV2667_HAPTICS is not set
-CONFIG_INPUT_STPMIC1_ONKEY=m
-CONFIG_RMI4_CORE=m
-# CONFIG_RMI4_I2C is not set
-# CONFIG_RMI4_SPI is not set
-# CONFIG_RMI4_SMB is not set
-CONFIG_RMI4_F03=y
-CONFIG_RMI4_F03_SERIO=m
-CONFIG_RMI4_2D_SENSOR=y
-CONFIG_RMI4_F11=y
-CONFIG_RMI4_F12=y
-CONFIG_RMI4_F30=y
-CONFIG_RMI4_F34=y
-# CONFIG_RMI4_F54 is not set
-CONFIG_RMI4_F55=y
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=m
-CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-CONFIG_SERIO_I8042=m
-CONFIG_SERIO_SERPORT=m
-# CONFIG_SERIO_PARKBD is not set
-# CONFIG_SERIO_PCIPS2 is not set
-CONFIG_SERIO_LIBPS2=m
-CONFIG_SERIO_RAW=m
-# CONFIG_SERIO_XILINX_XPS_PS2 is not set
-CONFIG_SERIO_ALTERA_PS2=m
-# CONFIG_SERIO_PS2MULT is not set
-# CONFIG_SERIO_ARC_PS2 is not set
-# CONFIG_SERIO_APBPS2 is not set
-# CONFIG_SERIO_GPIO_PS2 is not set
-# CONFIG_USERIO is not set
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_LDISC_AUTOLOAD=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
-# CONFIG_SERIAL_8250_FINTEK is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_EXAR=m
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_FSL=y
-# CONFIG_SERIAL_8250_DW is not set
-# CONFIG_SERIAL_8250_RT288X is not set
-CONFIG_SERIAL_OF_PLATFORM=m
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_MAX310X is not set
-# CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_PMACZILOG=y
-# CONFIG_SERIAL_PMACZILOG_TTYS is not set
-CONFIG_SERIAL_PMACZILOG_CONSOLE=y
-CONFIG_SERIAL_MPC52xx=y
-CONFIG_SERIAL_MPC52xx_CONSOLE=y
-CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_SIFIVE=m
-CONFIG_SERIAL_QE=m
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_IFX6X60 is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
-# CONFIG_SERIAL_ARC is not set
-CONFIG_SERIAL_RP2=m
-CONFIG_SERIAL_RP2_NR_UARTS=32
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
-# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-# CONFIG_SERIAL_SPRD is not set
-# end of Serial drivers
-
-CONFIG_SERIAL_MCTRL_GPIO=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
-CONFIG_N_GSM=m
-CONFIG_NOZOMI=m
-CONFIG_NULL_TTY=m
-# CONFIG_TRACE_SINK is not set
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_RTAS=y
-# CONFIG_HVC_UDBG is not set
-CONFIG_SERIAL_DEV_BUS=y
-CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
-CONFIG_TTY_PRINTK=m
-CONFIG_TTY_PRINTK_LEVEL=6
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-# CONFIG_PPDEV is not set
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_PLAT_DATA=y
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_SSIF=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=m
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-CONFIG_HW_RANDOM_BA431=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_CCTRNG=m
-CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_SCR24X=m
-CONFIG_IPWIRELESS=m
-# end of PCMCIA character devices
-
-CONFIG_DEVMEM=y
-# CONFIG_DEVKMEM is not set
-CONFIG_NVRAM=y
-# CONFIG_RAW_DRIVER is not set
-CONFIG_DEVPORT=y
-# CONFIG_TCG_TPM is not set
-# CONFIG_XILLYBUS is not set
-# end of Character devices
-
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-# CONFIG_I2C_MUX_GPIO is not set
-# CONFIG_I2C_MUX_GPMUX is not set
-# CONFIG_I2C_MUX_LTC4306 is not set
-# CONFIG_I2C_MUX_PCA9541 is not set
-# CONFIG_I2C_MUX_PCA954x is not set
-# CONFIG_I2C_MUX_REG is not set
-# CONFIG_I2C_MUX_MLXCPLD is not set
-# end of Multiplexer I2C Chip support
-
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_I801 is not set
-CONFIG_I2C_ISCH=m
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_NFORCE2 is not set
-CONFIG_I2C_NVIDIA_GPU=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# Mac SMBus host controller drivers
-#
-CONFIG_I2C_HYDRA=m
-CONFIG_I2C_POWERMAC=y
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_CBUS_GPIO is not set
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_DESIGNWARE_PCI is not set
-# CONFIG_I2C_EMEV2 is not set
-# CONFIG_I2C_GPIO is not set
-CONFIG_I2C_MPC=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-# CONFIG_I2C_RK3X is not set
-CONFIG_I2C_SIMTEC=m
-# CONFIG_I2C_XILINX is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-# CONFIG_I2C_PARPORT is not set
-CONFIG_I2C_ROBOTFUZZ_OSIF=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIPERBOARD=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-# end of I2C Hardware Bus support
-
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_SLAVE is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-CONFIG_I3C=m
-CONFIG_CDNS_I3C_MASTER=m
-CONFIG_DW_I3C_MASTER=m
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-# CONFIG_SPI_MEM is not set
-
-#
-# SPI Master Controller Drivers
-#
-# CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_AXI_SPI_ENGINE is not set
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-# CONFIG_SPI_CADENCE is not set
-# CONFIG_SPI_DESIGNWARE is not set
-CONFIG_SPI_NXP_FLEXSPI=m
-# CONFIG_SPI_GPIO is not set
-CONFIG_SPI_LM70_LLP=m
-# CONFIG_SPI_MPC52xx is not set
-CONFIG_SPI_MPC52xx_PSC=m
-# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_OC_TINY is not set
-# CONFIG_SPI_PXA2XX is not set
-# CONFIG_SPI_ROCKCHIP is not set
-# CONFIG_SPI_SC18IS602 is not set
-CONFIG_SPI_SIFIVE=m
-CONFIG_SPI_MXIC=m
-# CONFIG_SPI_XCOMM is not set
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_ZYNQMP_GQSPI is not set
-CONFIG_SPI_AMD=m
-
-#
-# SPI Multiplexer support
-#
-CONFIG_SPI_MUX=m
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=y
-# CONFIG_SPI_LOOPBACK_TEST is not set
-# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_SPI_SLAVE is not set
-# CONFIG_SPMI is not set
-# CONFIG_HSI is not set
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
-# CONFIG_PPS_CLIENT_GPIO is not set
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_PTP_1588_CLOCK_QORIQ=m
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-# CONFIG_PTP_1588_CLOCK_IDT82P33 is not set
-CONFIG_PTP_1588_CLOCK_IDTCM=m
-# end of PTP clock support
-
-# CONFIG_PINCTRL is not set
-CONFIG_GPIOLIB=y
-CONFIG_GPIOLIB_FASTPATH_LIMIT=512
-CONFIG_OF_GPIO=y
-CONFIG_GPIOLIB_IRQCHIP=y
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_GPIO_SYSFS is not set
-CONFIG_GPIO_GENERIC=m
-
-#
-# Memory mapped GPIO drivers
-#
-# CONFIG_GPIO_74XX_MMIO is not set
-# CONFIG_GPIO_ALTERA is not set
-# CONFIG_GPIO_CADENCE is not set
-# CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_EXAR is not set
-# CONFIG_GPIO_FTGPIO010 is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_GRGPIO is not set
-CONFIG_GPIO_HLWD=m
-# CONFIG_GPIO_MB86S7X is not set
-CONFIG_GPIO_MPC5200=y
-# CONFIG_GPIO_SIFIVE is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GPIO_AMD_FCH is not set
-# end of Memory mapped GPIO drivers
-
-#
-# I2C GPIO expanders
-#
-# CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_ADNP is not set
-# CONFIG_GPIO_GW_PLD is not set
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
-CONFIG_GPIO_PCA9570=m
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_TPIC2810 is not set
-# end of I2C GPIO expanders
-
-#
-# MFD GPIO expanders
-#
-# CONFIG_GPIO_MAX77650 is not set
-# CONFIG_GPIO_TQMX86 is not set
-# end of MFD GPIO expanders
-
-#
-# PCI GPIO expanders
-#
-# CONFIG_GPIO_PCI_IDIO_16 is not set
-# CONFIG_GPIO_PCIE_IDIO_24 is not set
-# CONFIG_GPIO_RDC321X is not set
-# end of PCI GPIO expanders
-
-#
-# SPI GPIO expanders
-#
-# CONFIG_GPIO_74X164 is not set
-# CONFIG_GPIO_MAX3191X is not set
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_PISOSR is not set
-# CONFIG_GPIO_XRA1403 is not set
-# end of SPI GPIO expanders
-
-#
-# USB GPIO expanders
-#
-# CONFIG_GPIO_VIPERBOARD is not set
-# end of USB GPIO expanders
-
-CONFIG_GPIO_AGGREGATOR=m
-# CONFIG_GPIO_MOCKUP is not set
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-# CONFIG_W1_MASTER_MATROX is not set
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-# CONFIG_W1_MASTER_DS1WM is not set
-# CONFIG_W1_MASTER_GPIO is not set
-CONFIG_W1_MASTER_SGI=m
-# end of 1-wire Bus Masters
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2405=m
-CONFIG_W1_SLAVE_DS2408=m
-CONFIG_W1_SLAVE_DS2408_READBACK=y
-CONFIG_W1_SLAVE_DS2413=m
-CONFIG_W1_SLAVE_DS2406=m
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2805=m
-CONFIG_W1_SLAVE_DS2430=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-# CONFIG_W1_SLAVE_DS2433_CRC is not set
-CONFIG_W1_SLAVE_DS2438=m
-CONFIG_W1_SLAVE_DS250X=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_DS2781=m
-CONFIG_W1_SLAVE_DS28E04=m
-CONFIG_W1_SLAVE_DS28E17=m
-# end of 1-wire Slaves
-
-# CONFIG_POWER_AVS is not set
-# CONFIG_POWER_RESET is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_POWER_SUPPLY_HWMON=y
-# CONFIG_PDA_POWER is not set
-CONFIG_APM_POWER=m
-# CONFIG_GENERIC_ADC_BATTERY is not set
-# CONFIG_TEST_POWER is not set
-# CONFIG_CHARGER_ADP5061 is not set
-# CONFIG_BATTERY_CW2015 is not set
-CONFIG_BATTERY_DS2760=m
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_LEGO_EV3 is not set
-CONFIG_BATTERY_PMU=m
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_CHARGER_SBS is not set
-# CONFIG_MANAGER_SBS is not set
-CONFIG_BATTERY_BQ27XXX=m
-# CONFIG_BATTERY_BQ27XXX_I2C is not set
-CONFIG_BATTERY_BQ27XXX_HDQ=m
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_BATTERY_MAX1721X is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_GPIO is not set
-# CONFIG_CHARGER_LT3651 is not set
-# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
-CONFIG_CHARGER_MAX77650=m
-# CONFIG_CHARGER_BQ2415X is not set
-# CONFIG_CHARGER_BQ24257 is not set
-# CONFIG_CHARGER_BQ24735 is not set
-CONFIG_CHARGER_BQ2515X=m
-# CONFIG_CHARGER_BQ25890 is not set
-# CONFIG_CHARGER_SMB347 is not set
-# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_CHARGER_RT9455 is not set
-# CONFIG_CHARGER_BD99954 is not set
-CONFIG_HWMON=y
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-# CONFIG_SENSORS_AD7314 is not set
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM1177=m
-CONFIG_SENSORS_ADM9240=m
-# CONFIG_SENSORS_ADT7310 is not set
-# CONFIG_SENSORS_ADT7410 is not set
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_AS370=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_AXI_FAN_CONTROL=m
-CONFIG_SENSORS_ASPEED=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_CORSAIR_CPRO=m
-CONFIG_SENSORS_DRIVETEMP=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FTSTEUTATES=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_G760A=m
-# CONFIG_SENSORS_G762 is not set
-# CONFIG_SENSORS_GPIO_FAN is not set
-# CONFIG_SENSORS_HIH6130 is not set
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-# CONFIG_SENSORS_IIO_HWMON is not set
-CONFIG_SENSORS_JC42=m
-# CONFIG_SENSORS_POWR1220 is not set
-CONFIG_SENSORS_LINEAGE=m
-# CONFIG_SENSORS_LTC2945 is not set
-CONFIG_SENSORS_LTC2947=m
-CONFIG_SENSORS_LTC2947_I2C=m
-CONFIG_SENSORS_LTC2947_SPI=m
-# CONFIG_SENSORS_LTC2990 is not set
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-# CONFIG_SENSORS_LTC4222 is not set
-CONFIG_SENSORS_LTC4245=m
-# CONFIG_SENSORS_LTC4260 is not set
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX1111=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-# CONFIG_SENSORS_MAX197 is not set
-# CONFIG_SENSORS_MAX31722 is not set
-# CONFIG_SENSORS_MAX31730 is not set
-# CONFIG_SENSORS_MAX6621 is not set
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-# CONFIG_SENSORS_MAX6697 is not set
-# CONFIG_SENSORS_MAX31790 is not set
-# CONFIG_SENSORS_MCP3021 is not set
-# CONFIG_SENSORS_TC654 is not set
-CONFIG_SENSORS_ADCXX=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM70=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-# CONFIG_SENSORS_LM95234 is not set
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_NPCM7XX=m
-CONFIG_SENSORS_PCF8591=m
-# CONFIG_PMBUS is not set
-# CONFIG_SENSORS_SHT15 is not set
-CONFIG_SENSORS_SHT21=m
-# CONFIG_SENSORS_SHT3x is not set
-# CONFIG_SENSORS_SHTC1 is not set
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M192=m
-# CONFIG_SENSORS_STTS751 is not set
-CONFIG_SENSORS_SMM665=m
-# CONFIG_SENSORS_ADC128D818 is not set
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_AMC6821=m
-# CONFIG_SENSORS_INA209 is not set
-# CONFIG_SENSORS_INA2XX is not set
-# CONFIG_SENSORS_INA3221 is not set
-# CONFIG_SENSORS_TC74 is not set
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-# CONFIG_SENSORS_TMP103 is not set
-# CONFIG_SENSORS_TMP108 is not set
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_TMP513=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83773G=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_THERMAL=y
-CONFIG_THERMAL_NETLINK=y
-CONFIG_THERMAL_STATISTICS=y
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_OF=y
-# CONFIG_THERMAL_WRITABLE_TRIPS is not set
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-CONFIG_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-# CONFIG_THERMAL_GOV_BANG_BANG is not set
-# CONFIG_THERMAL_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
-CONFIG_CPU_THERMAL=y
-CONFIG_CPU_FREQ_THERMAL=y
-CONFIG_DEVFREQ_THERMAL=y
-# CONFIG_THERMAL_EMULATION is not set
-CONFIG_THERMAL_MMIO=m
-# CONFIG_GENERIC_ADC_THERMAL is not set
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
-CONFIG_WATCHDOG_OPEN_TIMEOUT=0
-CONFIG_WATCHDOG_SYSFS=y
-
-#
-# Watchdog Pretimeout Governors
-#
-CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
-CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
-CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=y
-CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=m
-CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP=y
-# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-# CONFIG_SOFT_WATCHDOG_PRETIMEOUT is not set
-# CONFIG_GPIO_WATCHDOG is not set
-# CONFIG_XILINX_WATCHDOG is not set
-# CONFIG_ZIIRAVE_WATCHDOG is not set
-# CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_DW_WATCHDOG is not set
-# CONFIG_MAX63XX_WATCHDOG is not set
-CONFIG_STPMIC1_WATCHDOG=m
-# CONFIG_ALIM7101_WDT is not set
-# CONFIG_I6300ESB_WDT is not set
-# CONFIG_MPC5200_WDT is not set
-# CONFIG_MEN_A21_WDT is not set
-CONFIG_WATCHDOG_RTAS=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-# CONFIG_SSB_DRIVER_GPIO is not set
-CONFIG_BCMA_POSSIBLE=y
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_HOST_SOC is not set
-CONFIG_BCMA_DRIVER_PCI=y
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-# CONFIG_BCMA_DRIVER_GPIO is not set
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=m
-# CONFIG_MFD_ACT8945A is not set
-# CONFIG_MFD_AS3711 is not set
-# CONFIG_MFD_AS3722 is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_MFD_ATMEL_HLCDC is not set
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_MADERA is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_DA9052_I2C is not set
-# CONFIG_MFD_DA9055 is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_GATEWORKS_GSC is not set
-# CONFIG_MFD_MC13XXX_SPI is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-CONFIG_MFD_MP2629=m
-# CONFIG_MFD_HI6421_PMIC is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_HTC_I2CPLD is not set
-# CONFIG_LPC_ICH is not set
-CONFIG_LPC_SCH=m
-# CONFIG_MFD_IQS62X is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77620 is not set
-CONFIG_MFD_MAX77650=m
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX77843 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_MAX8997 is not set
-# CONFIG_MFD_MAX8998 is not set
-# CONFIG_MFD_MT6360 is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_MENF21BMC is not set
-# CONFIG_EZX_PCAP is not set
-# CONFIG_MFD_CPCAP is not set
-CONFIG_MFD_VIPERBOARD=m
-# CONFIG_MFD_RETU is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_UCB1400_CORE is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_RC5T583 is not set
-# CONFIG_MFD_RK808 is not set
-# CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_SEC_CORE is not set
-# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_SKY81452 is not set
-# CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SYSCON is not set
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_LP8788 is not set
-# CONFIG_MFD_TI_LMU is not set
-# CONFIG_MFD_PALMAS is not set
-# CONFIG_TPS6105X is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TPS6507X is not set
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TPS65090 is not set
-# CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TI_LP87565 is not set
-# CONFIG_MFD_TPS65218 is not set
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_MFD_TPS65910 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-# CONFIG_MFD_TPS80031 is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_TWL6040_CORE is not set
-# CONFIG_MFD_WL1273_CORE is not set
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_TC3589X is not set
-CONFIG_MFD_TQMX86=m
-# CONFIG_MFD_VX855 is not set
-# CONFIG_MFD_LOCHNAGAR is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM831X_I2C is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MFD_ROHM_BD718XX is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
-# CONFIG_MFD_ROHM_BD71828 is not set
-CONFIG_MFD_STPMIC1=m
-CONFIG_MFD_STMFX=m
-# CONFIG_RAVE_SP_CORE is not set
-# end of Multifunction device drivers
-
-# CONFIG_REGULATOR is not set
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_LIRC=y
-CONFIG_RC_DECODERS=y
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_SHARP_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_XMP_DECODER=m
-CONFIG_IR_IMON_DECODER=m
-CONFIG_IR_RCMM_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-# CONFIG_IR_HIX5HD2 is not set
-CONFIG_IR_IMON=m
-CONFIG_IR_IMON_RAW=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_REDRAT3=m
-# CONFIG_IR_SPI is not set
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_IGORPLUGUSB=m
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-# CONFIG_IR_GPIO_CIR is not set
-# CONFIG_IR_GPIO_TX is not set
-# CONFIG_IR_SERIAL is not set
-# CONFIG_IR_SIR is not set
-CONFIG_RC_XBOX_DVD=m
-CONFIG_IR_TOY=m
-CONFIG_CEC_CORE=m
-# CONFIG_MEDIA_CEC_RC is not set
-CONFIG_MEDIA_CEC_SUPPORT=y
-CONFIG_CEC_CH7322=m
-CONFIG_USB_PULSE8_CEC=m
-CONFIG_USB_RAINSHADOW_CEC=m
-CONFIG_MEDIA_SUPPORT=m
-# CONFIG_MEDIA_SUPPORT_FILTER is not set
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-
-#
-# Media device types
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_PLATFORM_SUPPORT=y
-CONFIG_MEDIA_TEST_SUPPORT=y
-# end of Media device types
-
-#
-# Media core support
-#
-CONFIG_VIDEO_DEV=m
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_DVB_CORE=m
-# end of Media core support
-
-#
-# Video4Linux options
-#
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L2_I2C=y
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_FWNODE=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-# end of Video4Linux options
-
-#
-# Media controller options
-#
-CONFIG_MEDIA_CONTROLLER_DVB=y
-CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
-
-#
-# Please notice that the enabled Media controller Request API is EXPERIMENTAL
-#
-# end of Media controller options
-
-#
-# Digital TV options
-#
-# CONFIG_DVB_MMAP is not set
-CONFIG_DVB_NET=y
-CONFIG_DVB_MAX_ADAPTERS=16
-CONFIG_DVB_DYNAMIC_MINORS=y
-# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
-# CONFIG_DVB_ULE_DEBUG is not set
-# end of Digital TV options
-
-#
-# Media drivers
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_VIDEO_USBTV=m
-
-#
-# Analog TV USB devices
-#
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_LOADER=m
-CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-
-#
-# Analog/digital TV USB devices
-#
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_AU0828_RC=y
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-# CONFIG_VIDEO_TM6000 is not set
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_DIB3000MC=m
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-# CONFIG_DVB_USB_CXUSB_ANALOG is not set
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_USB_ZD1301=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-CONFIG_DVB_AS102=m
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-
-#
-# Software defined radio USB devices
-#
-CONFIG_USB_AIRSPY=m
-CONFIG_USB_HACKRF=m
-CONFIG_USB_MSI2500=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_TW5864=m
-CONFIG_VIDEO_TW68=m
-CONFIG_VIDEO_TW686X=m
-
-#
-# Media capture/analog TV support
-#
-CONFIG_VIDEO_IVTV=m
-# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
-CONFIG_VIDEO_IVTV_ALSA=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DT3155=m
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-# CONFIG_VIDEO_CX25821 is not set
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_ENABLE_VP3054=y
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_BT848=m
-CONFIG_DVB_BT8XX=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-# CONFIG_VIDEO_SAA7134_GO7007 is not set
-CONFIG_VIDEO_SAA7164=m
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-CONFIG_DVB_PT3=m
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_DDBRIDGE=m
-# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
-CONFIG_DVB_SMIPCIE=m
-CONFIG_DVB_NETUP_UNIDVB=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_TEA575X=m
-CONFIG_RADIO_SI470X=m
-CONFIG_USB_SI470X=m
-# CONFIG_I2C_SI470X is not set
-# CONFIG_RADIO_SI4713 is not set
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_SHARK=m
-CONFIG_RADIO_SHARK2=m
-CONFIG_USB_KEENE=m
-CONFIG_USB_RAREMONO=m
-CONFIG_USB_MA901=m
-# CONFIG_RADIO_TEA5764 is not set
-# CONFIG_RADIO_SAA7706H is not set
-# CONFIG_RADIO_TEF6862 is not set
-# CONFIG_RADIO_WL1273 is not set
-CONFIG_MEDIA_COMMON_OPTIONS=y
-
-#
-# common driver options
-#
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_V4L2=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-CONFIG_VIDEO_V4L2_TPG=m
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_CAFE_CCIC=m
-# CONFIG_VIDEO_CADENCE is not set
-CONFIG_VIDEO_ASPEED=m
-CONFIG_VIDEO_MUX=m
-CONFIG_VIDEO_XILINX=m
-CONFIG_VIDEO_XILINX_CSI2RXSS=m
-CONFIG_VIDEO_XILINX_TPG=m
-CONFIG_VIDEO_XILINX_VTC=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_DVB_PLATFORM_DRIVERS is not set
-# CONFIG_SDR_PLATFORM_DRIVERS is not set
-
-#
-# MMC/SDIO DVB adapters
-#
-CONFIG_SMS_SDIO_DRV=m
-CONFIG_V4L_TEST_DRIVERS=y
-CONFIG_VIDEO_VIMC=m
-CONFIG_VIDEO_VIVID=m
-CONFIG_VIDEO_VIVID_CEC=y
-CONFIG_VIDEO_VIVID_MAX_DEVS=64
-# CONFIG_VIDEO_VIM2M is not set
-# CONFIG_VIDEO_VICODEC is not set
-
-#
-# FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-# end of Media drivers
-
-#
-# Media ancillary drivers
-#
-CONFIG_MEDIA_ATTACH=y
-
-#
-# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
-#
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS3308=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-# CONFIG_VIDEO_TLV320AIC23B is not set
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-# end of Audio decoders, processors and mixers
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-# end of RDS decoders
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-# CONFIG_VIDEO_ADV7183 is not set
-CONFIG_VIDEO_ADV748X=m
-CONFIG_VIDEO_ADV7604=m
-# CONFIG_VIDEO_ADV7604_CEC is not set
-CONFIG_VIDEO_ADV7842=m
-# CONFIG_VIDEO_ADV7842_CEC is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_ML86V7667 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TC358743=m
-# CONFIG_VIDEO_TC358743_CEC is not set
-# CONFIG_VIDEO_TVP514X is not set
-CONFIG_VIDEO_TVP5150=m
-# CONFIG_VIDEO_TVP7002 is not set
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-# CONFIG_VIDEO_TW9910 is not set
-# CONFIG_VIDEO_VPX3220 is not set
-CONFIG_VIDEO_MAX9286=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-# end of Video decoders
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV7393 is not set
-# CONFIG_VIDEO_ADV7511 is not set
-# CONFIG_VIDEO_AD9389B is not set
-# CONFIG_VIDEO_AK881X is not set
-# CONFIG_VIDEO_THS8200 is not set
-# end of Video encoders
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-# end of Video improvement chips
-
-#
-# Audio/Video compression chips
-#
-CONFIG_VIDEO_SAA6752HS=m
-# end of Audio/Video compression chips
-
-#
-# SDR tuner chips
-#
-# CONFIG_SDR_MAX2175 is not set
-# end of SDR tuner chips
-
-#
-# Miscellaneous helper chips
-#
-# CONFIG_VIDEO_THS7303 is not set
-CONFIG_VIDEO_M52790=m
-# CONFIG_VIDEO_I2C is not set
-# CONFIG_VIDEO_ST_MIPID02 is not set
-# end of Miscellaneous helper chips
-
-#
-# Camera sensor devices
-#
-# CONFIG_VIDEO_HI556 is not set
-# CONFIG_VIDEO_IMX214 is not set
-# CONFIG_VIDEO_IMX219 is not set
-# CONFIG_VIDEO_IMX258 is not set
-# CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX290 is not set
-# CONFIG_VIDEO_IMX319 is not set
-# CONFIG_VIDEO_IMX355 is not set
-CONFIG_VIDEO_OV2640=m
-CONFIG_VIDEO_OV2659=m
-# CONFIG_VIDEO_OV2680 is not set
-# CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV5640 is not set
-# CONFIG_VIDEO_OV5645 is not set
-# CONFIG_VIDEO_OV5647 is not set
-# CONFIG_VIDEO_OV6650 is not set
-# CONFIG_VIDEO_OV5670 is not set
-# CONFIG_VIDEO_OV5675 is not set
-# CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV7251 is not set
-# CONFIG_VIDEO_OV772X is not set
-CONFIG_VIDEO_OV7640=m
-CONFIG_VIDEO_OV7670=m
-# CONFIG_VIDEO_OV7740 is not set
-# CONFIG_VIDEO_OV8856 is not set
-# CONFIG_VIDEO_OV9640 is not set
-# CONFIG_VIDEO_OV9650 is not set
-# CONFIG_VIDEO_OV13858 is not set
-# CONFIG_VIDEO_VS6624 is not set
-# CONFIG_VIDEO_MT9M001 is not set
-# CONFIG_VIDEO_MT9M032 is not set
-# CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9P031 is not set
-# CONFIG_VIDEO_MT9T001 is not set
-# CONFIG_VIDEO_MT9T112 is not set
-CONFIG_VIDEO_MT9V011=m
-# CONFIG_VIDEO_MT9V032 is not set
-# CONFIG_VIDEO_MT9V111 is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_M5MOLS is not set
-CONFIG_VIDEO_RDACM20=m
-# CONFIG_VIDEO_RJ54N1 is not set
-# CONFIG_VIDEO_S5K6AA is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_S5K4ECGX is not set
-# CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_SMIAPP is not set
-# CONFIG_VIDEO_ET8EK8 is not set
-# CONFIG_VIDEO_S5C73M3 is not set
-# end of Camera sensor devices
-
-#
-# Lens drivers
-#
-# CONFIG_VIDEO_AD5820 is not set
-# CONFIG_VIDEO_AK7375 is not set
-# CONFIG_VIDEO_DW9714 is not set
-CONFIG_VIDEO_DW9768=m
-# CONFIG_VIDEO_DW9807_VCM is not set
-# end of Lens drivers
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_LM3560 is not set
-# CONFIG_VIDEO_LM3646 is not set
-# end of Flash devices
-
-#
-# SPI helper chips
-#
-# CONFIG_VIDEO_GS1662 is not set
-# end of SPI helper chips
-
-#
-# Media SPI Adapters
-#
-# CONFIG_CXD2880_SPI_DRV is not set
-# end of Media SPI Adapters
-
-CONFIG_MEDIA_TUNER=m
-
-#
-# Customize TV tuners
-#
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA18250=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MSI001=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_M88RS6000T=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_MXL301RF=m
-CONFIG_MEDIA_TUNER_QM1D1C0042=m
-CONFIG_MEDIA_TUNER_QM1D1B0004=m
-# end of Customize TV tuners
-
-#
-# Customise DVB Frontends
-#
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV0910=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_STV6111=m
-CONFIG_DVB_MXL5XX=m
-CONFIG_DVB_M88DS3103=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_SI2165=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24117=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-# CONFIG_DVB_S5H1432 is not set
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-# CONFIG_DVB_DIB9000 is not set
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_CXD2841ER=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_RTL2832_SDR=m
-CONFIG_DVB_SI2168=m
-CONFIG_DVB_AS102_FE=m
-CONFIG_DVB_ZD1301_DEMOD=m
-CONFIG_DVB_GP8PSK_FE=m
-# CONFIG_DVB_CXD2880 is not set
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT3306A=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_TC90522=m
-# CONFIG_DVB_MN88443X is not set
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_LNBH25=m
-# CONFIG_DVB_LNBH29 is not set
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-# CONFIG_DVB_LGS8GL5 is not set
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_HORUS3A=m
-CONFIG_DVB_ASCOT2E=m
-CONFIG_DVB_HELENE=m
-
-#
-# Common Interface (EN50221) controller drivers
-#
-CONFIG_DVB_CXD2099=m
-CONFIG_DVB_SP2=m
-# end of Customise DVB Frontends
-
-#
-# Tools to develop new frontends
-#
-CONFIG_DVB_DUMMY_FE=m
-# end of Media ancillary drivers
-
-#
-# Graphics support
-#
-CONFIG_AGP=y
-CONFIG_AGP_UNINORTH=y
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_DRM=m
-CONFIG_DRM_MIPI_DBI=m
-CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
-CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-# CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_TTM=m
-CONFIG_DRM_VRAM_HELPER=m
-CONFIG_DRM_TTM_HELPER=m
-CONFIG_DRM_GEM_CMA_HELPER=y
-CONFIG_DRM_KMS_CMA_HELPER=y
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_VM=y
-CONFIG_DRM_SCHED=m
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM_I2C_NXP_TDA998X is not set
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# end of I2C encoder or helper chips
-
-#
-# ARM devices
-#
-CONFIG_DRM_KOMEDA=m
-# end of ARM devices
-
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_USERPTR=y
-# CONFIG_DRM_AMDGPU is not set
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-# CONFIG_NOUVEAU_DEBUG_MMU is not set
-# CONFIG_NOUVEAU_DEBUG_PUSH is not set
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_VGEM=m
-# CONFIG_DRM_VKMS is not set
-CONFIG_DRM_UDL=m
-# CONFIG_DRM_AST is not set
-# CONFIG_DRM_MGAG200 is not set
-# CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_LVDS is not set
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-# CONFIG_DRM_PANEL_LVDS is not set
-# CONFIG_DRM_PANEL_SIMPLE is not set
-# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
-# CONFIG_DRM_PANEL_LG_LB035Q02 is not set
-# CONFIG_DRM_PANEL_LG_LG4573 is not set
-# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
-CONFIG_DRM_PANEL_NOVATEK_NT39016=m
-# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
-# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
-# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
-# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
-# CONFIG_DRM_PANEL_TPO_TPG110 is not set
-# end of Display Panels
-
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-# CONFIG_DRM_CDNS_DSI is not set
-# CONFIG_DRM_CHRONTEL_CH7033 is not set
-CONFIG_DRM_DISPLAY_CONNECTOR=m
-# CONFIG_DRM_LVDS_CODEC is not set
-# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
-# CONFIG_DRM_NWL_MIPI_DSI is not set
-# CONFIG_DRM_NXP_PTN3460 is not set
-# CONFIG_DRM_PARADE_PS8622 is not set
-# CONFIG_DRM_PARADE_PS8640 is not set
-# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SII902X is not set
-# CONFIG_DRM_SII9234 is not set
-CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TOSHIBA_TC358764 is not set
-# CONFIG_DRM_TOSHIBA_TC358767 is not set
-# CONFIG_DRM_TOSHIBA_TC358768 is not set
-# CONFIG_DRM_TI_TFP410 is not set
-# CONFIG_DRM_TI_SN65DSI86 is not set
-# CONFIG_DRM_TI_TPD12S015 is not set
-# CONFIG_DRM_ANALOGIX_ANX6345 is not set
-# CONFIG_DRM_ANALOGIX_ANX78XX is not set
-# CONFIG_DRM_I2C_ADV7511 is not set
-# end of Display Interface Bridges
-
-CONFIG_DRM_ETNAVIV=m
-CONFIG_DRM_ETNAVIV_THERMAL=y
-# CONFIG_DRM_ARCPGU is not set
-# CONFIG_DRM_MXSFB is not set
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_GM12U320=m
-CONFIG_TINYDRM_HX8357D=m
-CONFIG_TINYDRM_ILI9225=m
-CONFIG_TINYDRM_ILI9341=m
-CONFIG_TINYDRM_ILI9486=m
-CONFIG_TINYDRM_MI0283QT=m
-CONFIG_TINYDRM_REPAPER=m
-CONFIG_TINYDRM_ST7586=m
-CONFIG_TINYDRM_ST7735R=m
-CONFIG_DRM_LEGACY=y
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_MGA=m
-# CONFIG_DRM_SIS is not set
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DDC=y
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_SVGALIB=m
-CONFIG_FB_MACMODES=y
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_CIRRUS=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-CONFIG_FB_OF=y
-CONFIG_FB_CONTROL=y
-CONFIG_FB_PLATINUM=y
-CONFIG_FB_VALKYRIE=y
-CONFIG_FB_CT65550=y
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_IMSTT=y
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_UVESA is not set
-# CONFIG_FB_OPENCORES is not set
-CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-CONFIG_FB_MATROX=y
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=y
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=y
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
-CONFIG_FB_S3_DDC=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=y
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=y
-# CONFIG_FB_3DFX_ACCEL is not set
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=y
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_ARK=m
-CONFIG_FB_PM3=m
-# CONFIG_FB_CARMINE is not set
-CONFIG_FB_SMSCUFX=m
-CONFIG_FB_UDL=m
-CONFIG_FB_IBM_GXT4500=m
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-# CONFIG_FB_MB862XX_LIME is not set
-CONFIG_FB_MB862XX_I2C=y
-# CONFIG_FB_SIMPLE is not set
-# CONFIG_FB_SSD1307 is not set
-# CONFIG_FB_SM712 is not set
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-# CONFIG_LCD_CLASS_DEVICE is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_QCOM_WLED=m
-# CONFIG_BACKLIGHT_ADP8860 is not set
-# CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_GPIO is not set
-# CONFIG_BACKLIGHT_LV5207LP is not set
-# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_ARCXCNN is not set
-CONFIG_BACKLIGHT_LED=m
-# end of Backlight & LCD device support
-
-CONFIG_VGASTATE=m
-CONFIG_VIDEOMODE_HELPERS=y
-CONFIG_HDMI=y
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
-# end of Console display driver support
-
-# CONFIG_LOGO is not set
-# end of Graphics support
-
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_SEQ_DEVICE=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_JACK_INPUT_DEV=y
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_PCM_TIMER=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_PROC_FS=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-# CONFIG_SND_SEQUENCER_OSS is not set
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_SEQ_MIDI_EVENT=m
-CONFIG_SND_SEQ_MIDI=m
-CONFIG_SND_SEQ_MIDI_EMUL=m
-CONFIG_SND_SEQ_VIRMIDI=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DUMMY is not set
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-# CONFIG_SND_MTPAV is not set
-CONFIG_SND_MTS64=m
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_MPU401 is not set
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-# CONFIG_SND_AW2 is not set
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-# CONFIG_SND_ES1968_INPUT is not set
-# CONFIG_SND_ES1968_RADIO is not set
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-# CONFIG_SND_MAESTRO3_INPUT is not set
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-
-#
-# HD-Audio
-#
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_GENERIC_LEDS=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
-# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
-# end of HD-Audio
-
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_COMPONENT=y
-CONFIG_SND_HDA_PREALLOC_SIZE=2048
-CONFIG_SND_INTEL_DSP_CONFIG=m
-CONFIG_SND_PPC=y
-CONFIG_SND_POWERMAC=m
-CONFIG_SND_POWERMAC_AUTO_DRC=y
-CONFIG_SND_AOA=m
-CONFIG_SND_AOA_FABRIC_LAYOUT=m
-CONFIG_SND_AOA_ONYX=m
-CONFIG_SND_AOA_TAS=m
-CONFIG_SND_AOA_TOONIE=m
-CONFIG_SND_AOA_SOUNDBUS=m
-CONFIG_SND_AOA_SOUNDBUS_I2S=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_DICE=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_BEBOB=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREFACE=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-# CONFIG_SND_SOC is not set
-CONFIG_SND_SYNTH_EMUX=m
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACCUTOUCH=m
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_APPLEIR=m
-CONFIG_HID_ASUS=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_BETOP_FF=m
-CONFIG_HID_BIGBEN_FF=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CORSAIR=m
-CONFIG_HID_COUGAR=m
-CONFIG_HID_MACALLY=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CMEDIA=m
-# CONFIG_HID_CP2112 is not set
-CONFIG_HID_CREATIVE_SB0540=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELAN=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_GEMBIRD=m
-# CONFIG_HID_GFRM is not set
-CONFIG_HID_GLORIOUS=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-# CONFIG_HID_GT683R is not set
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_VIEWSONIC=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_ITE=m
-CONFIG_HID_JABRA=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LED=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MALTRON=m
-CONFIG_HID_MAYFLASH=m
-CONFIG_HID_REDRAGON=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTI=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PLANTRONICS=m
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_RETRODE=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_SONY_FF=y
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEAM=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_UDRAW_PS3=m
-CONFIG_HID_U2FZERO=m
-CONFIG_HID_WACOM=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-CONFIG_HID_ALPS=m
-CONFIG_HID_MCP2221=m
-# end of Special HID drivers
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# end of USB HID Boot Protocol drivers
-# end of USB HID support
-
-#
-# I2C HID support
-#
-# CONFIG_I2C_HID is not set
-# end of I2C HID support
-# end of HID support
-
-CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_LED_TRIG=y
-# CONFIG_USB_ULPI_BUS is not set
-# CONFIG_USB_CONN_GPIO is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-CONFIG_USB_PCI=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-CONFIG_USB_DYNAMIC_MINORS=y
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_PRODUCTLIST is not set
-# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
-CONFIG_USB_LEDS_TRIGGER_USBPORT=m
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=m
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PCI_RENESAS=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=m
-# CONFIG_XPS_USB_HCD_XILINX is not set
-CONFIG_USB_EHCI_FSL=m
-CONFIG_USB_EHCI_HCD_PPC_OF=y
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_FOTG210_HCD is not set
-# CONFIG_USB_MAX3421_HCD is not set
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
-CONFIG_USB_OHCI_HCD_PPC_OF=y
-CONFIG_USB_OHCI_HCD_PCI=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_FHCI_HCD=m
-# CONFIG_FHCI_DEBUG is not set
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_SL811_CS=m
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_HCD_BCMA is not set
-# CONFIG_USB_HCD_SSB is not set
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_VHCI_HC_PORTS=15
-CONFIG_USBIP_VHCI_NR_HCS=8
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_USB_CDNS3=m
-CONFIG_USB_CDNS3_HOST=y
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_ISP1760 is not set
-
-#
-# USB port drivers
-#
-# CONFIG_USB_USS720 is not set
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_F8153X=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MXUPORT=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_UPD78F0730=m
-CONFIG_USB_SERIAL_DEBUG=m
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_APPLE_MFI_FASTCHARGE=m
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-CONFIG_USB_EHSET_TEST_FIXTURE=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_EZUSB_FX2=m
-# CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_USB_HSIC_USB3503 is not set
-# CONFIG_USB_HSIC_USB4604 is not set
-# CONFIG_USB_LINK_LAYER_TEST is not set
-CONFIG_USB_CHAOSKEY=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_ISP1301 is not set
-# end of USB Physical Layer drivers
-
-# CONFIG_USB_GADGET is not set
-# CONFIG_TYPEC is not set
-CONFIG_USB_ROLE_SWITCH=m
-CONFIG_MMC=m
-CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
-CONFIG_PWRSEQ_SIMPLE=m
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=256
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-# CONFIG_MMC_SDHCI_PLTFM is not set
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_ALCOR=m
-CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_SPI is not set
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-# CONFIG_MMC_USDHI6ROL0 is not set
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_CQHCI=m
-CONFIG_MMC_HSQ=m
-CONFIG_MMC_TOSHIBA_PCI=m
-# CONFIG_MMC_MTK is not set
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-# CONFIG_MS_BLOCK is not set
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_CLASS_FLASH is not set
-# CONFIG_LEDS_CLASS_MULTICOLOR is not set
-CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
-
-#
-# LED drivers
-#
-# CONFIG_LEDS_AN30259A is not set
-# CONFIG_LEDS_AW2013 is not set
-# CONFIG_LEDS_BCM6328 is not set
-# CONFIG_LEDS_BCM6358 is not set
-# CONFIG_LEDS_CR0014114 is not set
-# CONFIG_LEDS_EL15203000 is not set
-# CONFIG_LEDS_LM3530 is not set
-CONFIG_LEDS_LM3532=m
-# CONFIG_LEDS_LM3642 is not set
-# CONFIG_LEDS_LM3692X is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_GPIO is not set
-CONFIG_LEDS_LP3944=m
-# CONFIG_LEDS_LP3952 is not set
-CONFIG_LEDS_LP55XX_COMMON=m
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-# CONFIG_LEDS_LP5562 is not set
-# CONFIG_LEDS_LP8501 is not set
-# CONFIG_LEDS_LP8860 is not set
-CONFIG_LEDS_PCA955X=m
-# CONFIG_LEDS_PCA955X_GPIO is not set
-# CONFIG_LEDS_PCA963X is not set
-CONFIG_LEDS_DAC124S085=m
-CONFIG_LEDS_BD2802=m
-# CONFIG_LEDS_LT3593 is not set
-# CONFIG_LEDS_TCA6507 is not set
-# CONFIG_LEDS_TLC591XX is not set
-CONFIG_LEDS_MAX77650=m
-# CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_IS31FL319X is not set
-# CONFIG_LEDS_IS31FL32XX is not set
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-# CONFIG_LEDS_BLINKM is not set
-# CONFIG_LEDS_MLXREG is not set
-# CONFIG_LEDS_USER is not set
-# CONFIG_LEDS_SPI_BYTE is not set
-# CONFIG_LEDS_TI_LMU_COMMON is not set
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_DISK=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_CPU=y
-# CONFIG_LEDS_TRIGGER_ACTIVITY is not set
-# CONFIG_LEDS_TRIGGER_GPIO is not set
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_PANIC=y
-# CONFIG_LEDS_TRIGGER_NETDEV is not set
-CONFIG_LEDS_TRIGGER_PATTERN=m
-CONFIG_LEDS_TRIGGER_AUDIO=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-# end of Speakup console speech
-
-# CONFIG_INFINIBAND is not set
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-# CONFIG_EDAC is not set
-CONFIG_RTC_LIB=y
-CONFIG_RTC_MC146818_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_NVMEM=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-# CONFIG_RTC_DRV_TEST is not set
-
-#
-# I2C RTC drivers
-#
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
-CONFIG_RTC_DRV_ABEOZ9=m
-# CONFIG_RTC_DRV_ABX80X is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_ISL12022 is not set
-# CONFIG_RTC_DRV_ISL12026 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_PCF8523 is not set
-# CONFIG_RTC_DRV_PCF85063 is not set
-# CONFIG_RTC_DRV_PCF85363 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_RX8010 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_EM3027 is not set
-CONFIG_RTC_DRV_RV3028=m
-# CONFIG_RTC_DRV_RV8803 is not set
-CONFIG_RTC_DRV_SD3078=m
-
-#
-# SPI RTC drivers
-#
-# CONFIG_RTC_DRV_M41T93 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_DS1302 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1343 is not set
-# CONFIG_RTC_DRV_DS1347 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_MAX6916 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RX4581 is not set
-# CONFIG_RTC_DRV_RX6110 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_PCF2123 is not set
-# CONFIG_RTC_DRV_MCP795 is not set
-CONFIG_RTC_I2C_AND_SPI=y
-
-#
-# SPI and I2C RTC drivers
-#
-# CONFIG_RTC_DRV_DS3232 is not set
-# CONFIG_RTC_DRV_PCF2127 is not set
-# CONFIG_RTC_DRV_RV3029C2 is not set
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=m
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1685_FAMILY is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS2404 is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_ZYNQMP is not set
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_GENERIC=y
-CONFIG_RTC_DRV_CADENCE=m
-# CONFIG_RTC_DRV_FTRTC010 is not set
-# CONFIG_RTC_DRV_MPC5121 is not set
-# CONFIG_RTC_DRV_R7301 is not set
-
-#
-# HID Sensor RTC drivers
-#
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_OF=y
-# CONFIG_ALTERA_MSGDMA is not set
-# CONFIG_DW_AXI_DMAC is not set
-# CONFIG_FSL_EDMA is not set
-# CONFIG_INTEL_IDMA64 is not set
-# CONFIG_PLX_DMA is not set
-# CONFIG_XILINX_ZYNQMP_DPDMA is not set
-CONFIG_PPC_BESTCOMM=m
-CONFIG_PPC_BESTCOMM_ATA=m
-CONFIG_PPC_BESTCOMM_FEC=m
-# CONFIG_QCOM_HIDMA_MGMT is not set
-# CONFIG_QCOM_HIDMA is not set
-# CONFIG_DW_DMAC is not set
-# CONFIG_DW_DMAC_PCI is not set
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
-# CONFIG_SF_PDMA is not set
-
-#
-# DMA Clients
-#
-CONFIG_ASYNC_TX_DMA=y
-# CONFIG_DMATEST is not set
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
-CONFIG_UDMABUF=y
-# CONFIG_DMABUF_MOVE_NOTIFY is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-# CONFIG_DMABUF_HEAPS is not set
-# end of DMABUF options
-
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_PANEL is not set
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-# CONFIG_UIO_PDRV_GENIRQ is not set
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-# CONFIG_UIO_PRUSS is not set
-CONFIG_UIO_MF624=m
-# CONFIG_VFIO is not set
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-# CONFIG_VDPA is not set
-CONFIG_VHOST_IOTLB=m
-CONFIG_VHOST_RING=m
-CONFIG_VHOST=m
-CONFIG_VHOST_MENU=y
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_VSOCK=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-# end of Microsoft Hyper-V guest support
-
-# CONFIG_GREYBUS is not set
-CONFIG_STAGING=y
-# CONFIG_PRISM2_USB is not set
-# CONFIG_COMEDI is not set
-# CONFIG_RTL8192U is not set
-# CONFIG_RTLLIB is not set
-# CONFIG_RTL8723BS is not set
-CONFIG_R8712U=m
-CONFIG_R8188EU=m
-CONFIG_88EU_AP_MODE=y
-# CONFIG_RTS5208 is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-
-#
-# IIO staging drivers
-#
-
-#
-# Accelerometers
-#
-# CONFIG_ADIS16203 is not set
-# CONFIG_ADIS16240 is not set
-# end of Accelerometers
-
-#
-# Analog to digital converters
-#
-# CONFIG_AD7816 is not set
-# CONFIG_AD7280 is not set
-# end of Analog to digital converters
-
-#
-# Analog digital bi-direction converters
-#
-# CONFIG_ADT7316 is not set
-# end of Analog digital bi-direction converters
-
-#
-# Capacitance to digital converters
-#
-# CONFIG_AD7150 is not set
-# CONFIG_AD7746 is not set
-# end of Capacitance to digital converters
-
-#
-# Direct Digital Synthesis
-#
-# CONFIG_AD9832 is not set
-# CONFIG_AD9834 is not set
-# end of Direct Digital Synthesis
-
-#
-# Network Analyzer, Impedance Converters
-#
-# CONFIG_AD5933 is not set
-# end of Network Analyzer, Impedance Converters
-
-#
-# Active energy metering IC
-#
-# CONFIG_ADE7854 is not set
-# end of Active energy metering IC
-
-#
-# Resolver to digital converters
-#
-# CONFIG_AD2S1210 is not set
-# end of Resolver to digital converters
-# end of IIO staging drivers
-
-# CONFIG_FB_SM750 is not set
-# CONFIG_STAGING_MEDIA is not set
-
-#
-# Android
-#
-# end of Android
-
-# CONFIG_STAGING_BOARD is not set
-# CONFIG_LTE_GDM724X is not set
-# CONFIG_FIREWIRE_SERIAL is not set
-# CONFIG_GS_FPGABOOT is not set
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_FB_TFT is not set
-# CONFIG_KS7010 is not set
-# CONFIG_PI433 is not set
-
-#
-# Gasket devices
-#
-# end of Gasket devices
-
-# CONFIG_XIL_AXIS_FIFO is not set
-# CONFIG_FIELDBUS_DEV is not set
-# CONFIG_KPC2000 is not set
-CONFIG_QLGE=m
-CONFIG_WFX=m
-# CONFIG_GOLDFISH is not set
-CONFIG_HAVE_CLK=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-# CONFIG_CLK_HSDK is not set
-# CONFIG_COMMON_CLK_MAX9485 is not set
-# CONFIG_COMMON_CLK_SI5341 is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI514 is not set
-# CONFIG_COMMON_CLK_SI544 is not set
-# CONFIG_COMMON_CLK_SI570 is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CDCE925 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_VC5 is not set
-# CONFIG_COMMON_CLK_FIXED_MMIO is not set
-# CONFIG_HWSPINLOCK is not set
-
-#
-# Clock Source drivers
-#
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-# CONFIG_MICROCHIP_PIT64B is not set
-# end of Clock Source drivers
-
-# CONFIG_MAILBOX is not set
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-# end of Generic IOMMU Pagetable Support
-
-# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_OF_IOMMU=y
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-# CONFIG_RPMSG_VIRTIO is not set
-# end of Rpmsg drivers
-
-# CONFIG_SOUNDWIRE is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-CONFIG_QUICC_ENGINE=y
-CONFIG_UCC_SLOW=y
-CONFIG_UCC_FAST=y
-CONFIG_UCC=y
-CONFIG_QE_TDM=y
-CONFIG_QE_USB=y
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-# end of Qualcomm SoC drivers
-
-# CONFIG_SOC_TI is not set
-
-#
-# Xilinx SoC drivers
-#
-# CONFIG_XILINX_VCU is not set
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-CONFIG_PM_DEVFREQ=y
-
-#
-# DEVFREQ Governors
-#
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
-CONFIG_DEVFREQ_GOV_PERFORMANCE=m
-CONFIG_DEVFREQ_GOV_POWERSAVE=m
-CONFIG_DEVFREQ_GOV_USERSPACE=m
-CONFIG_DEVFREQ_GOV_PASSIVE=m
-
-#
-# DEVFREQ Drivers
-#
-CONFIG_PM_DEVFREQ_EVENT=y
-# CONFIG_EXTCON is not set
-CONFIG_MEMORY=y
-CONFIG_IIO=m
-CONFIG_IIO_BUFFER=y
-# CONFIG_IIO_BUFFER_CB is not set
-# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-# CONFIG_IIO_CONFIGFS is not set
-CONFIG_IIO_TRIGGER=y
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-# CONFIG_IIO_SW_DEVICE is not set
-# CONFIG_IIO_SW_TRIGGER is not set
-
-#
-# Accelerometers
-#
-# CONFIG_ADIS16201 is not set
-# CONFIG_ADIS16209 is not set
-# CONFIG_ADXL345_I2C is not set
-# CONFIG_ADXL345_SPI is not set
-CONFIG_ADXL372=m
-CONFIG_ADXL372_SPI=m
-CONFIG_ADXL372_I2C=m
-# CONFIG_BMA180 is not set
-# CONFIG_BMA220 is not set
-# CONFIG_BMA400 is not set
-# CONFIG_BMC150_ACCEL is not set
-# CONFIG_DA280 is not set
-# CONFIG_DA311 is not set
-# CONFIG_DMARD06 is not set
-# CONFIG_DMARD09 is not set
-# CONFIG_DMARD10 is not set
-CONFIG_HID_SENSOR_ACCEL_3D=m
-# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_KXSD9 is not set
-# CONFIG_KXCJK1013 is not set
-# CONFIG_MC3230 is not set
-# CONFIG_MMA7455_I2C is not set
-# CONFIG_MMA7455_SPI is not set
-# CONFIG_MMA7660 is not set
-# CONFIG_MMA8452 is not set
-# CONFIG_MMA9551 is not set
-# CONFIG_MMA9553 is not set
-# CONFIG_MXC4005 is not set
-# CONFIG_MXC6255 is not set
-# CONFIG_SCA3000 is not set
-# CONFIG_STK8312 is not set
-# CONFIG_STK8BA50 is not set
-# end of Accelerometers
-
-#
-# Analog to digital converters
-#
-CONFIG_AD_SIGMA_DELTA=m
-# CONFIG_AD7091R5 is not set
-CONFIG_AD7124=m
-# CONFIG_AD7192 is not set
-# CONFIG_AD7266 is not set
-# CONFIG_AD7291 is not set
-CONFIG_AD7292=m
-# CONFIG_AD7298 is not set
-# CONFIG_AD7476 is not set
-CONFIG_AD7606=m
-CONFIG_AD7606_IFACE_PARALLEL=m
-CONFIG_AD7606_IFACE_SPI=m
-# CONFIG_AD7766 is not set
-CONFIG_AD7768_1=m
-# CONFIG_AD7780 is not set
-# CONFIG_AD7791 is not set
-# CONFIG_AD7793 is not set
-# CONFIG_AD7887 is not set
-# CONFIG_AD7923 is not set
-CONFIG_AD7949=m
-# CONFIG_AD799X is not set
-# CONFIG_AD9467 is not set
-# CONFIG_ADI_AXI_ADC is not set
-# CONFIG_ENVELOPE_DETECTOR is not set
-# CONFIG_HI8435 is not set
-# CONFIG_HX711 is not set
-# CONFIG_INA2XX_ADC is not set
-# CONFIG_LTC2471 is not set
-# CONFIG_LTC2485 is not set
-# CONFIG_LTC2496 is not set
-# CONFIG_LTC2497 is not set
-# CONFIG_MAX1027 is not set
-# CONFIG_MAX11100 is not set
-# CONFIG_MAX1118 is not set
-# CONFIG_MAX1241 is not set
-# CONFIG_MAX1363 is not set
-# CONFIG_MAX9611 is not set
-# CONFIG_MCP320X is not set
-# CONFIG_MCP3422 is not set
-CONFIG_MCP3911=m
-# CONFIG_MP2629_ADC is not set
-# CONFIG_NAU7802 is not set
-# CONFIG_SD_ADC_MODULATOR is not set
-# CONFIG_TI_ADC081C is not set
-# CONFIG_TI_ADC0832 is not set
-# CONFIG_TI_ADC084S021 is not set
-# CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC108S102 is not set
-# CONFIG_TI_ADC128S052 is not set
-# CONFIG_TI_ADC161S626 is not set
-# CONFIG_TI_ADS1015 is not set
-# CONFIG_TI_ADS7950 is not set
-CONFIG_TI_ADS8344=m
-# CONFIG_TI_ADS8688 is not set
-CONFIG_TI_ADS124S08=m
-# CONFIG_TI_TLC4541 is not set
-# CONFIG_VF610_ADC is not set
-CONFIG_VIPERBOARD_ADC=m
-# CONFIG_XILINX_XADC is not set
-# end of Analog to digital converters
-
-#
-# Analog Front Ends
-#
-# CONFIG_IIO_RESCALE is not set
-# end of Analog Front Ends
-
-#
-# Amplifiers
-#
-# CONFIG_AD8366 is not set
-# CONFIG_HMC425 is not set
-# end of Amplifiers
-
-#
-# Chemical Sensors
-#
-# CONFIG_ATLAS_PH_SENSOR is not set
-# CONFIG_ATLAS_EZO_SENSOR is not set
-# CONFIG_BME680 is not set
-# CONFIG_CCS811 is not set
-# CONFIG_IAQCORE is not set
-CONFIG_PMS7003=m
-CONFIG_SCD30_CORE=m
-CONFIG_SCD30_I2C=m
-CONFIG_SCD30_SERIAL=m
-CONFIG_SENSIRION_SGP30=m
-CONFIG_SPS30=m
-# CONFIG_VZ89X is not set
-# end of Chemical Sensors
-
-#
-# Hid Sensor IIO Common
-#
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-# end of Hid Sensor IIO Common
-
-#
-# SSP Sensor Common
-#
-# CONFIG_IIO_SSP_SENSORHUB is not set
-# end of SSP Sensor Common
-
-#
-# Digital to analog converters
-#
-# CONFIG_AD5064 is not set
-# CONFIG_AD5360 is not set
-# CONFIG_AD5380 is not set
-# CONFIG_AD5421 is not set
-CONFIG_AD5446=m
-# CONFIG_AD5449 is not set
-# CONFIG_AD5592R is not set
-# CONFIG_AD5593R is not set
-# CONFIG_AD5504 is not set
-# CONFIG_AD5624R_SPI is not set
-# CONFIG_AD5686_SPI is not set
-# CONFIG_AD5696_I2C is not set
-# CONFIG_AD5755 is not set
-# CONFIG_AD5758 is not set
-# CONFIG_AD5761 is not set
-# CONFIG_AD5764 is not set
-# CONFIG_AD5770R is not set
-# CONFIG_AD5791 is not set
-# CONFIG_AD7303 is not set
-# CONFIG_AD8801 is not set
-# CONFIG_DPOT_DAC is not set
-# CONFIG_DS4424 is not set
-CONFIG_LTC1660=m
-# CONFIG_LTC2632 is not set
-# CONFIG_M62332 is not set
-# CONFIG_MAX517 is not set
-# CONFIG_MAX5821 is not set
-# CONFIG_MCP4725 is not set
-# CONFIG_MCP4922 is not set
-# CONFIG_TI_DAC082S085 is not set
-# CONFIG_TI_DAC5571 is not set
-CONFIG_TI_DAC7311=m
-# CONFIG_TI_DAC7612 is not set
-# CONFIG_VF610_DAC is not set
-# end of Digital to analog converters
-
-#
-# IIO dummy driver
-#
-# end of IIO dummy driver
-
-#
-# Frequency Synthesizers DDS/PLL
-#
-
-#
-# Clock Generator/Distribution
-#
-# CONFIG_AD9523 is not set
-# end of Clock Generator/Distribution
-
-#
-# Phase-Locked Loop (PLL) frequency synthesizers
-#
-# CONFIG_ADF4350 is not set
-# CONFIG_ADF4371 is not set
-# end of Phase-Locked Loop (PLL) frequency synthesizers
-# end of Frequency Synthesizers DDS/PLL
-
-#
-# Digital gyroscope sensors
-#
-# CONFIG_ADIS16080 is not set
-# CONFIG_ADIS16130 is not set
-# CONFIG_ADIS16136 is not set
-# CONFIG_ADIS16260 is not set
-# CONFIG_ADXRS450 is not set
-# CONFIG_BMG160 is not set
-CONFIG_FXAS21002C=m
-CONFIG_FXAS21002C_I2C=m
-CONFIG_FXAS21002C_SPI=m
-CONFIG_HID_SENSOR_GYRO_3D=m
-# CONFIG_MPU3050_I2C is not set
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_ITG3200 is not set
-# end of Digital gyroscope sensors
-
-#
-# Health Sensors
-#
-
-#
-# Heart Rate Monitors
-#
-# CONFIG_AFE4403 is not set
-# CONFIG_AFE4404 is not set
-# CONFIG_MAX30100 is not set
-# CONFIG_MAX30102 is not set
-# end of Heart Rate Monitors
-# end of Health Sensors
-
-#
-# Humidity sensors
-#
-# CONFIG_AM2315 is not set
-# CONFIG_DHT11 is not set
-# CONFIG_HDC100X is not set
-# CONFIG_HID_SENSOR_HUMIDITY is not set
-# CONFIG_HTS221 is not set
-# CONFIG_HTU21 is not set
-# CONFIG_SI7005 is not set
-# CONFIG_SI7020 is not set
-# end of Humidity sensors
-
-#
-# Inertial measurement units
-#
-# CONFIG_ADIS16400 is not set
-# CONFIG_ADIS16460 is not set
-# CONFIG_ADIS16475 is not set
-# CONFIG_ADIS16480 is not set
-# CONFIG_BMI160_I2C is not set
-# CONFIG_BMI160_SPI is not set
-# CONFIG_FXOS8700_I2C is not set
-# CONFIG_FXOS8700_SPI is not set
-# CONFIG_KMX61 is not set
-# CONFIG_INV_ICM42600_I2C is not set
-# CONFIG_INV_ICM42600_SPI is not set
-# CONFIG_INV_MPU6050_I2C is not set
-# CONFIG_INV_MPU6050_SPI is not set
-# CONFIG_IIO_ST_LSM6DSX is not set
-# end of Inertial measurement units
-
-#
-# Light sensors
-#
-# CONFIG_ADJD_S311 is not set
-# CONFIG_ADUX1020 is not set
-# CONFIG_AL3010 is not set
-# CONFIG_AL3320A is not set
-# CONFIG_APDS9300 is not set
-# CONFIG_APDS9960 is not set
-# CONFIG_BH1750 is not set
-CONFIG_BH1780=m
-# CONFIG_CM32181 is not set
-# CONFIG_CM3232 is not set
-# CONFIG_CM3323 is not set
-# CONFIG_CM3605 is not set
-# CONFIG_CM36651 is not set
-# CONFIG_GP2AP002 is not set
-# CONFIG_GP2AP020A00F is not set
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-# CONFIG_ISL29125 is not set
-CONFIG_HID_SENSOR_ALS=m
-CONFIG_HID_SENSOR_PROX=m
-# CONFIG_JSA1212 is not set
-# CONFIG_RPR0521 is not set
-# CONFIG_LTR501 is not set
-# CONFIG_LV0104CS is not set
-# CONFIG_MAX44000 is not set
-CONFIG_MAX44009=m
-CONFIG_NOA1305=m
-# CONFIG_OPT3001 is not set
-# CONFIG_PA12203001 is not set
-# CONFIG_SI1133 is not set
-# CONFIG_SI1145 is not set
-# CONFIG_STK3310 is not set
-# CONFIG_ST_UVIS25 is not set
-# CONFIG_TCS3414 is not set
-# CONFIG_TCS3472 is not set
-# CONFIG_SENSORS_TSL2563 is not set
-# CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
-# CONFIG_TSL4531 is not set
-# CONFIG_US5182D is not set
-# CONFIG_VCNL4000 is not set
-CONFIG_VCNL4035=m
-CONFIG_VEML6030=m
-# CONFIG_VEML6070 is not set
-# CONFIG_VL6180 is not set
-# CONFIG_ZOPT2201 is not set
-# end of Light sensors
-
-#
-# Magnetometer sensors
-#
-# CONFIG_AK8974 is not set
-# CONFIG_AK8975 is not set
-# CONFIG_AK09911 is not set
-# CONFIG_BMC150_MAGN_I2C is not set
-# CONFIG_BMC150_MAGN_SPI is not set
-# CONFIG_MAG3110 is not set
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-# CONFIG_MMC35240 is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_SENSORS_HMC5843_I2C is not set
-# CONFIG_SENSORS_HMC5843_SPI is not set
-CONFIG_SENSORS_RM3100=m
-CONFIG_SENSORS_RM3100_I2C=m
-CONFIG_SENSORS_RM3100_SPI=m
-# end of Magnetometer sensors
-
-#
-# Multiplexers
-#
-# CONFIG_IIO_MUX is not set
-# end of Multiplexers
-
-#
-# Inclinometer sensors
-#
-CONFIG_HID_SENSOR_INCLINOMETER_3D=m
-CONFIG_HID_SENSOR_DEVICE_ROTATION=m
-# end of Inclinometer sensors
-
-#
-# Triggers - standalone
-#
-# CONFIG_IIO_INTERRUPT_TRIGGER is not set
-# CONFIG_IIO_SYSFS_TRIGGER is not set
-# end of Triggers - standalone
-
-#
-# Linear and angular position sensors
-#
-# end of Linear and angular position sensors
-
-#
-# Digital potentiometers
-#
-# CONFIG_AD5272 is not set
-# CONFIG_DS1803 is not set
-CONFIG_MAX5432=m
-# CONFIG_MAX5481 is not set
-# CONFIG_MAX5487 is not set
-# CONFIG_MCP4018 is not set
-# CONFIG_MCP4131 is not set
-# CONFIG_MCP4531 is not set
-CONFIG_MCP41010=m
-# CONFIG_TPL0102 is not set
-# end of Digital potentiometers
-
-#
-# Digital potentiostats
-#
-# CONFIG_LMP91000 is not set
-# end of Digital potentiostats
-
-#
-# Pressure sensors
-#
-# CONFIG_ABP060MG is not set
-# CONFIG_BMP280 is not set
-# CONFIG_DLHL60D is not set
-# CONFIG_DPS310 is not set
-CONFIG_HID_SENSOR_PRESS=m
-# CONFIG_HP03 is not set
-# CONFIG_ICP10100 is not set
-# CONFIG_MPL115_I2C is not set
-# CONFIG_MPL115_SPI is not set
-# CONFIG_MPL3115 is not set
-# CONFIG_MS5611 is not set
-# CONFIG_MS5637 is not set
-# CONFIG_IIO_ST_PRESS is not set
-# CONFIG_T5403 is not set
-# CONFIG_HP206C is not set
-# CONFIG_ZPA2326 is not set
-# end of Pressure sensors
-
-#
-# Lightning sensors
-#
-# CONFIG_AS3935 is not set
-# end of Lightning sensors
-
-#
-# Proximity and distance sensors
-#
-# CONFIG_ISL29501 is not set
-# CONFIG_LIDAR_LITE_V2 is not set
-CONFIG_MB1232=m
-# CONFIG_PING is not set
-# CONFIG_RFD77402 is not set
-# CONFIG_SRF04 is not set
-# CONFIG_SX9310 is not set
-# CONFIG_SX9500 is not set
-# CONFIG_SRF08 is not set
-# CONFIG_VCNL3020 is not set
-CONFIG_VL53L0X_I2C=m
-# end of Proximity and distance sensors
-
-#
-# Resolver to digital converters
-#
-# CONFIG_AD2S90 is not set
-# CONFIG_AD2S1200 is not set
-# end of Resolver to digital converters
-
-#
-# Temperature sensors
-#
-CONFIG_LTC2983=m
-# CONFIG_MAXIM_THERMOCOUPLE is not set
-# CONFIG_HID_SENSOR_TEMP is not set
-# CONFIG_MLX90614 is not set
-# CONFIG_MLX90632 is not set
-# CONFIG_TMP006 is not set
-# CONFIG_TMP007 is not set
-# CONFIG_TSYS01 is not set
-# CONFIG_TSYS02D is not set
-CONFIG_MAX31856=m
-# end of Temperature sensors
-
-# CONFIG_NTB is not set
-# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
-
-#
-# IRQ chip support
-#
-CONFIG_IRQCHIP=y
-# CONFIG_AL_FIC is not set
-# end of IRQ chip support
-
-# CONFIG_IPACK_BUS is not set
-# CONFIG_RESET_CONTROLLER is not set
-
-#
-# PHY Subsystem
-#
-CONFIG_GENERIC_PHY=y
-CONFIG_GENERIC_PHY_MIPI_DPHY=y
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_CADENCE_TORRENT is not set
-CONFIG_PHY_CADENCE_DPHY=m
-# CONFIG_PHY_CADENCE_SALVO is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_CPCAP_USB is not set
-# CONFIG_PHY_MAPPHONE_MDM6600 is not set
-# end of PHY Subsystem
-
-# CONFIG_POWERCAP is not set
-# CONFIG_MCB is not set
-
-#
-# Performance monitor support
-#
-# end of Performance monitor support
-
-CONFIG_RAS=y
-CONFIG_USB4=m
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-# end of Android
-
-CONFIG_DAX=y
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-
-#
-# HW tracing support
-#
-# CONFIG_STM is not set
-# CONFIG_INTEL_TH is not set
-# end of HW tracing support
-
-# CONFIG_FPGA is not set
-# CONFIG_FSI is not set
-CONFIG_MULTIPLEXER=m
-
-#
-# Multiplexer drivers
-#
-CONFIG_MUX_ADG792A=m
-CONFIG_MUX_ADGS1408=m
-# CONFIG_MUX_GPIO is not set
-# CONFIG_MUX_MMIO is not set
-# end of Multiplexer drivers
-
-CONFIG_PM_OPP=y
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-CONFIG_INTERCONNECT=y
-# CONFIG_COUNTER is not set
-# CONFIG_MOST is not set
-# end of Device Drivers
-
-#
-# File systems
-#
-CONFIG_VALIDATE_FS_PARSER=y
-CONFIG_FS_IOMAP=y
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_USE_FOR_EXT2=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_FS_REF_VERIFY is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_F2FS_CHECK_FS=y
-# CONFIG_F2FS_IO_TRACE is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-CONFIG_F2FS_FS_COMPRESSION=y
-CONFIG_F2FS_FS_LZO=y
-CONFIG_F2FS_FS_LZ4=y
-CONFIG_F2FS_FS_ZSTD=y
-CONFIG_F2FS_FS_LZORLE=y
-CONFIG_ZONEFS_FS=m
-CONFIG_FS_DAX=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_EXPORTFS_BLOCK_OPS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_MANDATORY_FILE_LOCKING=y
-CONFIG_FS_ENCRYPTION=y
-CONFIG_FS_ENCRYPTION_ALGS=m
-CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_AUTOFS_FS=y
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_VIRTIO_FS=m
-CONFIG_OVERLAY_FS=m
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
-# CONFIG_OVERLAY_FS_INDEX is not set
-# CONFIG_OVERLAY_FS_METACOPY is not set
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/EXFAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_FAT_DEFAULT_UTF8=y
-CONFIG_EXFAT_FS=m
-CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
-# end of DOS/FAT/EXFAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_PROC_CHILDREN=y
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_CONFIGFS_FS=y
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_ORANGEFS_FS=m
-CONFIG_ADFS_FS=m
-# CONFIG_ADFS_FS_RW is not set
-# CONFIG_AFFS_FS is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_CRAMFS=m
-CONFIG_CRAMFS_BLOCKDEV=y
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_FILE_CACHE=y
-# CONFIG_SQUASHFS_FILE_DIRECT is not set
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_ZSTD=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-CONFIG_HPFS_FS=m
-# CONFIG_QNX4FS_FS is not set
-CONFIG_QNX6FS_FS=m
-# CONFIG_QNX6FS_DEBUG is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_PSTORE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=m
-# CONFIG_PSTORE_LZO_COMPRESS is not set
-# CONFIG_PSTORE_LZ4_COMPRESS is not set
-CONFIG_PSTORE_LZ4HC_COMPRESS=m
-# CONFIG_PSTORE_842_COMPRESS is not set
-CONFIG_PSTORE_ZSTD_COMPRESS=y
-CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
-# CONFIG_PSTORE_LZ4HC_COMPRESS_DEFAULT is not set
-# CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT is not set
-CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
-# CONFIG_SYSV_FS is not set
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-# CONFIG_EROFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-CONFIG_NFS_SWAP=y
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-CONFIG_NFS_V4_1_MIGRATION=y
-CONFIG_NFS_V4_SECURITY_LABEL=y
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFS_DISABLE_UDP_SUPPORT=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_BLOCKLAYOUT=y
-CONFIG_NFSD_SCSILAYOUT=y
-CONFIG_NFSD_FLEXFILELAYOUT=y
-CONFIG_NFSD_V4_2_INTER_SSC=y
-CONFIG_NFSD_V4_SECURITY_LABEL=y
-CONFIG_GRACE_PERIOD=m
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_SUNRPC_SWAP=y
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
-# CONFIG_SUNRPC_DEBUG is not set
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-# CONFIG_CEPH_FS_SECURITY_LABEL is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-CONFIG_CIFS_UPCALL=y
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_FSCACHE=y
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-CONFIG_AFS_FSCACHE=y
-# CONFIG_AFS_DEBUG_CURSOR is not set
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-CONFIG_9P_FS_SECURITY=y
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-CONFIG_UNICODE=y
-# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
-CONFIG_IO_WQ=y
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_KEYS_REQUEST_CACHE is not set
-# CONFIG_PERSISTENT_KEYRINGS is not set
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_KEY_DH_OPERATIONS=y
-CONFIG_KEY_NOTIFICATIONS=y
-CONFIG_SECURITY_DMESG_RESTRICT=y
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=32768
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_HARDENED_USERCOPY_FALLBACK=y
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-CONFIG_FORTIFY_SOURCE=y
-# CONFIG_STATIC_USERMODEHELPER is not set
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-# CONFIG_SECURITY_SELINUX_DISABLE is not set
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
-CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
-CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_HASH=y
-CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
-# CONFIG_SECURITY_APPARMOR_DEBUG is not set
-# CONFIG_SECURITY_LOADPIN is not set
-CONFIG_SECURITY_YAMA=y
-# CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-CONFIG_INTEGRITY=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_AUDIT=y
-# CONFIG_IMA is not set
-# CONFIG_EVM is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-CONFIG_DEFAULT_SECURITY_APPARMOR=y
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_SKCIPHER=y
-CONFIG_CRYPTO_SKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
-# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_NULL2=y
-# CONFIG_CRYPTO_PCRYPT is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ENGINE=m
-
-#
-# Public-key cryptography
-#
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECC=m
-CONFIG_CRYPTO_ECDH=m
-CONFIG_CRYPTO_ECRDSA=m
-CONFIG_CRYPTO_CURVE25519=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_AEGIS128 is not set
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-# CONFIG_CRYPTO_CFB is not set
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_OFB=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=y
-# CONFIG_CRYPTO_KEYWRAP is not set
-CONFIG_CRYPTO_NHPOLY1305=m
-CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_ESSIV=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_XXHASH=m
-CONFIG_CRYPTO_BLAKE2B=m
-CONFIG_CRYPTO_BLAKE2S=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_MD5_PPC is not set
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_PPC=m
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA3=m
-# CONFIG_CRYPTO_SM3 is not set
-CONFIG_CRYPTO_STREEBOG=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-# CONFIG_CRYPTO_SM4 is not set
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_842 is not set
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-CONFIG_CRYPTO_ZSTD=y
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=m
-CONFIG_CRYPTO_DRBG_HMAC=y
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=m
-CONFIG_CRYPTO_JITTERENTROPY=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
-CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_HIFN_795X=m
-CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
-CONFIG_CRYPTO_DEV_CHELSIO=m
-# CONFIG_CHELSIO_IPSEC_INLINE is not set
-CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DEV_SAFEXCEL=m
-# CONFIG_CRYPTO_DEV_CCREE is not set
-CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
-# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set
-CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-CONFIG_X509_CERTIFICATE_PARSER=y
-CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
-CONFIG_PKCS7_MESSAGE_PARSER=y
-# CONFIG_PKCS7_TEST_KEY is not set
-# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
-
-#
-# Certificates for signature checking
-#
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
-# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# end of Certificates for signature checking
-
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_RAID6_PQ_BENCHMARK=y
-# CONFIG_PACKING is not set
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_CORDIC=m
-CONFIG_PRIME_NUMBERS=m
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=m
-# CONFIG_CRC4 is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_XXHASH=y
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=y
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMPRESS=y
-CONFIG_ZSTD_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-# CONFIG_XZ_DEC_X86 is not set
-CONFIG_XZ_DEC_POWERPC=y
-# CONFIG_XZ_DEC_IA64 is not set
-# CONFIG_XZ_DEC_ARM is not set
-# CONFIG_XZ_DEC_ARMTHUMB is not set
-# CONFIG_XZ_DEC_SPARC is not set
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_DECOMPRESS_ZSTD=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_INTERVAL_TREE=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_DMA_OPS=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_DMA_DECLARE_COHERENT=y
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_GENERIC_ATOMIC64=y
-CONFIG_LRU_CACHE=m
-CONFIG_CLZ_TAB=y
-CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
-CONFIG_LIBFDT=y
-CONFIG_OID_REGISTRY=y
-CONFIG_FONT_SUPPORT=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-CONFIG_SG_POOL=y
-CONFIG_ARCH_HAS_PMEM_API=y
-CONFIG_ARCH_HAS_MEMREMAP_COMPAT_ALIGN=y
-CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
-CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-CONFIG_PLDMFW=y
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=4
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DYNAMIC_DEBUG_CORE=y
-CONFIG_SYMBOLIC_ERRNAME=y
-CONFIG_DEBUG_BUGVERBOSE=y
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_DEBUG_INFO_COMPRESSED is not set
-# CONFIG_DEBUG_INFO_SPLIT is not set
-# CONFIG_DEBUG_INFO_DWARF4 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
-# CONFIG_GDB_SCRIPTS is not set
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=1024
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_READABLE_ASM is not set
-# CONFIG_HEADERS_INSTALL is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# end of Compile-time checks and compiler options
-
-#
-# Generic Kernel Debugging Instruments
-#
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
-CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_FS_ALLOW_ALL=y
-# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
-# CONFIG_DEBUG_FS_ALLOW_NONE is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_UBSAN is not set
-# end of Generic Kernel Debugging Instruments
-
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-CONFIG_PAGE_EXTENSION=y
-# CONFIG_PAGE_OWNER is not set
-CONFIG_PAGE_POISONING=y
-CONFIG_PAGE_POISONING_NO_SANITY=y
-# CONFIG_PAGE_POISONING_ZERO is not set
-# CONFIG_DEBUG_PAGE_REF is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-CONFIG_SCHED_STACK_END_CHECK=y
-# CONFIG_DEBUG_VM is not set
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_HAVE_ARCH_KASAN=y
-CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
-CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
-# CONFIG_KASAN is not set
-# end of Memory Debugging
-
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Oops, Lockups and Hangs
-#
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_SOFTLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-# CONFIG_WQ_WATCHDOG is not set
-# CONFIG_TEST_LOCKUP is not set
-# end of Debug Oops, Lockups and Hangs
-
-#
-# Scheduler Debugging
-#
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-CONFIG_SCHEDSTATS=y
-# end of Scheduler Debugging
-
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-CONFIG_STACKTRACE=y
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-
-#
-# Debug kernel data structures
-#
-CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-CONFIG_BUG_ON_DATA_CORRUPTION=y
-# end of Debug kernel data structures
-
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-CONFIG_TORTURE_TEST=m
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_REF_SCALE_TEST=m
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACER_MAX_TRACE=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_BOOTTIME_TRACING is not set
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_DYNAMIC_FTRACE=y
-# CONFIG_FUNCTION_PROFILER is not set
-CONFIG_STACK_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_TRACER_SNAPSHOT=y
-# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_KPROBE_EVENTS=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-# CONFIG_BPF_KPROBE_OVERRIDE is not set
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_SYNTH_EVENTS is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACE_EVENT_INJECT is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-CONFIG_KPROBE_EVENT_GEN_TEST=m
-# CONFIG_SAMPLES is not set
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_IO_STRICT_DEVMEM=y
-
-#
-# powerpc Debugging
-#
-CONFIG_PPC_DISABLE_WERROR=y
-CONFIG_PRINT_STACK_DEPTH=64
-# CONFIG_PPC_EMULATED_STATS is not set
-# CONFIG_CODE_PATCHING_SELFTEST is not set
-CONFIG_JUMP_LABEL_FEATURE_CHECKS=y
-# CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG is not set
-# CONFIG_FTR_FIXUP_SELFTEST is not set
-# CONFIG_MSI_BITMAP_SELFTEST is not set
-# CONFIG_PPC_IRQ_SOFT_MASK_DEBUG is not set
-CONFIG_XMON=y
-# CONFIG_XMON_DEFAULT is not set
-CONFIG_XMON_DISASSEMBLY=y
-CONFIG_XMON_DEFAULT_RO_MODE=y
-CONFIG_DEBUGGER=y
-# CONFIG_BDI_SWITCH is not set
-CONFIG_BOOTX_TEXT=y
-# CONFIG_PPC_EARLY_DEBUG is not set
-# CONFIG_PPC_PTDUMP is not set
-# end of powerpc Debugging
-
-#
-# Kernel Testing and Coverage
-#
-# CONFIG_KUNIT is not set
-CONFIG_NOTIFIER_ERROR_INJECTION=m
-CONFIG_PM_NOTIFIER_ERROR_INJECT=m
-# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
-CONFIG_FUNCTION_ERROR_INJECTION=y
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_ARCH_HAS_KCOV=y
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
-CONFIG_RUNTIME_TESTING_MENU=y
-# CONFIG_LKDTM is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_TEST_MIN_HEAP is not set
-# CONFIG_TEST_SORT is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_REED_SOLOMON_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_PERCPU_TEST is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-# CONFIG_ASYNC_RAID6_TEST is not set
-# CONFIG_TEST_HEXDUMP is not set
-# CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_STRSCPY is not set
-# CONFIG_TEST_KSTRTOX is not set
-# CONFIG_TEST_PRINTF is not set
-# CONFIG_TEST_BITMAP is not set
-# CONFIG_TEST_BITFIELD is not set
-# CONFIG_TEST_UUID is not set
-# CONFIG_TEST_XARRAY is not set
-# CONFIG_TEST_OVERFLOW is not set
-# CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_HASH is not set
-# CONFIG_TEST_IDA is not set
-# CONFIG_TEST_LKM is not set
-# CONFIG_TEST_BITOPS is not set
-# CONFIG_TEST_VMALLOC is not set
-CONFIG_TEST_USER_COPY=m
-CONFIG_TEST_BPF=m
-# CONFIG_TEST_BLACKHOLE_DEV is not set
-# CONFIG_FIND_BIT_BENCHMARK is not set
-CONFIG_TEST_FIRMWARE=m
-# CONFIG_TEST_SYSCTL is not set
-# CONFIG_TEST_UDELAY is not set
-CONFIG_TEST_STATIC_KEYS=m
-# CONFIG_TEST_KMOD is not set
-# CONFIG_TEST_MEMCAT_P is not set
-# CONFIG_TEST_STACKINIT is not set
-# CONFIG_TEST_MEMINIT is not set
-# CONFIG_TEST_FREE_PAGES is not set
-# CONFIG_MEMTEST is not set
-# end of Kernel Testing and Coverage
-# end of Kernel hacking
diff --git a/srcpkgs/linux5.9/files/ppc64-dotconfig b/srcpkgs/linux5.9/files/ppc64-dotconfig
deleted file mode 100644
index 374f30b0cef9..000000000000
--- a/srcpkgs/linux5.9/files/ppc64-dotconfig
+++ /dev/null
@@ -1,9946 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.9.12 Kernel Configuration
-#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 9.3.0"
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=234000000
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_TABLE_SORT=y
-CONFIG_THREAD_INFO_IN_TASK=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_1"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT=""
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_XZ is not set
-CONFIG_DEFAULT_INIT=""
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_WATCH_QUEUE=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-# CONFIG_USELIB is not set
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_GENERIC_IRQ_INJECTION=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_IRQ_EDGE_EOI_HANDLER=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_SIM=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
-# end of IRQ subsystem
-
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_ARCH_HAS_TICK_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
-# CONFIG_NO_HZ is not set
-CONFIG_HIGH_RES_TIMERS=y
-# end of Timers subsystem
-
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-CONFIG_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_SCHED_AVG_IRQ=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_PSI=y
-CONFIG_PSI_DEFAULT_DISABLED=y
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
-CONFIG_TASKS_TRACE_RCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-CONFIG_BUILD_BIN2C=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKHEADERS=m
-CONFIG_LOG_BUF_SHIFT=19
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-
-#
-# Scheduler features
-#
-# CONFIG_UCLAMP_TASK is not set
-# end of Scheduler features
-
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_CC_HAS_INT128=y
-CONFIG_NUMA_BALANCING=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_CGROUPS=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_RDMA=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_HUGETLB=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_RD_ZSTD=y
-CONFIG_BOOT_CONFIG=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
-# CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set
-CONFIG_SYSCTL=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_MULTIUSER=y
-CONFIG_SGETMASK_SYSCALL=y
-CONFIG_SYSFS_SYSCALL=y
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_LSM=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
-CONFIG_BPF_JIT_DEFAULT_ON=y
-CONFIG_USERFAULTFD=y
-CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y
-CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLAB_FREELIST_RANDOM=y
-CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_SYSTEM_DATA_VERIFICATION=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-# end of General setup
-
-CONFIG_PPC64=y
-
-#
-# Processor support
-#
-CONFIG_PPC_BOOK3S_64=y
-# CONFIG_PPC_BOOK3E_64 is not set
-CONFIG_GENERIC_CPU=y
-# CONFIG_CELL_CPU is not set
-# CONFIG_POWER5_CPU is not set
-# CONFIG_POWER6_CPU is not set
-# CONFIG_POWER7_CPU is not set
-# CONFIG_POWER8_CPU is not set
-# CONFIG_POWER9_CPU is not set
-CONFIG_PPC_BOOK3S=y
-CONFIG_PPC_FPU=y
-CONFIG_ALTIVEC=y
-CONFIG_VSX=y
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_PPC_RADIX_MMU=y
-CONFIG_PPC_RADIX_MMU_DEFAULT=y
-CONFIG_PPC_HAVE_KUEP=y
-CONFIG_PPC_KUEP=y
-CONFIG_PPC_HAVE_KUAP=y
-CONFIG_PPC_KUAP=y
-# CONFIG_PPC_KUAP_DEBUG is not set
-CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
-CONFIG_PPC_MM_SLICES=y
-CONFIG_PPC_HAVE_PMU_SUPPORT=y
-CONFIG_PMU_SYSFS=y
-CONFIG_PPC_PERF_CTRS=y
-CONFIG_FORCE_SMP=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=2048
-CONFIG_PPC_DOORBELL=y
-# end of Processor support
-
-CONFIG_VDSO32=y
-CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-CONFIG_64BIT=y
-CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MAX=33
-CONFIG_ARCH_MMAP_RND_BITS_MIN=18
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NR_IRQS=512
-CONFIG_NMI_IPI=y
-CONFIG_PPC_WATCHDOG=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_PPC=y
-CONFIG_PPC_BARRIER_NOSPEC=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_COMPAT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_PPC_UDBG_16550=y
-CONFIG_GENERIC_TBSYNC=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_GENERIC_BUG=y
-CONFIG_EPAPR_BOOT=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_NONZERO_CPU=y
-CONFIG_PPC_DCR_MMIO=y
-CONFIG_PPC_DCR=y
-CONFIG_PPC_OF_PLATFORM_PCI=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_PPC_DAWR=y
-CONFIG_PGTABLE_LEVELS=4
-CONFIG_PPC_MSI_BITMAP=y
-CONFIG_PPC_XICS=y
-CONFIG_PPC_ICP_NATIVE=y
-CONFIG_PPC_ICP_HV=y
-CONFIG_PPC_ICS_RTAS=y
-CONFIG_PPC_XIVE=y
-CONFIG_PPC_XIVE_NATIVE=y
-CONFIG_PPC_XIVE_SPAPR=y
-
-#
-# Platform support
-#
-CONFIG_PPC_POWERNV=y
-CONFIG_OPAL_PRD=m
-CONFIG_PPC_MEMTRACE=y
-CONFIG_PPC_VAS=y
-CONFIG_SCOM_DEBUGFS=y
-CONFIG_PPC_PSERIES=y
-CONFIG_PPC_SPLPAR=y
-CONFIG_DTL=y
-CONFIG_PSERIES_ENERGY=m
-CONFIG_SCANLOG=m
-CONFIG_IO_EVENT_IRQ=y
-CONFIG_LPARCFG=y
-CONFIG_PPC_SMLPAR=y
-CONFIG_CMM=m
-CONFIG_HV_PERF_CTRS=y
-CONFIG_IBMVIO=y
-CONFIG_IBMEBUS=y
-CONFIG_PAPR_SCM=m
-CONFIG_PPC_SVM=y
-CONFIG_PPC_PMAC=y
-CONFIG_PPC_PMAC64=y
-CONFIG_PPC_MAPLE=y
-CONFIG_PPC_PASEMI=y
-
-#
-# PA Semi PWRficient options
-#
-# CONFIG_PPC_PASEMI_NEMO is not set
-# CONFIG_PPC_PASEMI_IOMMU is not set
-CONFIG_PPC_PASEMI_MDIO=m
-# end of PA Semi PWRficient options
-
-CONFIG_PPC_PS3=y
-
-#
-# PS3 Platform Options
-#
-CONFIG_PS3_ADVANCED=y
-CONFIG_PS3_HTAB_SIZE=20
-# CONFIG_PS3_DYNAMIC_DMA is not set
-CONFIG_PS3_VUART=y
-CONFIG_PS3_PS3AV=y
-CONFIG_PS3_SYS_MANAGER=y
-# CONFIG_PS3_REPOSITORY_WRITE is not set
-CONFIG_PS3_STORAGE=m
-CONFIG_PS3_DISK=m
-CONFIG_PS3_ROM=m
-CONFIG_PS3_FLASH=m
-CONFIG_PS3_LPM=m
-# CONFIG_PS3GELIC_UDBG is not set
-# end of PS3 Platform Options
-
-CONFIG_PPC_CELL=y
-CONFIG_PPC_CELL_COMMON=y
-CONFIG_PPC_CELL_NATIVE=y
-CONFIG_PPC_IBM_CELL_BLADE=y
-CONFIG_AXON_MSI=y
-
-#
-# Cell Broadband Engine options
-#
-CONFIG_SPU_FS=m
-CONFIG_SPU_BASE=y
-CONFIG_CBE_RAS=y
-CONFIG_PPC_IBM_CELL_RESETBUTTON=y
-CONFIG_PPC_IBM_CELL_POWERBUTTON=m
-CONFIG_CBE_THERM=m
-CONFIG_PPC_PMI=y
-CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m
-# end of Cell Broadband Engine options
-
-CONFIG_OPROFILE_CELL=y
-CONFIG_KVM_GUEST=y
-CONFIG_EPAPR_PARAVIRT=y
-CONFIG_PPC_NATIVE=y
-CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
-CONFIG_PPC_DT_CPU_FTRS=y
-CONFIG_UDBG_RTAS_CONSOLE=y
-CONFIG_PPC_SMP_MUXED_IPI=y
-CONFIG_MPIC=y
-# CONFIG_MPIC_MSGR is not set
-CONFIG_PPC_I8259=y
-CONFIG_U3_DART=y
-CONFIG_PPC_RTAS=y
-CONFIG_RTAS_ERROR_LOGGING=y
-CONFIG_PPC_RTAS_DAEMON=y
-CONFIG_RTAS_PROC=y
-CONFIG_RTAS_FLASH=m
-CONFIG_MMIO_NVRAM=y
-CONFIG_MPIC_U3_HT_IRQS=y
-CONFIG_MPIC_BROKEN_REGREAD=y
-CONFIG_EEH=y
-CONFIG_PPC_970_NAP=y
-CONFIG_PPC_P7_NAP=y
-CONFIG_PPC_BOOK3S_IDLE=y
-CONFIG_PPC_INDIRECT_PIO=y
-CONFIG_PPC_INDIRECT_MMIO=y
-CONFIG_PPC_IO_WORKAROUNDS=y
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-# CONFIG_CPU_FREQ_STAT is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-
-#
-# CPU frequency scaling drivers
-#
-CONFIG_CPUFREQ_DT=m
-CONFIG_CPUFREQ_DT_PLATDEV=y
-CONFIG_CPU_FREQ_CBE=m
-CONFIG_CPU_FREQ_CBE_PMI=y
-CONFIG_CPU_FREQ_MAPLE=y
-CONFIG_CPU_FREQ_PMAC64=y
-CONFIG_PPC_PASEMI_CPUFREQ=y
-CONFIG_POWERNV_CPUFREQ=y
-# end of CPU Frequency scaling
-
-#
-# CPUIdle driver
-#
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_CPU_IDLE_GOV_TEO=y
-# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set
-
-#
-# POWERPC CPU Idle Drivers
-#
-CONFIG_PSERIES_CPUIDLE=y
-CONFIG_POWERNV_CPUIDLE=y
-# end of POWERPC CPU Idle Drivers
-# end of CPU Idle
-# end of CPUIdle driver
-
-CONFIG_QE_GPIO=y
-# CONFIG_GEN_RTC is not set
-# end of Platform support
-
-#
-# Kernel options
-#
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=250
-CONFIG_SCHED_HRTICK=y
-CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
-CONFIG_PPC_TRANSACTIONAL_MEM=y
-CONFIG_PPC_UV=y
-# CONFIG_LD_HEAD_STUB_CATCH is not set
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_PPC_QUEUED_SPINLOCKS is not set
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_KEXEC=y
-CONFIG_KEXEC_FILE=y
-CONFIG_ARCH_HAS_KEXEC_PURGATORY=y
-CONFIG_RELOCATABLE=y
-# CONFIG_RELOCATABLE_TEST is not set
-CONFIG_CRASH_DUMP=y
-CONFIG_FA_DUMP=y
-# CONFIG_OPAL_CORE is not set
-CONFIG_IRQ_ALL_CPUS=y
-CONFIG_NUMA=y
-CONFIG_NODES_SHIFT=8
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-CONFIG_HAVE_MEMORYLESS_NODES=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_SYS_SUPPORTS_HUGETLBFS=y
-CONFIG_ILLEGAL_POINTER_VALUE=0x5deadbeef0000000
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_PPC_4K_PAGES=y
-# CONFIG_PPC_64K_PAGES is not set
-CONFIG_PPC_PAGE_SHIFT=12
-CONFIG_THREAD_SHIFT=14
-CONFIG_DATA_SHIFT=12
-CONFIG_FORCE_MAX_ZONEORDER=13
-# CONFIG_PPC_PROT_SAO_LPAR is not set
-CONFIG_PPC_COPRO_BASE=y
-CONFIG_SCHED_SMT=y
-CONFIG_PPC_DENORMALISATION=y
-CONFIG_CMDLINE="console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0"
-CONFIG_CMDLINE_FROM_BOOTLOADER=y
-# CONFIG_CMDLINE_EXTEND is not set
-# CONFIG_CMDLINE_FORCE is not set
-CONFIG_EXTRA_TARGETS=""
-CONFIG_ARCH_WANTS_FREEZER_CONTROL=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_HIBERNATION_SNAPSHOT_DEV=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP_SMP_NONZERO_CPU=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_PM_SLEEP_DEBUG=y
-# CONFIG_DPM_WATCHDOG is not set
-CONFIG_PM_CLK=y
-CONFIG_PM_GENERIC_DOMAINS=y
-CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_GENERIC_DOMAINS_OF=y
-CONFIG_ENERGY_MODEL=y
-CONFIG_SECCOMP=y
-CONFIG_PPC_MEM_KEYS=y
-CONFIG_PPC_RTAS_FILTER=y
-# end of Kernel options
-
-CONFIG_ISA_DMA_API=y
-
-#
-# Bus options
-#
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_FSL_LBC=y
-CONFIG_FSL_GTM=y
-# end of Bus options
-
-CONFIG_NONSTATIC_KERNEL=y
-CONFIG_PAGE_OFFSET=0xc000000000000000
-CONFIG_KERNEL_START=0xc000000000000000
-CONFIG_PHYSICAL_START=0x00000000
-CONFIG_ARCH_RANDOM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_VFIO=y
-CONFIG_KVM_COMPAT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
-CONFIG_KVM_BOOK3S_HANDLER=y
-CONFIG_KVM_BOOK3S_64_HANDLER=y
-CONFIG_KVM_BOOK3S_PR_POSSIBLE=y
-CONFIG_KVM_BOOK3S_HV_POSSIBLE=y
-CONFIG_KVM_BOOK3S_64=m
-CONFIG_KVM_BOOK3S_64_HV=m
-CONFIG_KVM_BOOK3S_64_PR=m
-# CONFIG_KVM_BOOK3S_HV_EXIT_TIMING is not set
-CONFIG_KVM_XICS=y
-CONFIG_KVM_XIVE=y
-
-#
-# General architecture-dependent options
-#
-CONFIG_CRASH_CORE=y
-CONFIG_KEXEC_CORE=y
-CONFIG_KEXEC_ELF=y
-CONFIG_HAVE_IMA_KEXEC=y
-CONFIG_OPROFILE=m
-CONFIG_HAVE_OPROFILE=y
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_OPTPROBES=y
-CONFIG_UPROBES=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_KRETPROBES=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_KPROBES_ON_FTRACE=y
-CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_HAVE_ASM_MODVERSIONS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_NMI_WATCHDOG=y
-CONFIG_HAVE_HARDLOCKUP_DETECTOR_ARCH=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_MMU_GATHER_TABLE_FREE=y
-CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
-CONFIG_MMU_GATHER_PAGE_SIZE=y
-CONFIG_ARCH_WANT_IRQS_OFF_ACTIVATE_MM=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_TIF_NOHZ=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_HUGE_VMAP=y
-CONFIG_HAVE_ARCH_SOFT_DIRTY=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_ARCH_MMAP_RND_BITS=28
-CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
-CONFIG_HAVE_ARCH_NVRAM_OPS=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGSUSPEND=y
-CONFIG_COMPAT_OLD_SIGACTION=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_ARCH_HAS_PHYS_TO_DMA=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
-CONFIG_ARCH_HAS_MEM_ENCRYPT=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# end of GCOV-based kernel profiling
-
-CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_ASM_MODVERSIONS=y
-CONFIG_MODULE_REL_CRCS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
-CONFIG_BLK_CGROUP_RWSTAT=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
-CONFIG_BLK_DEV_ZONED=y
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
-CONFIG_BLK_CMDLINE_PARSER=y
-CONFIG_BLK_WBT=y
-# CONFIG_BLK_CGROUP_IOLATENCY is not set
-# CONFIG_BLK_CGROUP_IOCOST is not set
-CONFIG_BLK_WBT_MQ=y
-CONFIG_BLK_DEBUG_FS=y
-CONFIG_BLK_DEBUG_FS_ZONED=y
-CONFIG_BLK_SED_OPAL=y
-CONFIG_BLK_INLINE_ENCRYPTION=y
-CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_AIX_PARTITION=y
-# CONFIG_OSF_PARTITION is not set
-CONFIG_AMIGA_PARTITION=y
-CONFIG_ATARI_PARTITION=y
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_CMDLINE_PARTITION=y
-# end of Partition Types
-
-CONFIG_BLOCK_COMPAT=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_MQ_RDMA=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-CONFIG_IOSCHED_BFQ=y
-CONFIG_BFQ_GROUP_IOSCHED=y
-# CONFIG_BFQ_CGROUP_DEBUG is not set
-# end of IO Schedulers
-
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_HAS_MMIOWB=y
-CONFIG_MMIOWB=y
-CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_ELFCORE=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_FAST_GUP=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_NUMA_KEEP_MEMINFO=y
-CONFIG_MEMORY_ISOLATION=y
-CONFIG_HAVE_BOOTMEM_INFO_NODE=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_PAGE_REPORTING=y
-CONFIG_MIGRATION=y
-CONFIG_ARCH_ENABLE_THP_MIGRATION=y
-CONFIG_CONTIG_ALLOC=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_MEMORY_FAILURE=y
-CONFIG_HWPOISON_INJECT=m
-CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
-CONFIG_CLEANCACHE=y
-CONFIG_FRONTSWAP=y
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_AREAS=7
-# CONFIG_MEM_SOFT_DIRTY is not set
-CONFIG_ZSWAP=y
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
-CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
-CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
-CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
-CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
-# CONFIG_ZSWAP_DEFAULT_ON is not set
-CONFIG_ZPOOL=y
-CONFIG_ZBUD=y
-CONFIG_Z3FOLD=m
-CONFIG_ZSMALLOC=y
-# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
-CONFIG_IDLE_PAGE_TRACKING=y
-CONFIG_ARCH_HAS_PTE_DEVMAP=y
-CONFIG_ZONE_DEVICE=y
-CONFIG_DEV_PAGEMAP_OPS=y
-CONFIG_HMM_MIRROR=y
-CONFIG_DEVICE_PRIVATE=y
-CONFIG_FRAME_VECTOR=y
-CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
-CONFIG_ARCH_HAS_PKEYS=y
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-# CONFIG_READ_ONLY_THP_FOR_FS is not set
-CONFIG_ARCH_HAS_PTE_SPECIAL=y
-CONFIG_ARCH_HAS_HUGEPD=y
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-CONFIG_NET_REDIRECT=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-CONFIG_UNIX_DIAG=m
-# CONFIG_TLS is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_OFFLOAD=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-CONFIG_XFRM_INTERFACE=m
-# CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_MIGRATE=y
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_AH=m
-CONFIG_XFRM_ESP=m
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_XFRM_ESPINTCP=y
-CONFIG_SMC=m
-CONFIG_SMC_DIAG=m
-CONFIG_XDP_SOCKETS=y
-CONFIG_XDP_SOCKETS_DIAG=m
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_ESP_OFFLOAD=m
-CONFIG_INET_ESPINTCP=y
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_INET_UDP_DIAG=y
-CONFIG_INET_RAW_DIAG=m
-CONFIG_INET_DIAG_DESTROY=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_NV=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_TCP_CONG_DCTCP=m
-CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=m
-CONFIG_DEFAULT_RENO=y
-CONFIG_DEFAULT_TCP_CONG="reno"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_ESP_OFFLOAD=m
-CONFIG_INET6_ESPINTCP=y
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_FOU=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-CONFIG_IPV6_SEG6_LWTUNNEL=y
-CONFIG_IPV6_SEG6_HMAC=y
-CONFIG_IPV6_SEG6_BPF=y
-CONFIG_IPV6_RPL_LWTUNNEL=y
-# CONFIG_NETLABEL is not set
-CONFIG_MPTCP=y
-CONFIG_INET_MPTCP_DIAG=y
-CONFIG_MPTCP_IPV6=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NET_PTP_CLASSIFY=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_FAMILY_BRIDGE=y
-CONFIG_NETFILTER_FAMILY_ARP=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-CONFIG_NF_LOG_NETDEV=m
-CONFIG_NETFILTER_CONNCOUNT=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CONNTRACK_PROCFS is not set
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NF_NAT_MASQUERADE=y
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CONNLIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_TUNNEL=m
-CONFIG_NFT_OBJREF=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
-CONFIG_NFT_XFRM=m
-CONFIG_NFT_SOCKET=m
-CONFIG_NFT_OSF=m
-CONFIG_NFT_TPROXY=m
-# CONFIG_NFT_SYNPROXY is not set
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_FIB_NETDEV=m
-CONFIG_NF_FLOW_TABLE_INET=m
-CONFIG_NF_FLOW_TABLE=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-# end of Core Netfilter Configuration
-
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-# CONFIG_IP_VS_MH is not set
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS MH scheduler
-#
-CONFIG_IP_VS_MH_TAB_INDEX=12
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_SOCKET_IPV4=m
-CONFIG_NF_TPROXY_IPV4=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_FLOW_TABLE_IPV4=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-# CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# end of IP: Netfilter Configuration
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_SOCKET_IPV6=m
-CONFIG_NF_TPROXY_IPV6=m
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_FLOW_TABLE_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_SRH=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-# CONFIG_IP6_NF_SECURITY is not set
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-# end of IPv6: Netfilter Configuration
-
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_TABLES_BRIDGE=m
-# CONFIG_NFT_BRIDGE_META is not set
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-# CONFIG_BPFILTER is not set
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-# end of DCCP CCIDs Configuration
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-# end of DCCP Kernel Hacking
-
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-# CONFIG_SCTP_COOKIE_HMAC_MD5 is not set
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_INET_SCTP_DIAG=m
-CONFIG_RDS=m
-# CONFIG_RDS_RDMA is not set
-CONFIG_RDS_TCP=m
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-CONFIG_TIPC_MEDIA_IB=y
-CONFIG_TIPC_MEDIA_UDP=y
-CONFIG_TIPC_CRYPTO=y
-CONFIG_TIPC_DIAG=m
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-CONFIG_L2TP_DEBUGFS=m
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_MRP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_BRIDGE_MRP=y
-CONFIG_HAVE_NET_DSA=y
-CONFIG_NET_DSA=m
-CONFIG_NET_DSA_TAG_8021Q=m
-CONFIG_NET_DSA_TAG_AR9331=m
-CONFIG_NET_DSA_TAG_BRCM_COMMON=m
-CONFIG_NET_DSA_TAG_BRCM=m
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
-CONFIG_NET_DSA_TAG_GSWIP=m
-CONFIG_NET_DSA_TAG_DSA=m
-CONFIG_NET_DSA_TAG_EDSA=m
-CONFIG_NET_DSA_TAG_MTK=m
-CONFIG_NET_DSA_TAG_KSZ=m
-CONFIG_NET_DSA_TAG_RTL4_A=m
-CONFIG_NET_DSA_TAG_OCELOT=m
-CONFIG_NET_DSA_TAG_QCA=m
-CONFIG_NET_DSA_TAG_LAN9303=m
-CONFIG_NET_DSA_TAG_SJA1105=m
-CONFIG_NET_DSA_TAG_TRAILER=m
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_X25=m
-CONFIG_LAPB=m
-CONFIG_PHONET=m
-CONFIG_6LOWPAN=m
-# CONFIG_6LOWPAN_DEBUGFS is not set
-CONFIG_6LOWPAN_NHC=m
-CONFIG_6LOWPAN_NHC_DEST=m
-CONFIG_6LOWPAN_NHC_FRAGMENT=m
-CONFIG_6LOWPAN_NHC_HOP=m
-CONFIG_6LOWPAN_NHC_IPV6=m
-CONFIG_6LOWPAN_NHC_MOBILITY=m
-CONFIG_6LOWPAN_NHC_ROUTING=m
-CONFIG_6LOWPAN_NHC_UDP=m
-# CONFIG_6LOWPAN_GHC_EXT_HDR_HOP is not set
-# CONFIG_6LOWPAN_GHC_UDP is not set
-# CONFIG_6LOWPAN_GHC_ICMPV6 is not set
-# CONFIG_6LOWPAN_GHC_EXT_HDR_DEST is not set
-# CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG is not set
-# CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE is not set
-CONFIG_IEEE802154=m
-CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
-CONFIG_IEEE802154_SOCKET=m
-# CONFIG_IEEE802154_6LOWPAN is not set
-CONFIG_MAC802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_CBS=m
-CONFIG_NET_SCH_ETF=m
-CONFIG_NET_SCH_TAPRIO=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_SKBPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_CAKE=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_FQ_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-CONFIG_NET_SCH_ETS=m
-# CONFIG_NET_SCH_DEFAULT is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-# CONFIG_NET_CLS_CGROUP is not set
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_MATCHALL=m
-# CONFIG_NET_EMATCH is not set
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_SAMPLE=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-# CONFIG_NET_ACT_MPLS is not set
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_ACT_CTINFO is not set
-CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-# CONFIG_NET_ACT_CT is not set
-CONFIG_NET_ACT_GATE=m
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IFE_SKBTCINDEX=m
-# CONFIG_NET_TC_SKB_EXT is not set
-CONFIG_NET_SCH_FIFO=y
-CONFIG_DCB=y
-CONFIG_DNS_RESOLVER=y
-CONFIG_BATMAN_ADV=m
-CONFIG_BATMAN_ADV_BATMAN_V=y
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-CONFIG_BATMAN_ADV_NC=y
-CONFIG_BATMAN_ADV_MCAST=y
-CONFIG_BATMAN_ADV_DEBUGFS=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_BATMAN_ADV_SYSFS=y
-# CONFIG_BATMAN_ADV_TRACING is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
-CONFIG_VSOCKETS_DIAG=m
-CONFIG_VSOCKETS_LOOPBACK=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-CONFIG_NETLINK_DIAG=m
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_NET_NSH=m
-CONFIG_HSR=m
-CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_L3_MASTER_DEV=y
-CONFIG_QRTR=m
-CONFIG_QRTR_SMD=m
-CONFIG_QRTR_TUN=m
-CONFIG_QRTR_MHI=m
-# CONFIG_NET_NCSI is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-CONFIG_BPF_STREAM_PARSER=y
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
-# end of Network testing
-# end of Networking options
-
-CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
-CONFIG_AX25=m
-CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_MKISS=m
-CONFIG_6PACK=m
-CONFIG_BPQETHER=m
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_YAM=m
-# end of AX.25 network device drivers
-
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_GW=m
-# CONFIG_CAN_J1939 is not set
-
-#
-# CAN Device Drivers
-#
-CONFIG_CAN_VCAN=m
-# CONFIG_CAN_VXCAN is not set
-CONFIG_CAN_SLCAN=m
-CONFIG_CAN_DEV=m
-CONFIG_CAN_CALC_BITTIMING=y
-CONFIG_CAN_FLEXCAN=m
-CONFIG_CAN_GRCAN=m
-# CONFIG_CAN_JANZ_ICAN3 is not set
-# CONFIG_CAN_KVASER_PCIEFD is not set
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
-CONFIG_CAN_C_CAN_PCI=m
-CONFIG_CAN_CC770=m
-CONFIG_CAN_CC770_ISA=m
-CONFIG_CAN_CC770_PLATFORM=m
-CONFIG_CAN_IFI_CANFD=m
-CONFIG_CAN_M_CAN=m
-# CONFIG_CAN_M_CAN_PLATFORM is not set
-# CONFIG_CAN_M_CAN_TCAN4X5X is not set
-CONFIG_CAN_MSCAN=m
-# CONFIG_CAN_PEAK_PCIEFD is not set
-# CONFIG_CAN_SJA1000 is not set
-CONFIG_CAN_SOFTING=m
-CONFIG_CAN_SOFTING_CS=m
-
-#
-# CAN SPI interfaces
-#
-# CONFIG_CAN_HI311X is not set
-CONFIG_CAN_MCP251X=m
-# end of CAN SPI interfaces
-
-#
-# CAN USB interfaces
-#
-CONFIG_CAN_8DEV_USB=m
-CONFIG_CAN_EMS_USB=m
-CONFIG_CAN_ESD_USB2=m
-CONFIG_CAN_GS_USB=m
-CONFIG_CAN_KVASER_USB=m
-# CONFIG_CAN_MCBA_USB is not set
-CONFIG_CAN_PEAK_USB=m
-CONFIG_CAN_UCAN=m
-# end of CAN USB interfaces
-
-CONFIG_CAN_DEBUG_DEVICES=y
-# end of CAN Device Drivers
-
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-CONFIG_BT_6LOWPAN=m
-CONFIG_BT_LEDS=y
-CONFIG_BT_MSFTEXT=y
-CONFIG_BT_DEBUGFS=y
-# CONFIG_BT_SELFTEST is not set
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
-CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_SERDEV=y
-CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART_NOKIA is not set
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_BCM=y
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIUART_AG6XX=y
-# CONFIG_BT_HCIUART_MRVL is not set
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-# CONFIG_BT_HCIDTL1 is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBLUECARD is not set
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_MTKSDIO=m
-CONFIG_BT_MTKUART=m
-CONFIG_BT_HCIRSI=m
-# end of Bluetooth device drivers
-
-CONFIG_AF_RXRPC=m
-CONFIG_AF_RXRPC_IPV6=y
-# CONFIG_AF_RXRPC_INJECT_LOSS is not set
-# CONFIG_AF_RXRPC_DEBUG is not set
-# CONFIG_RXKAD is not set
-CONFIG_AF_KCM=m
-CONFIG_STREAM_PARSER=y
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
-CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
-CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_CFG80211_CRDA_SUPPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-CONFIG_MAC80211_DEBUGFS=y
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_GPIO=m
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_RDMA is not set
-# CONFIG_NET_9P_DEBUG is not set
-CONFIG_CAIF=m
-# CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_NETDEV=m
-CONFIG_CAIF_USB=m
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
-CONFIG_NFC=m
-CONFIG_NFC_DIGITAL=m
-CONFIG_NFC_NCI=m
-CONFIG_NFC_NCI_SPI=m
-CONFIG_NFC_NCI_UART=m
-CONFIG_NFC_HCI=m
-CONFIG_NFC_SHDLC=y
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_NFC_TRF7970A=m
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PORT100=m
-CONFIG_NFC_FDP=m
-CONFIG_NFC_FDP_I2C=m
-CONFIG_NFC_PN544=m
-CONFIG_NFC_PN544_I2C=m
-CONFIG_NFC_PN533=m
-CONFIG_NFC_PN533_USB=m
-CONFIG_NFC_PN533_I2C=m
-CONFIG_NFC_PN532_UART=m
-CONFIG_NFC_MICROREAD=m
-CONFIG_NFC_MICROREAD_I2C=m
-CONFIG_NFC_MRVL=m
-CONFIG_NFC_MRVL_USB=m
-CONFIG_NFC_MRVL_UART=m
-CONFIG_NFC_MRVL_I2C=m
-CONFIG_NFC_MRVL_SPI=m
-CONFIG_NFC_ST21NFCA=m
-CONFIG_NFC_ST21NFCA_I2C=m
-CONFIG_NFC_ST_NCI=m
-CONFIG_NFC_ST_NCI_I2C=m
-CONFIG_NFC_ST_NCI_SPI=m
-CONFIG_NFC_NXP_NCI=m
-CONFIG_NFC_NXP_NCI_I2C=m
-CONFIG_NFC_S3FWRN5=m
-CONFIG_NFC_S3FWRN5_I2C=m
-CONFIG_NFC_ST95HF=m
-# end of Near Field Communication (NFC) devices
-
-CONFIG_PSAMPLE=m
-CONFIG_NET_IFE=m
-CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_NET_SOCK_MSG=y
-CONFIG_NET_DEVLINK=y
-CONFIG_PAGE_POOL=y
-CONFIG_FAILOVER=m
-CONFIG_ETHTOOL_NETLINK=y
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_HAVE_PCI=y
-CONFIG_FORCE_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_SYSCALL=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-CONFIG_PCIEAER_INJECT=m
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEASPM=y
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-CONFIG_PCIE_DPC=y
-CONFIG_PCIE_PTM=y
-CONFIG_PCIE_BW=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_REALLOC_ENABLE_AUTO=y
-CONFIG_PCI_STUB=m
-CONFIG_PCI_PF_STUB=m
-CONFIG_PCI_ATS=y
-CONFIG_PCI_ECAM=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-# CONFIG_PCI_P2PDMA is not set
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_CPCI=y
-# CONFIG_HOTPLUG_PCI_SHPC is not set
-CONFIG_HOTPLUG_PCI_POWERNV=m
-CONFIG_HOTPLUG_PCI_RPA=m
-CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
-
-#
-# PCI controller drivers
-#
-CONFIG_PCI_FTPCI100=y
-CONFIG_PCI_HOST_COMMON=y
-CONFIG_PCI_HOST_GENERIC=y
-CONFIG_PCIE_XILINX=y
-
-#
-# DesignWare PCI Core Support
-#
-# CONFIG_PCIE_DW_PLAT_HOST is not set
-# CONFIG_PCIE_DW_PLAT_EP is not set
-# CONFIG_PCI_MESON is not set
-# end of DesignWare PCI Core Support
-
-#
-# Mobiveil PCIe Core Support
-#
-# end of Mobiveil PCIe Core Support
-
-#
-# Cadence PCIe controllers support
-#
-CONFIG_PCIE_CADENCE=y
-CONFIG_PCIE_CADENCE_HOST=y
-CONFIG_PCIE_CADENCE_EP=y
-CONFIG_PCIE_CADENCE_PLAT=y
-CONFIG_PCIE_CADENCE_PLAT_HOST=y
-CONFIG_PCIE_CADENCE_PLAT_EP=y
-CONFIG_PCI_J721E=y
-CONFIG_PCI_J721E_HOST=y
-CONFIG_PCI_J721E_EP=y
-# end of Cadence PCIe controllers support
-# end of PCI controller drivers
-
-#
-# PCI Endpoint
-#
-CONFIG_PCI_ENDPOINT=y
-CONFIG_PCI_ENDPOINT_CONFIGFS=y
-# CONFIG_PCI_EPF_TEST is not set
-# end of PCI Endpoint
-
-#
-# PCI switch controller drivers
-#
-CONFIG_PCI_SW_SWITCHTEC=m
-# end of PCI switch controller drivers
-
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-# CONFIG_ELECTRA_CF is not set
-CONFIG_PCCARD_NONSTATIC=y
-CONFIG_RAPIDIO=m
-CONFIG_RAPIDIO_TSI721=m
-CONFIG_RAPIDIO_DISC_TIMEOUT=30
-CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y
-CONFIG_RAPIDIO_DMA_ENGINE=y
-CONFIG_RAPIDIO_DEBUG=y
-CONFIG_RAPIDIO_ENUM_BASIC=m
-CONFIG_RAPIDIO_CHMAN=m
-CONFIG_RAPIDIO_MPORT_CDEV=m
-
-#
-# RapidIO Switch drivers
-#
-CONFIG_RAPIDIO_TSI57X=m
-CONFIG_RAPIDIO_CPS_XX=m
-CONFIG_RAPIDIO_TSI568=m
-CONFIG_RAPIDIO_CPS_GEN2=m
-CONFIG_RAPIDIO_RXS_GEN3=m
-# end of RapidIO Switch drivers
-
-#
-# Generic Driver Options
-#
-# CONFIG_UEVENT_HELPER is not set
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-CONFIG_FW_CACHE=y
-# end of Firmware loader
-
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_ALLOW_DEV_COREDUMP=y
-CONFIG_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_SOC_BUS=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=y
-CONFIG_REGMAP_SPI=y
-CONFIG_REGMAP_SPMI=m
-CONFIG_REGMAP_W1=m
-CONFIG_REGMAP_MMIO=y
-CONFIG_REGMAP_IRQ=y
-CONFIG_REGMAP_I3C=m
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-# CONFIG_MOXTET is not set
-CONFIG_SIMPLE_PM_BUS=y
-CONFIG_MHI_BUS=m
-# end of Bus devices
-
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_GNSS=m
-CONFIG_GNSS_SERIAL=m
-CONFIG_GNSS_MTK_SERIAL=m
-CONFIG_GNSS_SIRF_SERIAL=m
-CONFIG_GNSS_UBX_SERIAL=m
-CONFIG_MTD=m
-# CONFIG_MTD_TESTS is not set
-
-#
-# Partition parsers
-#
-CONFIG_MTD_AR7_PARTS=m
-CONFIG_MTD_CMDLINE_PARTS=m
-CONFIG_MTD_OF_PARTS=m
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# end of Partition parsers
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-# CONFIG_SM_FTL is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
-CONFIG_MTD_SWAP=m
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-# end of RAM/ROM/Flash chip drivers
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-CONFIG_MTD_PHYSMAP_OF=y
-# CONFIG_MTD_PHYSMAP_VERSATILE is not set
-# CONFIG_MTD_PHYSMAP_GEMINI is not set
-# CONFIG_MTD_PHYSMAP_GPIO_ADDR is not set
-CONFIG_MTD_PCI=m
-# CONFIG_MTD_PCMCIA is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-CONFIG_MTD_PLATRAM=m
-# end of Mapping drivers for chip access
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-CONFIG_MTD_DATAFLASH=m
-# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
-CONFIG_MTD_DATAFLASH_OTP=y
-CONFIG_MTD_MCHP23K256=m
-CONFIG_MTD_SST25L=m
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-CONFIG_MTD_POWERNV_FLASH=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOCG3 is not set
-# end of Self-contained MTD device drivers
-
-#
-# NAND
-#
-CONFIG_MTD_NAND_CORE=m
-CONFIG_MTD_ONENAND=m
-CONFIG_MTD_ONENAND_VERIFY_WRITE=y
-CONFIG_MTD_ONENAND_GENERIC=m
-# CONFIG_MTD_ONENAND_OTP is not set
-CONFIG_MTD_ONENAND_2X_PROGRAM=y
-CONFIG_MTD_NAND_ECC_SW_HAMMING=m
-# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-CONFIG_MTD_RAW_NAND=m
-CONFIG_MTD_NAND_ECC_SW_BCH=y
-
-#
-# Raw/parallel NAND flash controllers
-#
-CONFIG_MTD_NAND_DENALI=m
-CONFIG_MTD_NAND_DENALI_PCI=m
-CONFIG_MTD_NAND_DENALI_DT=m
-CONFIG_MTD_NAND_CAFE=m
-# CONFIG_MTD_NAND_PASEMI is not set
-CONFIG_MTD_NAND_MXIC=m
-CONFIG_MTD_NAND_GPIO=m
-CONFIG_MTD_NAND_PLATFORM=m
-# CONFIG_MTD_NAND_CADENCE is not set
-CONFIG_MTD_NAND_ARASAN=m
-
-#
-# Misc
-#
-CONFIG_MTD_SM_COMMON=m
-CONFIG_MTD_NAND_NANDSIM=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_SPI_NAND=m
-# end of NAND
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-# end of LPDDR & LPDDR2 PCM memory drivers
-
-CONFIG_MTD_SPI_NOR=m
-CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-CONFIG_MTD_UBI_FASTMAP=y
-CONFIG_MTD_UBI_GLUEBI=m
-CONFIG_MTD_UBI_BLOCK=y
-# CONFIG_MTD_HYPERBUS is not set
-CONFIG_DTC=y
-CONFIG_OF=y
-# CONFIG_OF_UNITTEST is not set
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_DYNAMIC=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-CONFIG_OF_MDIO=y
-CONFIG_OF_RESERVED_MEM=y
-CONFIG_OF_RESOLVE=y
-CONFIG_OF_OVERLAY=y
-CONFIG_OF_DMA_DEFAULT_COHERENT=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
-# CONFIG_PARPORT_PC_PCMCIA is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_NULL_BLK=m
-CONFIG_BLK_DEV_FD=m
-CONFIG_CDROM=m
-# CONFIG_PARIDE is not set
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_ZRAM=m
-CONFIG_ZRAM_WRITEBACK=y
-# CONFIG_ZRAM_MEMORY_TRACKING is not set
-CONFIG_BLK_DEV_UMEM=m
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_SKD=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_VIRTIO_BLK=m
-CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_BLK_DEV_RNBD=y
-CONFIG_BLK_DEV_RNBD_CLIENT=m
-CONFIG_BLK_DEV_RNBD_SERVER=m
-
-#
-# NVME Support
-#
-CONFIG_NVME_CORE=y
-CONFIG_BLK_DEV_NVME=y
-CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_HWMON=y
-CONFIG_NVME_FABRICS=m
-CONFIG_NVME_RDMA=m
-CONFIG_NVME_FC=m
-CONFIG_NVME_TCP=m
-CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_PASSTHRU=y
-CONFIG_NVME_TARGET_LOOP=m
-CONFIG_NVME_TARGET_RDMA=m
-CONFIG_NVME_TARGET_FC=m
-CONFIG_NVME_TARGET_FCLOOP=m
-CONFIG_NVME_TARGET_TCP=m
-# end of NVME Support
-
-#
-# Misc devices
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT_SPI=m
-CONFIG_DUMMY_IRQ=m
-CONFIG_IBMVMC=m
-CONFIG_PHANTOM=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-CONFIG_LATTICE_ECP3_CONFIG=m
-CONFIG_SRAM=y
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
-CONFIG_MISC_RTSX=m
-CONFIG_PVPANIC=m
-CONFIG_C2PORT=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_AT25=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_EEPROM_93XX46=m
-CONFIG_EEPROM_IDT_89HPESX=m
-CONFIG_EEPROM_EE1004=m
-# end of EEPROM support
-
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-# end of Texas Instruments shared transport line discipline
-
-CONFIG_SENSORS_LIS3_SPI=m
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_ALTERA_STAPL=m
-
-#
-# Intel MIC & related support
-#
-CONFIG_VOP_BUS=m
-CONFIG_VOP=m
-# end of Intel MIC & related support
-
-CONFIG_GENWQE=m
-CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
-CONFIG_ECHO=m
-CONFIG_CXL_BASE=y
-CONFIG_CXL=m
-CONFIG_OCXL_BASE=y
-CONFIG_OCXL=m
-CONFIG_MISC_ALCOR_PCI=m
-CONFIG_MISC_RTSX_PCI=m
-CONFIG_MISC_RTSX_USB=m
-CONFIG_HABANA_AI=m
-CONFIG_UACCE=m
-# end of Misc devices
-
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-# end of SCSI Transports
-
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_CXLFLASH=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_MVSAS_TASKLET is not set
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ESAS2R=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_SMARTPQI=m
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-CONFIG_SCSI_UFS_DWC_TC_PCI=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_UFS_CDNS_PLATFORM=m
-CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m
-CONFIG_SCSI_UFS_BSG=y
-CONFIG_SCSI_UFS_CRYPTO=y
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_MYRB=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_SCSI_SNIC=m
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-CONFIG_SCSI_DMX3191D=m
-# CONFIG_SCSI_FDOMAIN_PCI is not set
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_IBMVSCSI=m
-CONFIG_SCSI_IBMVSCSIS=m
-CONFIG_SCSI_IBMVFC=m
-CONFIG_SCSI_IBMVFC_TRACE=y
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
-# CONFIG_TCM_QLA2XXX_DEBUG is not set
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_QEDI=m
-CONFIG_QEDF=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_WD719X=m
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-# CONFIG_PCMCIA_FDOMAIN is not set
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=y
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-# end of SCSI device support
-
-CONFIG_ATA=m
-CONFIG_ATA_NONSTANDARD=y
-CONFIG_SATA_HOST=y
-CONFIG_PATA_TIMINGS=y
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_FORCE=y
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=0
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_AHCI_CEVA=m
-CONFIG_AHCI_QORIQ=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SX4=m
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-CONFIG_SATA_DWC=m
-# CONFIG_SATA_DWC_OLD_DMA is not set
-# CONFIG_SATA_DWC_DEBUG is not set
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MACIO=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PLATFORM=m
-CONFIG_PATA_OF_PLATFORM=m
-CONFIG_PATA_RZ1000=m
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_ATA_GENERIC=m
-# CONFIG_PATA_LEGACY is not set
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_MD_CLUSTER=m
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_UNSTRIPED=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_WRITECACHE=m
-CONFIG_DM_EBS=m
-CONFIG_DM_ERA=m
-# CONFIG_DM_CLONE is not set
-CONFIG_DM_MIRROR=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_MULTIPATH_HST=m
-CONFIG_DM_DELAY=m
-CONFIG_DM_DUST=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
-# CONFIG_DM_VERITY_FEC is not set
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_DM_INTEGRITY=m
-CONFIG_DM_ZONED=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_TCM_USER2=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_ISCSI_TARGET_CXGB4=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-CONFIG_FUSION_LOGGING=y
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-# end of IEEE 1394 (FireWire) support
-
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_ADB_PMU=y
-CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
-CONFIG_PMAC_SMU=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_WINDFARM=m
-CONFIG_WINDFARM_PM81=m
-CONFIG_WINDFARM_PM72=m
-CONFIG_WINDFARM_RM31=m
-CONFIG_WINDFARM_PM91=m
-CONFIG_WINDFARM_PM112=m
-CONFIG_WINDFARM_PM121=m
-CONFIG_PMAC_RACKMETER=m
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_WIREGUARD=m
-# CONFIG_WIREGUARD_DEBUG is not set
-CONFIG_EQUALIZER=m
-CONFIG_NET_FC=y
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
-CONFIG_IPVTAP=m
-CONFIG_VXLAN=m
-CONFIG_GENEVE=m
-CONFIG_BAREUDP=m
-CONFIG_GTP=m
-CONFIG_MACSEC=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NTB_NETDEV=m
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-CONFIG_TUN=m
-CONFIG_TAP=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_NET_VRF=m
-# CONFIG_VSOCKMON is not set
-CONFIG_SUNGEM_PHY=m
-# CONFIG_ARCNET is not set
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_NICSTAR=m
-CONFIG_ATM_NICSTAR_USE_SUNI=y
-CONFIG_ATM_NICSTAR_USE_IDT77105=y
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-# CONFIG_CAIF_DRIVERS is not set
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_B53=m
-CONFIG_B53_SPI_DRIVER=m
-CONFIG_B53_MDIO_DRIVER=m
-CONFIG_B53_MMAP_DRIVER=m
-CONFIG_B53_SRAB_DRIVER=m
-CONFIG_B53_SERDES=m
-# CONFIG_NET_DSA_BCM_SF2 is not set
-# CONFIG_NET_DSA_LOOP is not set
-CONFIG_NET_DSA_LANTIQ_GSWIP=m
-# CONFIG_NET_DSA_MT7530 is not set
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
-# CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set
-CONFIG_NET_DSA_MICROCHIP_KSZ8795=m
-CONFIG_NET_DSA_MICROCHIP_KSZ8795_SPI=m
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
-CONFIG_NET_DSA_MV88E6XXX_PTP=y
-# CONFIG_NET_DSA_MSCC_FELIX is not set
-CONFIG_NET_DSA_AR9331=m
-CONFIG_NET_DSA_SJA1105=m
-# CONFIG_NET_DSA_SJA1105_PTP is not set
-CONFIG_NET_DSA_QCA8K=m
-# CONFIG_NET_DSA_REALTEK_SMI is not set
-# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
-# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_AGERE=y
-CONFIG_ET131X=m
-CONFIG_NET_VENDOR_ALACRITECH=y
-CONFIG_SLICOSS=m
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_ALTERA_TSE=m
-CONFIG_NET_VENDOR_AMAZON=y
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_PCNET32=y
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_NET_VENDOR_AQUANTIA=y
-CONFIG_NET_VENDOR_ARC=y
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-CONFIG_NET_VENDOR_AURORA=y
-CONFIG_AURORA_NB8800=m
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BCMGENET=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_TIGON3=m
-CONFIG_TIGON3_HWMON=y
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_SYSTEMPORT=m
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_BNXT_FLOWER_OFFLOAD=y
-CONFIG_BNXT_DCB=y
-CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
-CONFIG_NET_VENDOR_CADENCE=y
-CONFIG_MACB=m
-CONFIG_MACB_USE_HWSTAMP=y
-CONFIG_MACB_PCI=m
-CONFIG_NET_VENDOR_CAVIUM=y
-CONFIG_THUNDER_NIC_PF=m
-CONFIG_THUNDER_NIC_VF=m
-CONFIG_THUNDER_NIC_BGX=m
-CONFIG_THUNDER_NIC_RGX=m
-CONFIG_CAVIUM_PTP=y
-CONFIG_LIQUIDIO=m
-CONFIG_LIQUIDIO_VF=m
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-# CONFIG_CHELSIO_T4_DCB is not set
-CONFIG_CHELSIO_T4VF=m
-CONFIG_CHELSIO_LIB=m
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-CONFIG_NET_VENDOR_CORTINA=y
-CONFIG_GEMINI_ETHERNET=m
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-CONFIG_SUNDANCE_MMIO=y
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET_BE2=y
-CONFIG_BE2NET_BE3=y
-CONFIG_BE2NET_LANCER=y
-CONFIG_BE2NET_SKYHAWK=y
-CONFIG_NET_VENDOR_EZCHIP=y
-CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m
-CONFIG_NET_VENDOR_FREESCALE=y
-CONFIG_FSL_PQ_MDIO=m
-CONFIG_FSL_XGMAC_MDIO=m
-CONFIG_GIANFAR=m
-CONFIG_FSL_ENETC=m
-CONFIG_FSL_ENETC_VF=m
-CONFIG_FSL_ENETC_MDIO=m
-CONFIG_FSL_ENETC_PTP_CLOCK=m
-# CONFIG_FSL_ENETC_QOS is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_GVE is not set
-CONFIG_NET_VENDOR_HUAWEI=y
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_NET_VENDOR_IBM=y
-CONFIG_IBMVETH=m
-CONFIG_IBM_EMAC=m
-CONFIG_IBM_EMAC_RXB=128
-CONFIG_IBM_EMAC_TXB=64
-CONFIG_IBM_EMAC_POLL_WEIGHT=32
-CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
-# CONFIG_IBM_EMAC_DEBUG is not set
-CONFIG_IBM_EMAC_ZMII=y
-CONFIG_IBM_EMAC_RGMII=y
-CONFIG_IBM_EMAC_TAH=y
-CONFIG_IBM_EMAC_EMAC4=y
-CONFIG_EHEA=m
-CONFIG_IBMVNIC=m
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IGB=m
-CONFIG_IGB_HWMON=y
-CONFIG_IGBVF=m
-CONFIG_IXGB=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE_DCB=y
-CONFIG_IXGBE_IPSEC=y
-CONFIG_IXGBEVF=m
-CONFIG_IXGBEVF_IPSEC=y
-CONFIG_I40E=m
-CONFIG_I40E_DCB=y
-CONFIG_IAVF=m
-CONFIG_I40EVF=m
-CONFIG_ICE=m
-CONFIG_FM10K=m
-CONFIG_IGC=m
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_MVMDIO=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_DCB=y
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX4_CORE_GEN2=y
-CONFIG_MLX5_CORE=m
-CONFIG_MLX5_ACCEL=y
-# CONFIG_MLX5_FPGA is not set
-CONFIG_MLX5_CORE_EN=y
-CONFIG_MLX5_EN_ARFS=y
-CONFIG_MLX5_EN_RXNFC=y
-CONFIG_MLX5_MPFS=y
-CONFIG_MLX5_ESWITCH=y
-CONFIG_MLX5_CLS_ACT=y
-CONFIG_MLX5_CORE_EN_DCB=y
-# CONFIG_MLX5_CORE_IPOIB is not set
-CONFIG_MLX5_IPSEC=y
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_SW_STEERING=y
-CONFIG_MLXSW_CORE=m
-CONFIG_MLXSW_CORE_HWMON=y
-CONFIG_MLXSW_CORE_THERMAL=y
-CONFIG_MLXSW_PCI=m
-CONFIG_MLXSW_I2C=m
-CONFIG_MLXSW_SWITCHIB=m
-CONFIG_MLXSW_SWITCHX2=m
-CONFIG_MLXSW_SPECTRUM=m
-CONFIG_MLXSW_SPECTRUM_DCB=y
-CONFIG_MLXSW_MINIMAL=m
-CONFIG_MLXFW=m
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_ENCX24J600=m
-CONFIG_LAN743X=m
-CONFIG_NET_VENDOR_MICROSEMI=y
-# CONFIG_MSCC_OCELOT_SWITCH is not set
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_NETERION=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_NETRONOME=y
-CONFIG_NFP=m
-# CONFIG_NFP_APP_FLOWER is not set
-CONFIG_NFP_APP_ABM_NIC=y
-# CONFIG_NFP_DEBUG is not set
-# CONFIG_NET_VENDOR_NI is not set
-CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_ETHOC=m
-CONFIG_NET_VENDOR_PACKET_ENGINES=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_PASEMI=y
-CONFIG_PASEMI_MAC=m
-CONFIG_NET_VENDOR_PENSANDO=y
-CONFIG_IONIC=m
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLCNIC_DCB=y
-CONFIG_QLCNIC_HWMON=y
-CONFIG_NETXEN_NIC=m
-CONFIG_QED=m
-CONFIG_QED_LL2=y
-CONFIG_QED_SRIOV=y
-CONFIG_QEDE=m
-CONFIG_QED_RDMA=y
-CONFIG_QED_ISCSI=y
-CONFIG_QED_FCOE=y
-CONFIG_QED_OOO=y
-CONFIG_NET_VENDOR_QUALCOMM=y
-CONFIG_QCA7000=m
-CONFIG_QCA7000_SPI=m
-CONFIG_QCA7000_UART=m
-CONFIG_QCOM_EMAC=m
-CONFIG_RMNET=m
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_ROCKER=y
-CONFIG_ROCKER=m
-CONFIG_NET_VENDOR_SAMSUNG=y
-CONFIG_SXGBE_ETH=m
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SOLARFLARE=y
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_SFC_MCDI_LOGGING=y
-CONFIG_SFC_FALCON=m
-CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-CONFIG_SMSC911X=m
-CONFIG_SMSC9420=m
-CONFIG_NET_VENDOR_SOCIONEXT=y
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_SELFTESTS is not set
-CONFIG_STMMAC_PLATFORM=m
-# CONFIG_DWMAC_DWC_QOS_ETH is not set
-CONFIG_DWMAC_GENERIC=m
-CONFIG_STMMAC_PCI=m
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_SYNOPSYS=y
-# CONFIG_DWC_XLGMAC is not set
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-# CONFIG_TI_CPSW_PHY_SEL is not set
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_TOSHIBA=y
-# CONFIG_GELIC_NET is not set
-# CONFIG_SPIDER_NET is not set
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_WIZNET_W5100_SPI=m
-CONFIG_NET_VENDOR_XILINX=y
-# CONFIG_XILINX_AXI_EMAC is not set
-CONFIG_XILINX_LL_TEMAC=m
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-# CONFIG_DEFXX_MMIO is not set
-CONFIG_SKFP=m
-# CONFIG_HIPPI is not set
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_BUS=y
-CONFIG_MDIO_DEVRES=y
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_BUS_MUX=m
-CONFIG_MDIO_BUS_MUX_GPIO=m
-CONFIG_MDIO_BUS_MUX_MMIOREG=m
-CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
-CONFIG_MDIO_CAVIUM=m
-CONFIG_MDIO_GPIO=m
-CONFIG_MDIO_HISI_FEMAC=m
-CONFIG_MDIO_I2C=m
-CONFIG_MDIO_IPQ4019=m
-# CONFIG_MDIO_IPQ8064 is not set
-# CONFIG_MDIO_MSCC_MIIM is not set
-CONFIG_MDIO_MVUSB=m
-CONFIG_MDIO_OCTEON=m
-CONFIG_MDIO_THUNDER=m
-CONFIG_MDIO_XPCS=m
-CONFIG_PHYLINK=m
-CONFIG_PHYLIB=y
-CONFIG_SWPHY=y
-CONFIG_LED_TRIGGER_PHY=y
-
-#
-# MII PHY device drivers
-#
-CONFIG_SFP=m
-# CONFIG_ADIN_PHY is not set
-CONFIG_AMD_PHY=m
-CONFIG_AQUANTIA_PHY=m
-CONFIG_AX88796B_PHY=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM54140_PHY=m
-# CONFIG_BCM84881_PHY is not set
-CONFIG_CICADA_PHY=m
-CONFIG_CORTINA_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_DP83822_PHY=m
-CONFIG_DP83TC811_PHY=m
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_DP83869_PHY=m
-CONFIG_FIXED_PHY=y
-CONFIG_ICPLUS_PHY=m
-CONFIG_INTEL_XWAY_PHY=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_MARVELL_10G_PHY=m
-CONFIG_MICREL_PHY=m
-CONFIG_MICROCHIP_PHY=m
-CONFIG_MICROCHIP_T1_PHY=m
-CONFIG_MICROSEMI_PHY=m
-CONFIG_NATIONAL_PHY=m
-# CONFIG_NXP_TJA11XX_PHY is not set
-CONFIG_AT803X_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_RENESAS_PHY=m
-CONFIG_ROCKCHIP_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_STE10XP=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_XILINX_GMII2RGMII=m
-CONFIG_MICREL_KS8995MA=m
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-# CONFIG_SLIP_COMPRESSED is not set
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#
-CONFIG_USB_NET_DRIVERS=m
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_USB_NET_CH9200=m
-CONFIG_USB_NET_AQC111=m
-CONFIG_WLAN=y
-CONFIG_WIRELESS_WDS=y
-CONFIG_WLAN_VENDOR_ADMTEK=y
-CONFIG_ADM8211=m
-CONFIG_ATH_COMMON=m
-CONFIG_WLAN_VENDOR_ATH=y
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-# CONFIG_ATH9K_AHB is not set
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DYNACK is not set
-CONFIG_ATH9K_WOW=y
-CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_PCI_NO_EEPROM=m
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_ATH9K_HWRNG=y
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-# CONFIG_CARL9170_DEBUGFS is not set
-CONFIG_CARL9170_WPC=y
-CONFIG_CARL9170_HWRNG=y
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-# CONFIG_ATH6KL_DEBUG is not set
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_WIL6210_DEBUGFS=y
-CONFIG_ATH10K=m
-CONFIG_ATH10K_CE=y
-CONFIG_ATH10K_PCI=m
-CONFIG_ATH10K_AHB=y
-# CONFIG_ATH10K_SDIO is not set
-CONFIG_ATH10K_USB=m
-# CONFIG_ATH10K_DEBUG is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_WCN36XX=m
-# CONFIG_WCN36XX_DEBUGFS is not set
-CONFIG_WLAN_VENDOR_ATMEL=y
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-# CONFIG_PCMCIA_ATMEL is not set
-CONFIG_AT76C50X_USB=m
-CONFIG_WLAN_VENDOR_BROADCOM=y
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMFMAC_PCIE=y
-# CONFIG_BRCM_TRACING is not set
-# CONFIG_BRCMDBG is not set
-CONFIG_WLAN_VENDOR_CISCO=y
-CONFIG_AIRO=m
-CONFIG_AIRO_CS=m
-CONFIG_WLAN_VENDOR_INTEL=y
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-
-#
-# iwl3945 / iwl4965 Debugging Options
-#
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_IWLEGACY_DEBUGFS=y
-# end of iwl3945 / iwl4965 Debugging Options
-
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLDVM=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-CONFIG_IWLWIFI_BCAST_FILTERING=y
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-# CONFIG_IWLWIFI_DEBUGFS is not set
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
-# end of Debugging Options
-
-CONFIG_WLAN_VENDOR_INTERSIL=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_APPLE_AIRPORT=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_SPI=m
-# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
-CONFIG_P54_LEDS=y
-CONFIG_PRISM54=m
-CONFIG_WLAN_VENDOR_MARVELL=y
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_MWL8K=m
-CONFIG_WLAN_VENDOR_MEDIATEK=y
-CONFIG_MT7601U=m
-CONFIG_MT76_CORE=m
-CONFIG_MT76_LEDS=y
-CONFIG_MT76_USB=m
-CONFIG_MT76_SDIO=m
-CONFIG_MT76x02_LIB=m
-CONFIG_MT76x02_USB=m
-CONFIG_MT76x0_COMMON=m
-CONFIG_MT76x0U=m
-CONFIG_MT76x0E=m
-CONFIG_MT76x2_COMMON=m
-CONFIG_MT76x2E=m
-CONFIG_MT76x2U=m
-CONFIG_MT7603E=m
-CONFIG_MT7615_COMMON=m
-CONFIG_MT7615E=m
-CONFIG_MT7663_USB_SDIO_COMMON=m
-CONFIG_MT7663U=m
-CONFIG_MT7663S=m
-CONFIG_MT7915E=m
-CONFIG_WLAN_VENDOR_MICROCHIP=y
-CONFIG_WILC1000=m
-CONFIG_WILC1000_SDIO=m
-# CONFIG_WILC1000_SPI is not set
-# CONFIG_WILC1000_HW_OOB_INTR is not set
-CONFIG_WLAN_VENDOR_RALINK=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_LIB_DEBUGFS is not set
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WLAN_VENDOR_REALTEK=y
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8821AE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-CONFIG_RTLWIFI_DEBUG=y
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL8XXXU=m
-# CONFIG_RTL8XXXU_UNTESTED is not set
-CONFIG_RTW88=m
-CONFIG_RTW88_CORE=m
-CONFIG_RTW88_PCI=m
-CONFIG_RTW88_8822B=m
-CONFIG_RTW88_8822C=m
-CONFIG_RTW88_8723D=m
-CONFIG_RTW88_8821C=m
-CONFIG_RTW88_8822BE=m
-CONFIG_RTW88_8822CE=m
-CONFIG_RTW88_8723DE=m
-CONFIG_RTW88_8821CE=m
-# CONFIG_RTW88_DEBUG is not set
-# CONFIG_RTW88_DEBUGFS is not set
-CONFIG_WLAN_VENDOR_RSI=y
-CONFIG_RSI_91X=m
-CONFIG_RSI_DEBUGFS=y
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-CONFIG_RSI_COEX=y
-CONFIG_WLAN_VENDOR_ST=y
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CW1200_WLAN_SPI=m
-CONFIG_WLAN_VENDOR_TI=y
-CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SPI=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_WLAN_VENDOR_ZYDAS=y
-CONFIG_USB_ZD1201=m
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_WLAN_VENDOR_QUANTENNA=y
-CONFIG_QTNFMAC=m
-CONFIG_QTNFMAC_PCIE=m
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_WL3501=m
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_VIRT_WIFI=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-# end of WiMAX Wireless Broadband devices
-
-# CONFIG_WAN is not set
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKELB=m
-CONFIG_IEEE802154_AT86RF230=m
-# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
-CONFIG_IEEE802154_MRF24J40=m
-# CONFIG_IEEE802154_CC2520 is not set
-CONFIG_IEEE802154_ATUSB=m
-CONFIG_IEEE802154_ADF7242=m
-CONFIG_IEEE802154_CA8210=m
-# CONFIG_IEEE802154_CA8210_DEBUGFS is not set
-# CONFIG_IEEE802154_MCR20A is not set
-CONFIG_IEEE802154_HWSIM=m
-# CONFIG_VMXNET3 is not set
-CONFIG_USB4_NET=m
-# CONFIG_NETDEVSIM is not set
-CONFIG_NET_FAILOVER=m
-# CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_LEDS=m
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADC=m
-# CONFIG_KEYBOARD_ADP5520 is not set
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_QT1050=m
-CONFIG_KEYBOARD_QT1070=m
-CONFIG_KEYBOARD_QT2160=m
-# CONFIG_KEYBOARD_DLINK_DIR685 is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_GPIO_POLLED=m
-CONFIG_KEYBOARD_TCA6416=m
-CONFIG_KEYBOARD_TCA8418=m
-CONFIG_KEYBOARD_MATRIX=m
-CONFIG_KEYBOARD_LM8323=m
-CONFIG_KEYBOARD_LM8333=m
-CONFIG_KEYBOARD_MAX7359=m
-CONFIG_KEYBOARD_MCS=m
-CONFIG_KEYBOARD_MPR121=m
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_OPENCORES=m
-CONFIG_KEYBOARD_SAMSUNG=m
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-CONFIG_KEYBOARD_STMPE=m
-# CONFIG_KEYBOARD_IQS62X is not set
-CONFIG_KEYBOARD_OMAP4=m
-CONFIG_KEYBOARD_TC3589X=m
-CONFIG_KEYBOARD_TM2_TOUCHKEY=m
-# CONFIG_KEYBOARD_TWL4030 is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_KEYBOARD_CAP11XX=m
-CONFIG_KEYBOARD_BCM=m
-# CONFIG_KEYBOARD_MTK_PMIC is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_BYD=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
-CONFIG_MOUSE_PS2_CYPRESS=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_PS2_FOCALTECH=y
-CONFIG_MOUSE_PS2_SMBUS=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=m
-CONFIG_JOYSTICK_IFORCE_232=m
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-CONFIG_JOYSTICK_PXRC=m
-CONFIG_JOYSTICK_FSIA6B=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_PEGASUS=m
-CONFIG_TABLET_SERIAL_WACOM4=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_PROPERTIES=y
-# CONFIG_TOUCHSCREEN_88PM860X is not set
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879_SPI=m
-CONFIG_TOUCHSCREEN_ADC=m
-CONFIG_TOUCHSCREEN_AR1021_I2C=m
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
-CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_BU21029=m
-CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
-CONFIG_TOUCHSCREEN_CY8CTMA140=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
-CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
-CONFIG_TOUCHSCREEN_DA9034=m
-CONFIG_TOUCHSCREEN_DA9052=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_EGALAX=m
-CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
-CONFIG_TOUCHSCREEN_EXC3000=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GOODIX=m
-CONFIG_TOUCHSCREEN_HIDEEP=m
-CONFIG_TOUCHSCREEN_ILI210X=m
-CONFIG_TOUCHSCREEN_S6SY761=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_EKTF2127=m
-CONFIG_TOUCHSCREEN_ELAN=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_WACOM_I2C=m
-CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MMS114=m
-CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
-# CONFIG_TOUCHSCREEN_UCB1400 is not set
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
-# CONFIG_TOUCHSCREEN_WM831X is not set
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-CONFIG_TOUCHSCREEN_TSC200X_CORE=m
-CONFIG_TOUCHSCREEN_TSC2004=m
-CONFIG_TOUCHSCREEN_TSC2005=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
-# CONFIG_TOUCHSCREEN_PCAP is not set
-CONFIG_TOUCHSCREEN_RM_TS=m
-CONFIG_TOUCHSCREEN_SILEAD=m
-CONFIG_TOUCHSCREEN_SIS_I2C=m
-CONFIG_TOUCHSCREEN_ST1232=m
-# CONFIG_TOUCHSCREEN_STMFTS is not set
-CONFIG_TOUCHSCREEN_STMPE=m
-CONFIG_TOUCHSCREEN_SUR40=m
-CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
-CONFIG_TOUCHSCREEN_SX8654=m
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_TOUCHSCREEN_ZET6223=m
-CONFIG_TOUCHSCREEN_ZFORCE=m
-CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
-CONFIG_TOUCHSCREEN_ROHM_BU21023=m
-CONFIG_TOUCHSCREEN_IQS5XX=m
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_88PM860X_ONKEY is not set
-# CONFIG_INPUT_88PM80X_ONKEY is not set
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
-CONFIG_INPUT_ARIZONA_HAPTICS=m
-CONFIG_INPUT_ATMEL_CAPTOUCH=m
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_E3X0_BUTTON=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MAX77650_ONKEY=m
-CONFIG_INPUT_MAX77693_HAPTIC=m
-# CONFIG_INPUT_MAX8925_ONKEY is not set
-# CONFIG_INPUT_MAX8997_HAPTIC is not set
-CONFIG_INPUT_MC13783_PWRBUTTON=m
-CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_GPIO_BEEPER=m
-CONFIG_INPUT_GPIO_DECODER=m
-CONFIG_INPUT_GPIO_VIBRA=m
-CONFIG_INPUT_CPCAP_PWRBUTTON=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_REGULATOR_HAPTIC=m
-CONFIG_INPUT_RETU_PWRBUTTON=m
-CONFIG_INPUT_TPS65218_PWRBUTTON=m
-CONFIG_INPUT_AXP20X_PEK=m
-# CONFIG_INPUT_TWL4030_PWRBUTTON is not set
-# CONFIG_INPUT_TWL4030_VIBRA is not set
-# CONFIG_INPUT_TWL6040_VIBRA is not set
-CONFIG_INPUT_UINPUT=m
-# CONFIG_INPUT_PALMAS_PWRBUTTON is not set
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_PWM_BEEPER=m
-CONFIG_INPUT_PWM_VIBRA=m
-CONFIG_INPUT_RK805_PWRKEY=m
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-CONFIG_INPUT_DA9052_ONKEY=m
-# CONFIG_INPUT_DA9055_ONKEY is not set
-CONFIG_INPUT_DA9063_ONKEY=m
-# CONFIG_INPUT_WM831X_ON is not set
-# CONFIG_INPUT_PCAP is not set
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
-CONFIG_INPUT_IMS_PCU=m
-CONFIG_INPUT_IQS269A=m
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
-CONFIG_INPUT_DRV260X_HAPTICS=m
-CONFIG_INPUT_DRV2665_HAPTICS=m
-CONFIG_INPUT_DRV2667_HAPTICS=m
-CONFIG_INPUT_STPMIC1_ONKEY=m
-CONFIG_RMI4_CORE=m
-CONFIG_RMI4_I2C=m
-CONFIG_RMI4_SPI=m
-CONFIG_RMI4_SMB=m
-CONFIG_RMI4_F03=y
-CONFIG_RMI4_F03_SERIO=m
-CONFIG_RMI4_2D_SENSOR=y
-CONFIG_RMI4_F11=y
-CONFIG_RMI4_F12=y
-CONFIG_RMI4_F30=y
-CONFIG_RMI4_F34=y
-# CONFIG_RMI4_F54 is not set
-CONFIG_RMI4_F55=y
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_XILINX_XPS_PS2=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-CONFIG_SERIO_ARC_PS2=m
-CONFIG_SERIO_APBPS2=m
-CONFIG_SERIO_GPIO_PS2=m
-CONFIG_USERIO=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_LDISC_AUTOLOAD=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=m
-CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
-# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
-CONFIG_SERIAL_8250_FINTEK=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_PCI=m
-CONFIG_SERIAL_8250_EXAR=m
-# CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_MEN_MCB=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_ASPEED_VUART=m
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_8250_DWLIB=y
-CONFIG_SERIAL_8250_DW=m
-CONFIG_SERIAL_8250_RT288X=y
-CONFIG_SERIAL_OF_PLATFORM=m
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_MAX3100=m
-CONFIG_SERIAL_MAX310X=y
-CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_UARTLITE_NR_UARTS=1
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_PMACZILOG=m
-CONFIG_SERIAL_PMACZILOG_TTYS=y
-CONFIG_SERIAL_ICOM=m
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_SIFIVE=m
-CONFIG_SERIAL_QE=m
-CONFIG_SERIAL_SCCNXP=y
-CONFIG_SERIAL_SCCNXP_CONSOLE=y
-# CONFIG_SERIAL_SC16IS7XX is not set
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_IFX6X60=m
-CONFIG_SERIAL_XILINX_PS_UART=m
-CONFIG_SERIAL_ARC=m
-CONFIG_SERIAL_ARC_NR_PORTS=1
-CONFIG_SERIAL_RP2=m
-CONFIG_SERIAL_RP2_NR_UARTS=32
-CONFIG_SERIAL_FSL_LPUART=m
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
-CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
-# CONFIG_SERIAL_MEN_Z135 is not set
-CONFIG_SERIAL_SPRD=m
-# end of Serial drivers
-
-CONFIG_SERIAL_MCTRL_GPIO=m
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_ISI=m
-CONFIG_N_HDLC=m
-# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
-CONFIG_N_GSM=m
-CONFIG_NOZOMI=m
-CONFIG_NULL_TTY=m
-CONFIG_TRACE_ROUTER=m
-CONFIG_TRACE_SINK=m
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_CONSOLE=y
-CONFIG_HVC_OLD_HVSI=y
-CONFIG_HVC_OPAL=y
-CONFIG_HVC_RTAS=y
-# CONFIG_HVC_UDBG is not set
-CONFIG_HVCS=m
-CONFIG_SERIAL_DEV_BUS=m
-CONFIG_TTY_PRINTK=m
-CONFIG_TTY_PRINTK_LEVEL=6
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IBM_BSR=m
-CONFIG_POWERNV_OP_PANEL=m
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_PLAT_DATA=y
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_SSIF=m
-CONFIG_IPMI_POWERNV=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-# CONFIG_IPMB_DEVICE_INTERFACE is not set
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_BA431=m
-CONFIG_HW_RANDOM_PASEMI=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_PSERIES=m
-CONFIG_HW_RANDOM_POWERNV=m
-CONFIG_HW_RANDOM_CCTRNG=m
-CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_SCR24X=m
-CONFIG_IPWIRELESS=m
-# end of PCMCIA character devices
-
-CONFIG_DEVMEM=y
-# CONFIG_DEVKMEM is not set
-CONFIG_NVRAM=y
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
-CONFIG_DEVPORT=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_HW_RANDOM_TPM=y
-CONFIG_TCG_TIS_CORE=m
-CONFIG_TCG_TIS=m
-CONFIG_TCG_TIS_SPI=m
-CONFIG_TCG_TIS_SPI_CR50=y
-CONFIG_TCG_TIS_I2C_ATMEL=m
-CONFIG_TCG_TIS_I2C_INFINEON=m
-CONFIG_TCG_TIS_I2C_NUVOTON=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_IBMVTPM=m
-CONFIG_TCG_VTPM_PROXY=m
-CONFIG_TCG_TIS_ST33ZP24=m
-CONFIG_TCG_TIS_ST33ZP24_I2C=m
-CONFIG_TCG_TIS_ST33ZP24_SPI=m
-CONFIG_XILLYBUS=m
-CONFIG_XILLYBUS_PCIE=m
-CONFIG_XILLYBUS_OF=m
-# end of Character devices
-
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_ARB_GPIO_CHALLENGE=m
-CONFIG_I2C_MUX_GPIO=m
-CONFIG_I2C_MUX_GPMUX=m
-# CONFIG_I2C_MUX_LTC4306 is not set
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_MUX_REG=m
-CONFIG_I2C_DEMUX_PINCTRL=m
-CONFIG_I2C_MUX_MLXCPLD=m
-# end of Multiplexer I2C Chip support
-
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_I801 is not set
-CONFIG_I2C_ISCH=m
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_NFORCE2 is not set
-CONFIG_I2C_NVIDIA_GPU=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# Mac SMBus host controller drivers
-#
-CONFIG_I2C_POWERMAC=y
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_CBUS_GPIO=m
-CONFIG_I2C_DESIGNWARE_CORE=m
-# CONFIG_I2C_DESIGNWARE_SLAVE is not set
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_EMEV2=m
-CONFIG_I2C_GPIO=m
-# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
-CONFIG_I2C_KEMPLD=m
-CONFIG_I2C_MPC=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PASEMI=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_RK3X=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_XILINX=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_DLN2=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_ROBOTFUZZ_OSIF=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIPERBOARD=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_OPAL=y
-CONFIG_I2C_FSI=m
-# end of I2C Hardware Bus support
-
-# CONFIG_I2C_STUB is not set
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SLAVE_EEPROM=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-CONFIG_I3C=m
-CONFIG_CDNS_I3C_MASTER=m
-CONFIG_DW_I3C_MASTER=m
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_MEM=y
-
-#
-# SPI Master Controller Drivers
-#
-CONFIG_SPI_ALTERA=m
-CONFIG_SPI_AXI_SPI_ENGINE=m
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-CONFIG_SPI_CADENCE=m
-CONFIG_SPI_DESIGNWARE=m
-CONFIG_SPI_DW_DMA=y
-CONFIG_SPI_DW_PCI=m
-CONFIG_SPI_DW_MMIO=m
-CONFIG_SPI_DLN2=m
-CONFIG_SPI_FSI=m
-CONFIG_SPI_NXP_FLEXSPI=m
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_LM70_LLP=m
-CONFIG_SPI_FSL_LIB=y
-CONFIG_SPI_FSL_SPI=y
-CONFIG_SPI_OC_TINY=m
-CONFIG_SPI_PXA2XX=m
-CONFIG_SPI_PXA2XX_PCI=m
-CONFIG_SPI_ROCKCHIP=m
-CONFIG_SPI_SC18IS602=m
-CONFIG_SPI_SIFIVE=m
-CONFIG_SPI_MXIC=m
-CONFIG_SPI_XCOMM=m
-CONFIG_SPI_XILINX=m
-CONFIG_SPI_ZYNQMP_GQSPI=m
-CONFIG_SPI_AMD=m
-
-#
-# SPI Multiplexer support
-#
-CONFIG_SPI_MUX=m
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_LOOPBACK_TEST=m
-CONFIG_SPI_TLE62X0=m
-CONFIG_SPI_SLAVE=y
-CONFIG_SPI_SLAVE_TIME=m
-CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
-CONFIG_SPI_DYNAMIC=y
-CONFIG_SPMI=m
-CONFIG_HSI=m
-CONFIG_HSI_BOARDINFO=y
-
-#
-# HSI controllers
-#
-
-#
-# HSI clients
-#
-CONFIG_HSI_CHAR=m
-CONFIG_PPS=y
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-CONFIG_PPS_CLIENT_KTIMER=m
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
-CONFIG_PPS_CLIENT_GPIO=m
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=y
-CONFIG_PTP_1588_CLOCK_QORIQ=m
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-CONFIG_PTP_1588_CLOCK_IDT82P33=m
-CONFIG_PTP_1588_CLOCK_IDTCM=m
-# end of PTP clock support
-
-CONFIG_PINCTRL=y
-CONFIG_GENERIC_PINCTRL_GROUPS=y
-CONFIG_PINMUX=y
-CONFIG_GENERIC_PINMUX_FUNCTIONS=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
-CONFIG_PINCTRL_AS3722=y
-CONFIG_PINCTRL_AXP209=m
-CONFIG_PINCTRL_DA9062=m
-CONFIG_PINCTRL_MCP23S08_I2C=m
-CONFIG_PINCTRL_MCP23S08_SPI=m
-CONFIG_PINCTRL_MCP23S08=m
-CONFIG_PINCTRL_SINGLE=y
-CONFIG_PINCTRL_SX150X=y
-CONFIG_PINCTRL_STMFX=m
-CONFIG_PINCTRL_MAX77620=m
-CONFIG_PINCTRL_PALMAS=m
-CONFIG_PINCTRL_RK805=m
-# CONFIG_PINCTRL_OCELOT is not set
-CONFIG_PINCTRL_MADERA=m
-CONFIG_PINCTRL_CS47L35=y
-CONFIG_PINCTRL_CS47L85=y
-CONFIG_PINCTRL_CS47L90=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIOLIB_FASTPATH_LIMIT=512
-CONFIG_OF_GPIO=y
-CONFIG_GPIOLIB_IRQCHIP=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO drivers
-#
-CONFIG_GPIO_74XX_MMIO=m
-CONFIG_GPIO_ALTERA=m
-CONFIG_GPIO_CADENCE=m
-CONFIG_GPIO_DWAPB=m
-CONFIG_GPIO_EXAR=m
-CONFIG_GPIO_FTGPIO010=y
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_GRGPIO=m
-CONFIG_GPIO_HLWD=m
-CONFIG_GPIO_LOGICVC=m
-CONFIG_GPIO_MB86S7X=m
-CONFIG_GPIO_MENZ127=m
-CONFIG_GPIO_SAMA5D2_PIOBU=m
-# CONFIG_GPIO_SIFIVE is not set
-CONFIG_GPIO_SYSCON=m
-CONFIG_GPIO_XILINX=y
-CONFIG_GPIO_AMD_FCH=m
-# end of Memory mapped GPIO drivers
-
-#
-# I2C GPIO expanders
-#
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_ADNP=m
-CONFIG_GPIO_GW_PLD=m
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCA953X_IRQ=y
-CONFIG_GPIO_PCA9570=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_TPIC2810=m
-# end of I2C GPIO expanders
-
-#
-# MFD GPIO expanders
-#
-CONFIG_GPIO_ADP5520=m
-CONFIG_GPIO_ARIZONA=m
-CONFIG_GPIO_BD9571MWV=m
-CONFIG_GPIO_DA9052=m
-CONFIG_GPIO_DA9055=m
-CONFIG_GPIO_DLN2=m
-CONFIG_GPIO_JANZ_TTL=m
-CONFIG_GPIO_KEMPLD=m
-CONFIG_GPIO_LP3943=m
-CONFIG_GPIO_LP873X=m
-CONFIG_GPIO_LP87565=m
-CONFIG_GPIO_MADERA=m
-CONFIG_GPIO_MAX77620=m
-CONFIG_GPIO_MAX77650=m
-CONFIG_GPIO_PALMAS=y
-CONFIG_GPIO_RC5T583=y
-CONFIG_GPIO_STMPE=y
-CONFIG_GPIO_TC3589X=y
-CONFIG_GPIO_TPS65086=m
-CONFIG_GPIO_TPS65218=m
-CONFIG_GPIO_TPS6586X=y
-CONFIG_GPIO_TPS65910=y
-CONFIG_GPIO_TPS65912=m
-CONFIG_GPIO_TQMX86=m
-CONFIG_GPIO_TWL4030=m
-CONFIG_GPIO_TWL6040=m
-CONFIG_GPIO_UCB1400=m
-CONFIG_GPIO_WM831X=m
-CONFIG_GPIO_WM8350=m
-CONFIG_GPIO_WM8994=m
-# end of MFD GPIO expanders
-
-#
-# PCI GPIO expanders
-#
-CONFIG_GPIO_PCI_IDIO_16=m
-CONFIG_GPIO_PCIE_IDIO_24=m
-CONFIG_GPIO_RDC321X=m
-# end of PCI GPIO expanders
-
-#
-# SPI GPIO expanders
-#
-CONFIG_GPIO_74X164=m
-CONFIG_GPIO_MAX3191X=m
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_PISOSR=m
-CONFIG_GPIO_XRA1403=m
-# end of SPI GPIO expanders
-
-#
-# USB GPIO expanders
-#
-CONFIG_GPIO_VIPERBOARD=m
-# end of USB GPIO expanders
-
-CONFIG_GPIO_AGGREGATOR=m
-CONFIG_GPIO_MOCKUP=m
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS1WM=m
-CONFIG_W1_MASTER_GPIO=m
-CONFIG_W1_MASTER_SGI=m
-# end of 1-wire Bus Masters
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2405=m
-CONFIG_W1_SLAVE_DS2408=m
-CONFIG_W1_SLAVE_DS2408_READBACK=y
-CONFIG_W1_SLAVE_DS2413=m
-CONFIG_W1_SLAVE_DS2406=m
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2805=m
-CONFIG_W1_SLAVE_DS2430=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-# CONFIG_W1_SLAVE_DS2433_CRC is not set
-CONFIG_W1_SLAVE_DS2438=m
-CONFIG_W1_SLAVE_DS250X=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_DS2781=m
-CONFIG_W1_SLAVE_DS28E04=m
-CONFIG_W1_SLAVE_DS28E17=m
-# end of 1-wire Slaves
-
-CONFIG_POWER_AVS=y
-# CONFIG_QCOM_CPR is not set
-CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_AS3722=y
-CONFIG_POWER_RESET_GPIO=y
-CONFIG_POWER_RESET_GPIO_RESTART=y
-CONFIG_POWER_RESET_LTC2952=y
-# CONFIG_POWER_RESET_MT6323 is not set
-CONFIG_POWER_RESET_RESTART=y
-CONFIG_POWER_RESET_SYSCON=y
-CONFIG_POWER_RESET_SYSCON_POWEROFF=y
-CONFIG_REBOOT_MODE=m
-CONFIG_SYSCON_REBOOT_MODE=m
-# CONFIG_NVMEM_REBOOT_MODE is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_POWER_SUPPLY_HWMON=y
-CONFIG_PDA_POWER=m
-CONFIG_GENERIC_ADC_BATTERY=m
-# CONFIG_MAX8925_POWER is not set
-# CONFIG_WM831X_BACKUP is not set
-# CONFIG_WM831X_POWER is not set
-# CONFIG_WM8350_POWER is not set
-CONFIG_TEST_POWER=m
-# CONFIG_BATTERY_88PM860X is not set
-CONFIG_CHARGER_ADP5061=m
-CONFIG_BATTERY_ACT8945A=m
-CONFIG_BATTERY_CPCAP=m
-CONFIG_BATTERY_CW2015=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2780=m
-CONFIG_BATTERY_DS2781=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_LEGO_EV3=m
-CONFIG_BATTERY_SBS=m
-CONFIG_CHARGER_SBS=m
-CONFIG_MANAGER_SBS=m
-CONFIG_BATTERY_BQ27XXX=m
-CONFIG_BATTERY_BQ27XXX_I2C=m
-CONFIG_BATTERY_BQ27XXX_HDQ=m
-# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
-# CONFIG_BATTERY_DA9030 is not set
-CONFIG_BATTERY_DA9052=m
-CONFIG_CHARGER_DA9150=m
-CONFIG_BATTERY_DA9150=m
-# CONFIG_CHARGER_AXP20X is not set
-# CONFIG_BATTERY_AXP20X is not set
-CONFIG_AXP20X_POWER=m
-CONFIG_AXP288_FUEL_GAUGE=m
-CONFIG_BATTERY_MAX17040=m
-CONFIG_BATTERY_MAX17042=m
-CONFIG_BATTERY_MAX1721X=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_CHARGER_ISP1704=m
-CONFIG_CHARGER_MAX8903=m
-# CONFIG_CHARGER_TWL4030 is not set
-CONFIG_CHARGER_LP8727=m
-CONFIG_CHARGER_GPIO=m
-CONFIG_CHARGER_MANAGER=y
-CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_MAX14577 is not set
-CONFIG_CHARGER_DETECTOR_MAX14656=m
-CONFIG_CHARGER_MAX77650=m
-# CONFIG_CHARGER_MAX77693 is not set
-# CONFIG_CHARGER_MAX8997 is not set
-# CONFIG_CHARGER_MAX8998 is not set
-CONFIG_CHARGER_MP2629=m
-CONFIG_CHARGER_BQ2415X=m
-CONFIG_CHARGER_BQ24190=m
-CONFIG_CHARGER_BQ24257=m
-CONFIG_CHARGER_BQ24735=m
-CONFIG_CHARGER_BQ2515X=m
-CONFIG_CHARGER_BQ25890=m
-CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65090 is not set
-CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_BATTERY_RT5033=m
-CONFIG_CHARGER_RT9455=m
-CONFIG_CHARGER_UCS1002=m
-CONFIG_CHARGER_BD99954=m
-CONFIG_HWMON=y
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_AD7314=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM1177=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_ADT7310=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_AS370=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_AXI_FAN_CONTROL=m
-CONFIG_SENSORS_ASPEED=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_CORSAIR_CPRO=m
-CONFIG_SENSORS_DRIVETEMP=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DA9052_ADC=m
-# CONFIG_SENSORS_DA9055 is not set
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_GSC=m
-CONFIG_SENSORS_MC13783_ADC=m
-CONFIG_SENSORS_FTSTEUTATES=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_HIH6130=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IBMPOWERNV=m
-CONFIG_SENSORS_IIO_HWMON=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC2947=m
-CONFIG_SENSORS_LTC2947_I2C=m
-CONFIG_SENSORS_LTC2947_SPI=m
-CONFIG_SENSORS_LTC2990=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX1111=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX31722=m
-CONFIG_SENSORS_MAX31730=m
-CONFIG_SENSORS_MAX6621=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_TC654=m
-CONFIG_SENSORS_MENF21BMC_HWMON=m
-CONFIG_SENSORS_ADCXX=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM70=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_NPCM7XX=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_BEL_PFE=m
-CONFIG_SENSORS_IBM_CFFPS=m
-CONFIG_SENSORS_INSPUR_IPSPS=m
-# CONFIG_SENSORS_IR35221 is not set
-CONFIG_SENSORS_IR38064=m
-# CONFIG_SENSORS_IRPS5401 is not set
-CONFIG_SENSORS_ISL68137=m
-CONFIG_SENSORS_LM25066=m
-# CONFIG_SENSORS_LTC2978 is not set
-CONFIG_SENSORS_LTC3815=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX16601=m
-CONFIG_SENSORS_MAX20730=m
-CONFIG_SENSORS_MAX20751=m
-CONFIG_SENSORS_MAX31785=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-# CONFIG_SENSORS_PXE1610 is not set
-# CONFIG_SENSORS_TPS40422 is not set
-CONFIG_SENSORS_TPS53679=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_XDPE122=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_PWM_FAN=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHT3x=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_STTS751=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_INA209=m
-CONFIG_SENSORS_INA2XX=m
-CONFIG_SENSORS_INA3221=m
-CONFIG_SENSORS_TC74=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-CONFIG_SENSORS_TMP108=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_TMP513=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83773G=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_WM831X=m
-# CONFIG_SENSORS_WM8350 is not set
-CONFIG_THERMAL=y
-CONFIG_THERMAL_NETLINK=y
-CONFIG_THERMAL_STATISTICS=y
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_OF=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
-CONFIG_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-CONFIG_CPU_THERMAL=y
-CONFIG_CPU_FREQ_THERMAL=y
-# CONFIG_CPU_IDLE_THERMAL is not set
-CONFIG_DEVFREQ_THERMAL=y
-CONFIG_THERMAL_EMULATION=y
-CONFIG_THERMAL_MMIO=m
-CONFIG_MAX77620_THERMAL=m
-CONFIG_DA9062_THERMAL=m
-# CONFIG_TI_SOC_THERMAL is not set
-CONFIG_GENERIC_ADC_THERMAL=m
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
-CONFIG_WATCHDOG_OPEN_TIMEOUT=0
-CONFIG_WATCHDOG_SYSFS=y
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_DA9052_WATCHDOG=m
-# CONFIG_DA9055_WATCHDOG is not set
-# CONFIG_DA9063_WATCHDOG is not set
-CONFIG_DA9062_WATCHDOG=m
-CONFIG_GPIO_WATCHDOG=m
-CONFIG_MENF21BMC_WATCHDOG=m
-# CONFIG_MENZ069_WATCHDOG is not set
-CONFIG_WM831X_WATCHDOG=m
-# CONFIG_WM8350_WATCHDOG is not set
-CONFIG_XILINX_WATCHDOG=m
-CONFIG_ZIIRAVE_WATCHDOG=m
-CONFIG_CADENCE_WATCHDOG=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_RN5T618_WATCHDOG=m
-# CONFIG_TWL4030_WATCHDOG is not set
-CONFIG_MAX63XX_WATCHDOG=m
-CONFIG_MAX77620_WATCHDOG=m
-CONFIG_RETU_WATCHDOG=m
-CONFIG_STPMIC1_WATCHDOG=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_KEMPLD_WDT=m
-CONFIG_MEN_A21_WDT=m
-CONFIG_WATCHDOG_RTAS=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_DRIVER_GPIO=y
-CONFIG_BCMA_POSSIBLE=y
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_SOC=y
-CONFIG_BCMA_DRIVER_PCI=y
-CONFIG_BCMA_SFLASH=y
-CONFIG_BCMA_DRIVER_GMAC_CMN=y
-CONFIG_BCMA_DRIVER_GPIO=y
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-CONFIG_MFD_ACT8945A=m
-CONFIG_MFD_AS3711=y
-CONFIG_MFD_AS3722=y
-CONFIG_PMIC_ADP5520=y
-CONFIG_MFD_AAT2870_CORE=y
-CONFIG_MFD_ATMEL_FLEXCOM=m
-CONFIG_MFD_ATMEL_HLCDC=m
-CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_BD9571MWV=m
-CONFIG_MFD_AXP20X=m
-CONFIG_MFD_AXP20X_I2C=m
-CONFIG_MFD_MADERA=m
-CONFIG_MFD_MADERA_I2C=m
-CONFIG_MFD_MADERA_SPI=m
-# CONFIG_MFD_CS47L15 is not set
-CONFIG_MFD_CS47L35=y
-CONFIG_MFD_CS47L85=y
-CONFIG_MFD_CS47L90=y
-# CONFIG_MFD_CS47L92 is not set
-CONFIG_PMIC_DA903X=y
-CONFIG_PMIC_DA9052=y
-CONFIG_MFD_DA9052_SPI=y
-CONFIG_MFD_DA9052_I2C=y
-CONFIG_MFD_DA9055=y
-CONFIG_MFD_DA9062=m
-CONFIG_MFD_DA9063=m
-CONFIG_MFD_DA9150=m
-CONFIG_MFD_DLN2=m
-CONFIG_MFD_GATEWORKS_GSC=m
-CONFIG_MFD_MC13XXX=m
-CONFIG_MFD_MC13XXX_SPI=m
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_MFD_MP2629=m
-CONFIG_MFD_HI6421_PMIC=m
-CONFIG_HTC_PASIC3=m
-CONFIG_HTC_I2CPLD=y
-CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
-CONFIG_MFD_IQS62X=m
-CONFIG_MFD_JANZ_CMODIO=m
-CONFIG_MFD_KEMPLD=m
-CONFIG_MFD_88PM800=m
-CONFIG_MFD_88PM805=m
-CONFIG_MFD_88PM860X=y
-CONFIG_MFD_MAX14577=m
-CONFIG_MFD_MAX77620=y
-CONFIG_MFD_MAX77650=m
-CONFIG_MFD_MAX77686=y
-CONFIG_MFD_MAX77693=m
-CONFIG_MFD_MAX77843=y
-CONFIG_MFD_MAX8907=m
-CONFIG_MFD_MAX8925=y
-CONFIG_MFD_MAX8997=y
-CONFIG_MFD_MAX8998=y
-CONFIG_MFD_MT6360=m
-CONFIG_MFD_MT6397=m
-CONFIG_MFD_MENF21BMC=m
-CONFIG_EZX_PCAP=y
-CONFIG_MFD_CPCAP=m
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_RT5033=m
-CONFIG_MFD_RC5T583=y
-CONFIG_MFD_RK808=m
-CONFIG_MFD_RN5T618=m
-# CONFIG_MFD_SEC_CORE is not set
-CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
-CONFIG_MFD_SKY81452=m
-CONFIG_ABX500_CORE=y
-CONFIG_AB3100_CORE=y
-CONFIG_AB3100_OTP=m
-CONFIG_MFD_STMPE=y
-
-#
-# STMicroelectronics STMPE Interface Drivers
-#
-CONFIG_STMPE_I2C=y
-CONFIG_STMPE_SPI=y
-# end of STMicroelectronics STMPE Interface Drivers
-
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_MFD_LP3943=m
-CONFIG_MFD_LP8788=y
-CONFIG_MFD_TI_LMU=m
-CONFIG_MFD_PALMAS=y
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_MFD_TPS65086=m
-CONFIG_MFD_TPS65090=y
-# CONFIG_MFD_TPS65217 is not set
-CONFIG_MFD_TI_LP873X=m
-CONFIG_MFD_TI_LP87565=m
-CONFIG_MFD_TPS65218=m
-CONFIG_MFD_TPS6586X=y
-CONFIG_MFD_TPS65910=y
-CONFIG_MFD_TPS65912=y
-CONFIG_MFD_TPS65912_I2C=y
-CONFIG_MFD_TPS65912_SPI=y
-CONFIG_MFD_TPS80031=y
-CONFIG_TWL4030_CORE=y
-CONFIG_MFD_TWL4030_AUDIO=y
-CONFIG_TWL6040_CORE=y
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MFD_LM3533=m
-CONFIG_MFD_TC3589X=y
-CONFIG_MFD_TQMX86=m
-CONFIG_MFD_VX855=m
-# CONFIG_MFD_LOCHNAGAR is not set
-CONFIG_MFD_ARIZONA=y
-CONFIG_MFD_ARIZONA_I2C=m
-CONFIG_MFD_ARIZONA_SPI=m
-CONFIG_MFD_CS47L24=y
-CONFIG_MFD_WM5102=y
-CONFIG_MFD_WM5110=y
-CONFIG_MFD_WM8997=y
-CONFIG_MFD_WM8998=y
-CONFIG_MFD_WM8400=y
-CONFIG_MFD_WM831X=y
-CONFIG_MFD_WM831X_I2C=y
-CONFIG_MFD_WM831X_SPI=y
-CONFIG_MFD_WM8350=y
-CONFIG_MFD_WM8350_I2C=y
-CONFIG_MFD_WM8994=m
-# CONFIG_MFD_ROHM_BD718XX is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
-# CONFIG_MFD_ROHM_BD71828 is not set
-CONFIG_MFD_STPMIC1=m
-CONFIG_MFD_STMFX=m
-# CONFIG_RAVE_SP_CORE is not set
-# end of Multifunction device drivers
-
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
-CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-CONFIG_REGULATOR_88PG86X=m
-CONFIG_REGULATOR_88PM800=m
-CONFIG_REGULATOR_88PM8607=m
-CONFIG_REGULATOR_ACT8865=m
-CONFIG_REGULATOR_ACT8945A=m
-CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_AAT2870=m
-CONFIG_REGULATOR_AB3100=m
-CONFIG_REGULATOR_ARIZONA_LDO1=m
-CONFIG_REGULATOR_ARIZONA_MICSUPP=m
-CONFIG_REGULATOR_AS3711=m
-CONFIG_REGULATOR_AS3722=m
-CONFIG_REGULATOR_AXP20X=m
-CONFIG_REGULATOR_BCM590XX=m
-CONFIG_REGULATOR_BD9571MWV=m
-CONFIG_REGULATOR_CPCAP=m
-CONFIG_REGULATOR_DA903X=m
-CONFIG_REGULATOR_DA9052=m
-CONFIG_REGULATOR_DA9055=m
-CONFIG_REGULATOR_DA9062=m
-CONFIG_REGULATOR_DA9063=m
-CONFIG_REGULATOR_DA9210=m
-CONFIG_REGULATOR_DA9211=m
-CONFIG_REGULATOR_FAN53555=m
-CONFIG_REGULATOR_FAN53880=m
-CONFIG_REGULATOR_GPIO=m
-CONFIG_REGULATOR_HI6421=m
-CONFIG_REGULATOR_HI6421V530=m
-CONFIG_REGULATOR_ISL9305=m
-CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_LM363X=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_LP872X=m
-CONFIG_REGULATOR_LP873X=m
-CONFIG_REGULATOR_LP8755=m
-CONFIG_REGULATOR_LP87565=m
-CONFIG_REGULATOR_LP8788=m
-CONFIG_REGULATOR_LTC3589=m
-CONFIG_REGULATOR_LTC3676=m
-CONFIG_REGULATOR_MAX14577=m
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX77620=m
-CONFIG_REGULATOR_MAX77650=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8907=m
-CONFIG_REGULATOR_MAX8925=m
-CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_MAX8973=m
-CONFIG_REGULATOR_MAX8997=m
-CONFIG_REGULATOR_MAX8998=m
-CONFIG_REGULATOR_MAX77686=m
-CONFIG_REGULATOR_MAX77693=m
-CONFIG_REGULATOR_MAX77802=m
-CONFIG_REGULATOR_MAX77826=m
-CONFIG_REGULATOR_MC13XXX_CORE=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_MC13892=m
-CONFIG_REGULATOR_MCP16502=m
-CONFIG_REGULATOR_MP5416=m
-CONFIG_REGULATOR_MP8859=m
-CONFIG_REGULATOR_MP886X=m
-CONFIG_REGULATOR_MPQ7920=m
-CONFIG_REGULATOR_MT6311=m
-CONFIG_REGULATOR_MT6323=m
-CONFIG_REGULATOR_MT6358=m
-CONFIG_REGULATOR_MT6397=m
-CONFIG_REGULATOR_PALMAS=m
-CONFIG_REGULATOR_PCA9450=m
-CONFIG_REGULATOR_PCAP=m
-CONFIG_REGULATOR_PCF50633=m
-CONFIG_REGULATOR_PFUZE100=m
-CONFIG_REGULATOR_PV88060=m
-CONFIG_REGULATOR_PV88080=m
-CONFIG_REGULATOR_PV88090=m
-CONFIG_REGULATOR_PWM=m
-CONFIG_REGULATOR_QCOM_SPMI=m
-CONFIG_REGULATOR_QCOM_USB_VBUS=m
-CONFIG_REGULATOR_RC5T583=m
-CONFIG_REGULATOR_RK808=m
-CONFIG_REGULATOR_RN5T618=m
-CONFIG_REGULATOR_RT5033=m
-CONFIG_REGULATOR_SKY81452=m
-# CONFIG_REGULATOR_SLG51000 is not set
-CONFIG_REGULATOR_STPMIC1=m
-CONFIG_REGULATOR_SY8106A=m
-CONFIG_REGULATOR_SY8824X=m
-CONFIG_REGULATOR_SY8827N=m
-CONFIG_REGULATOR_TPS51632=m
-CONFIG_REGULATOR_TPS6105X=m
-CONFIG_REGULATOR_TPS62360=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_TPS65086=m
-CONFIG_REGULATOR_TPS65090=m
-CONFIG_REGULATOR_TPS65132=m
-CONFIG_REGULATOR_TPS65218=m
-CONFIG_REGULATOR_TPS6524X=m
-CONFIG_REGULATOR_TPS6586X=m
-CONFIG_REGULATOR_TPS65910=m
-CONFIG_REGULATOR_TPS65912=m
-CONFIG_REGULATOR_TPS80031=m
-CONFIG_REGULATOR_TWL4030=m
-CONFIG_REGULATOR_VCTRL=m
-CONFIG_REGULATOR_WM831X=m
-CONFIG_REGULATOR_WM8350=m
-CONFIG_REGULATOR_WM8400=m
-CONFIG_REGULATOR_WM8994=m
-CONFIG_REGULATOR_QCOM_LABIBB=m
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_LIRC=y
-CONFIG_RC_DECODERS=y
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_SHARP_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_XMP_DECODER=m
-CONFIG_IR_IMON_DECODER=m
-CONFIG_IR_RCMM_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_HIX5HD2=m
-CONFIG_IR_IMON=m
-CONFIG_IR_IMON_RAW=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_SPI=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_IGORPLUGUSB=m
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_IR_GPIO_TX=m
-CONFIG_IR_PWM_TX=m
-CONFIG_IR_SERIAL=m
-CONFIG_IR_SERIAL_TRANSMITTER=y
-# CONFIG_IR_SIR is not set
-CONFIG_RC_XBOX_DVD=m
-CONFIG_IR_TOY=m
-CONFIG_CEC_CORE=m
-CONFIG_CEC_NOTIFIER=y
-CONFIG_MEDIA_CEC_RC=y
-CONFIG_MEDIA_CEC_SUPPORT=y
-CONFIG_CEC_CH7322=m
-CONFIG_USB_PULSE8_CEC=m
-# CONFIG_USB_RAINSHADOW_CEC is not set
-CONFIG_MEDIA_SUPPORT=m
-# CONFIG_MEDIA_SUPPORT_FILTER is not set
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-
-#
-# Media device types
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_PLATFORM_SUPPORT=y
-CONFIG_MEDIA_TEST_SUPPORT=y
-# end of Media device types
-
-#
-# Media core support
-#
-CONFIG_VIDEO_DEV=m
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_DVB_CORE=m
-# end of Media core support
-
-#
-# Video4Linux options
-#
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L2_I2C=y
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_V4L2_FLASH_LED_CLASS=m
-CONFIG_V4L2_FWNODE=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-# end of Video4Linux options
-
-#
-# Media controller options
-#
-CONFIG_MEDIA_CONTROLLER_DVB=y
-# end of Media controller options
-
-#
-# Digital TV options
-#
-# CONFIG_DVB_MMAP is not set
-CONFIG_DVB_NET=y
-CONFIG_DVB_MAX_ADAPTERS=8
-CONFIG_DVB_DYNAMIC_MINORS=y
-# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
-# CONFIG_DVB_ULE_DEBUG is not set
-# end of Digital TV options
-
-#
-# Media drivers
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-# CONFIG_USB_GSPCA_DTCS033 is not set
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_VIDEO_USBTV=m
-
-#
-# Analog TV USB devices
-#
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_LOADER=m
-CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-
-#
-# Analog/digital TV USB devices
-#
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_AU0828_RC is not set
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_DIB3000MC=m
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-# CONFIG_DVB_USB_CXUSB_ANALOG is not set
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_USB_ZD1301=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-CONFIG_DVB_AS102=m
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-
-#
-# Software defined radio USB devices
-#
-CONFIG_USB_AIRSPY=m
-CONFIG_USB_HACKRF=m
-CONFIG_USB_MSI2500=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-# CONFIG_VIDEO_SOLO6X10 is not set
-CONFIG_VIDEO_TW5864=m
-CONFIG_VIDEO_TW68=m
-CONFIG_VIDEO_TW686X=m
-
-#
-# Media capture/analog TV support
-#
-CONFIG_VIDEO_IVTV=m
-# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
-CONFIG_VIDEO_IVTV_ALSA=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DT3155=m
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_ENABLE_VP3054=y
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_BT848=m
-CONFIG_DVB_BT8XX=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7134_GO7007=m
-CONFIG_VIDEO_SAA7164=m
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-CONFIG_DVB_PT3=m
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_DDBRIDGE=m
-# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
-CONFIG_DVB_SMIPCIE=m
-CONFIG_DVB_NETUP_UNIDVB=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_TEA575X=m
-CONFIG_RADIO_SI470X=m
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_SI4713=m
-CONFIG_PLATFORM_SI4713=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI476X=m
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_SHARK=m
-CONFIG_RADIO_SHARK2=m
-CONFIG_USB_KEENE=m
-CONFIG_USB_RAREMONO=m
-CONFIG_USB_MA901=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_WL1273=m
-CONFIG_RADIO_WL128X=m
-CONFIG_MEDIA_COMMON_OPTIONS=y
-
-#
-# common driver options
-#
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_V4L2=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_CAFE_CCIC=m
-# CONFIG_VIDEO_CADENCE is not set
-CONFIG_VIDEO_ASPEED=m
-CONFIG_VIDEO_MUX=m
-CONFIG_VIDEO_XILINX=m
-CONFIG_VIDEO_XILINX_CSI2RXSS=m
-CONFIG_VIDEO_XILINX_TPG=m
-CONFIG_VIDEO_XILINX_VTC=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
-CONFIG_DVB_PLATFORM_DRIVERS=y
-CONFIG_SDR_PLATFORM_DRIVERS=y
-
-#
-# MMC/SDIO DVB adapters
-#
-CONFIG_SMS_SDIO_DRV=m
-# CONFIG_V4L_TEST_DRIVERS is not set
-
-#
-# FireWire (IEEE 1394) Adapters
-#
-# CONFIG_DVB_FIREDTV is not set
-# end of Media drivers
-
-#
-# Media ancillary drivers
-#
-CONFIG_MEDIA_ATTACH=y
-
-#
-# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
-#
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-# CONFIG_VIDEO_TDA1997X is not set
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS3308=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-# CONFIG_VIDEO_TLV320AIC23B is not set
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-# end of Audio decoders, processors and mixers
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-# end of RDS decoders
-
-#
-# Video decoders
-#
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7183 is not set
-# CONFIG_VIDEO_ADV748X is not set
-# CONFIG_VIDEO_ADV7604 is not set
-# CONFIG_VIDEO_ADV7842 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_ML86V7667 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-CONFIG_VIDEO_SAA711X=m
-# CONFIG_VIDEO_TC358743 is not set
-# CONFIG_VIDEO_TVP514X is not set
-CONFIG_VIDEO_TVP5150=m
-# CONFIG_VIDEO_TVP7002 is not set
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-# CONFIG_VIDEO_TW9910 is not set
-# CONFIG_VIDEO_VPX3220 is not set
-CONFIG_VIDEO_MAX9286=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-# end of Video decoders
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV7393 is not set
-# CONFIG_VIDEO_AD9389B is not set
-# CONFIG_VIDEO_AK881X is not set
-# CONFIG_VIDEO_THS8200 is not set
-# end of Video encoders
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-# end of Video improvement chips
-
-#
-# Audio/Video compression chips
-#
-CONFIG_VIDEO_SAA6752HS=m
-# end of Audio/Video compression chips
-
-#
-# SDR tuner chips
-#
-CONFIG_SDR_MAX2175=m
-# end of SDR tuner chips
-
-#
-# Miscellaneous helper chips
-#
-# CONFIG_VIDEO_THS7303 is not set
-CONFIG_VIDEO_M52790=m
-# CONFIG_VIDEO_I2C is not set
-# CONFIG_VIDEO_ST_MIPID02 is not set
-# end of Miscellaneous helper chips
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_HI556=m
-# CONFIG_VIDEO_IMX214 is not set
-CONFIG_VIDEO_IMX219=m
-# CONFIG_VIDEO_IMX258 is not set
-# CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX290 is not set
-# CONFIG_VIDEO_IMX319 is not set
-# CONFIG_VIDEO_IMX355 is not set
-CONFIG_VIDEO_OV2640=m
-# CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV2680 is not set
-# CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV5640 is not set
-# CONFIG_VIDEO_OV5645 is not set
-# CONFIG_VIDEO_OV5647 is not set
-# CONFIG_VIDEO_OV6650 is not set
-# CONFIG_VIDEO_OV5670 is not set
-CONFIG_VIDEO_OV5675=m
-# CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV7251 is not set
-# CONFIG_VIDEO_OV772X is not set
-CONFIG_VIDEO_OV7640=m
-CONFIG_VIDEO_OV7670=m
-# CONFIG_VIDEO_OV7740 is not set
-# CONFIG_VIDEO_OV8856 is not set
-# CONFIG_VIDEO_OV9640 is not set
-# CONFIG_VIDEO_OV9650 is not set
-# CONFIG_VIDEO_OV13858 is not set
-# CONFIG_VIDEO_VS6624 is not set
-# CONFIG_VIDEO_MT9M001 is not set
-# CONFIG_VIDEO_MT9M032 is not set
-# CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9P031 is not set
-# CONFIG_VIDEO_MT9T001 is not set
-# CONFIG_VIDEO_MT9T112 is not set
-CONFIG_VIDEO_MT9V011=m
-# CONFIG_VIDEO_MT9V032 is not set
-# CONFIG_VIDEO_MT9V111 is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_M5MOLS is not set
-CONFIG_VIDEO_RDACM20=m
-# CONFIG_VIDEO_RJ54N1 is not set
-# CONFIG_VIDEO_S5K6AA is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_S5K4ECGX is not set
-# CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_SMIAPP is not set
-# CONFIG_VIDEO_ET8EK8 is not set
-# CONFIG_VIDEO_S5C73M3 is not set
-# end of Camera sensor devices
-
-#
-# Lens drivers
-#
-# CONFIG_VIDEO_AD5820 is not set
-# CONFIG_VIDEO_AK7375 is not set
-# CONFIG_VIDEO_DW9714 is not set
-CONFIG_VIDEO_DW9768=m
-# CONFIG_VIDEO_DW9807_VCM is not set
-# end of Lens drivers
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_LM3560 is not set
-# CONFIG_VIDEO_LM3646 is not set
-# end of Flash devices
-
-#
-# SPI helper chips
-#
-# CONFIG_VIDEO_GS1662 is not set
-# end of SPI helper chips
-
-#
-# Media SPI Adapters
-#
-# CONFIG_CXD2880_SPI_DRV is not set
-# end of Media SPI Adapters
-
-CONFIG_MEDIA_TUNER=m
-
-#
-# Customize TV tuners
-#
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA18250=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MSI001=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_M88RS6000T=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_MXL301RF=m
-CONFIG_MEDIA_TUNER_QM1D1C0042=m
-CONFIG_MEDIA_TUNER_QM1D1B0004=m
-# end of Customize TV tuners
-
-#
-# Customise DVB Frontends
-#
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV0910=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_STV6111=m
-CONFIG_DVB_MXL5XX=m
-CONFIG_DVB_M88DS3103=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_SI2165=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24117=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-# CONFIG_DVB_S5H1432 is not set
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-# CONFIG_DVB_DIB9000 is not set
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_CXD2841ER=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_RTL2832_SDR=m
-CONFIG_DVB_SI2168=m
-CONFIG_DVB_AS102_FE=m
-CONFIG_DVB_ZD1301_DEMOD=m
-CONFIG_DVB_GP8PSK_FE=m
-# CONFIG_DVB_CXD2880 is not set
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT3306A=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_TC90522=m
-# CONFIG_DVB_MN88443X is not set
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_LNBH25=m
-# CONFIG_DVB_LNBH29 is not set
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-# CONFIG_DVB_LGS8GL5 is not set
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_HORUS3A=m
-CONFIG_DVB_ASCOT2E=m
-CONFIG_DVB_HELENE=m
-
-#
-# Common Interface (EN50221) controller drivers
-#
-CONFIG_DVB_CXD2099=m
-CONFIG_DVB_SP2=m
-# end of Customise DVB Frontends
-
-#
-# Tools to develop new frontends
-#
-CONFIG_DVB_DUMMY_FE=m
-# end of Media ancillary drivers
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-CONFIG_AGP_UNINORTH=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_DRM=m
-CONFIG_DRM_MIPI_DBI=m
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
-CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_DP_CEC=y
-CONFIG_DRM_TTM=m
-CONFIG_DRM_TTM_DMA_PAGE_POOL=y
-CONFIG_DRM_VRAM_HELPER=m
-CONFIG_DRM_TTM_HELPER=m
-CONFIG_DRM_GEM_CMA_HELPER=y
-CONFIG_DRM_KMS_CMA_HELPER=y
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_VM=y
-CONFIG_DRM_SCHED=m
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# end of I2C encoder or helper chips
-
-#
-# ARM devices
-#
-# CONFIG_DRM_KOMEDA is not set
-# end of ARM devices
-
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_USERPTR=y
-CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_AMDGPU_SI=y
-CONFIG_DRM_AMDGPU_CIK=y
-CONFIG_DRM_AMDGPU_USERPTR=y
-# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
-
-#
-# ACP (Audio CoProcessor) Configuration
-#
-CONFIG_DRM_AMD_ACP=y
-# end of ACP (Audio CoProcessor) Configuration
-
-#
-# Display Engine Configuration
-#
-CONFIG_DRM_AMD_DC=y
-CONFIG_DRM_AMD_DC_DCN=y
-# CONFIG_DRM_AMD_DC_HDCP is not set
-# CONFIG_DEBUG_KERNEL_DC is not set
-# end of Display Engine Configuration
-
-CONFIG_HSA_AMD=y
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-# CONFIG_NOUVEAU_DEBUG_MMU is not set
-# CONFIG_NOUVEAU_DEBUG_PUSH is not set
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-# CONFIG_DRM_NOUVEAU_SVM is not set
-CONFIG_DRM_VGEM=m
-CONFIG_DRM_VKMS=m
-CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_RCAR_DW_HDMI=m
-# CONFIG_DRM_RCAR_LVDS is not set
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-CONFIG_DRM_PANEL_ARM_VERSATILE=m
-CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596=m
-CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
-CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
-CONFIG_DRM_PANEL_LVDS=m
-CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_PANEL_ELIDA_KD35T133=m
-CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
-CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
-CONFIG_DRM_PANEL_ILITEK_IL9322=m
-# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
-CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
-CONFIG_DRM_PANEL_JDI_LT070ME05000=m
-CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
-CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W=m
-CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m
-CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
-CONFIG_DRM_PANEL_LG_LB035Q02=m
-CONFIG_DRM_PANEL_LG_LG4573=m
-CONFIG_DRM_PANEL_NEC_NL8048HL11=m
-CONFIG_DRM_PANEL_NOVATEK_NT35510=m
-CONFIG_DRM_PANEL_NOVATEK_NT39016=m
-CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
-CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
-# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
-CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
-CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
-CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
-CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
-CONFIG_DRM_PANEL_RONBO_RB070D30=m
-CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
-CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
-CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
-# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
-CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
-CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
-CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
-CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
-CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m
-CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
-CONFIG_DRM_PANEL_SITRONIX_ST7701=m
-CONFIG_DRM_PANEL_SITRONIX_ST7703=m
-CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
-CONFIG_DRM_PANEL_SONY_ACX424AKP=m
-CONFIG_DRM_PANEL_SONY_ACX565AKM=m
-CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
-CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
-CONFIG_DRM_PANEL_TPO_TPG110=m
-CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
-CONFIG_DRM_PANEL_VISIONOX_RM69299=m
-CONFIG_DRM_PANEL_XINPENG_XPP055C272=m
-# end of Display Panels
-
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-CONFIG_DRM_CDNS_DSI=m
-CONFIG_DRM_CHRONTEL_CH7033=m
-CONFIG_DRM_DISPLAY_CONNECTOR=m
-CONFIG_DRM_LVDS_CODEC=m
-CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW=m
-CONFIG_DRM_NWL_MIPI_DSI=m
-CONFIG_DRM_NXP_PTN3460=m
-CONFIG_DRM_PARADE_PS8622=m
-CONFIG_DRM_PARADE_PS8640=m
-CONFIG_DRM_SIL_SII8620=m
-CONFIG_DRM_SII902X=m
-CONFIG_DRM_SII9234=m
-CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_THINE_THC63LVD1024=m
-CONFIG_DRM_TOSHIBA_TC358764=m
-CONFIG_DRM_TOSHIBA_TC358767=m
-CONFIG_DRM_TOSHIBA_TC358768=m
-CONFIG_DRM_TI_TFP410=m
-CONFIG_DRM_TI_SN65DSI86=m
-CONFIG_DRM_TI_TPD12S015=m
-CONFIG_DRM_ANALOGIX_ANX6345=m
-CONFIG_DRM_ANALOGIX_ANX78XX=m
-CONFIG_DRM_ANALOGIX_DP=m
-CONFIG_DRM_I2C_ADV7511=m
-CONFIG_DRM_I2C_ADV7511_AUDIO=y
-CONFIG_DRM_I2C_ADV7511_CEC=y
-CONFIG_DRM_DW_HDMI=m
-CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
-CONFIG_DRM_DW_HDMI_CEC=m
-# end of Display Interface Bridges
-
-CONFIG_DRM_ETNAVIV=m
-CONFIG_DRM_ETNAVIV_THERMAL=y
-CONFIG_DRM_ARCPGU=m
-CONFIG_DRM_MXS=y
-CONFIG_DRM_MXSFB=m
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_GM12U320=m
-CONFIG_TINYDRM_HX8357D=m
-# CONFIG_TINYDRM_ILI9225 is not set
-# CONFIG_TINYDRM_ILI9341 is not set
-# CONFIG_TINYDRM_ILI9486 is not set
-CONFIG_TINYDRM_MI0283QT=m
-CONFIG_TINYDRM_REPAPER=m
-CONFIG_TINYDRM_ST7586=m
-# CONFIG_TINYDRM_ST7735R is not set
-CONFIG_DRM_LEGACY=y
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DDC=m
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_SVGALIB=m
-CONFIG_FB_MACMODES=y
-CONFIG_FB_BACKLIGHT=m
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_CIRRUS=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-CONFIG_FB_OF=y
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_UVESA=m
-CONFIG_FB_OPENCORES=m
-CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-# CONFIG_FB_I740 is not set
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
-CONFIG_FB_S3_DDC=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_ARK=m
-CONFIG_FB_PM3=m
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_SM501 is not set
-CONFIG_FB_SMSCUFX=m
-CONFIG_FB_UDL=m
-CONFIG_FB_IBM_GXT4500=m
-CONFIG_FB_PS3=m
-CONFIG_FB_PS3_DEFAULT_SIZE_M=9
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-# CONFIG_FB_MB862XX_LIME is not set
-CONFIG_FB_MB862XX_I2C=y
-CONFIG_FB_SIMPLE=y
-CONFIG_FB_SSD1307=m
-CONFIG_FB_SM712=m
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-CONFIG_LCD_ILI922X=m
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_AMS369FG06=m
-CONFIG_LCD_LMS501KF03=m
-CONFIG_LCD_HX8357=m
-# CONFIG_LCD_OTM3225A is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_PWM=m
-# CONFIG_BACKLIGHT_DA903X is not set
-CONFIG_BACKLIGHT_DA9052=m
-# CONFIG_BACKLIGHT_MAX8925 is not set
-CONFIG_BACKLIGHT_QCOM_WLED=m
-# CONFIG_BACKLIGHT_WM831X is not set
-# CONFIG_BACKLIGHT_ADP5520 is not set
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_ADP8870=m
-# CONFIG_BACKLIGHT_88PM860X is not set
-CONFIG_BACKLIGHT_PCF50633=m
-# CONFIG_BACKLIGHT_AAT2870 is not set
-CONFIG_BACKLIGHT_LM3630A=m
-CONFIG_BACKLIGHT_LM3639=m
-CONFIG_BACKLIGHT_LP855X=m
-# CONFIG_BACKLIGHT_LP8788 is not set
-# CONFIG_BACKLIGHT_PANDORA is not set
-CONFIG_BACKLIGHT_SKY81452=m
-# CONFIG_BACKLIGHT_AS3711 is not set
-CONFIG_BACKLIGHT_GPIO=m
-CONFIG_BACKLIGHT_LV5207LP=m
-CONFIG_BACKLIGHT_BD6107=m
-# CONFIG_BACKLIGHT_ARCXCNN is not set
-CONFIG_BACKLIGHT_LED=m
-# end of Backlight & LCD device support
-
-CONFIG_VGASTATE=m
-CONFIG_VIDEOMODE_HELPERS=y
-CONFIG_HDMI=y
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
-# end of Console display driver support
-
-# CONFIG_LOGO is not set
-# end of Graphics support
-
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_PCM_ELD=y
-CONFIG_SND_PCM_IEC958=y
-CONFIG_SND_DMAENGINE_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_SEQ_DEVICE=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_JACK_INPUT_DEV=y
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_PCM_TIMER=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_PROC_FS=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_SEQUENCER_OSS=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_SEQ_MIDI_EVENT=m
-CONFIG_SND_SEQ_MIDI=m
-CONFIG_SND_SEQ_MIDI_EMUL=m
-CONFIG_SND_SEQ_VIRMIDI=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=1
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-
-#
-# HD-Audio
-#
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_GENERIC_LEDS=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
-# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
-# end of HD-Audio
-
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_COMPONENT=y
-CONFIG_SND_HDA_PREALLOC_SIZE=64
-CONFIG_SND_INTEL_DSP_CONFIG=m
-CONFIG_SND_PPC=y
-CONFIG_SND_POWERMAC=m
-CONFIG_SND_POWERMAC_AUTO_DRC=y
-CONFIG_SND_PS3=m
-CONFIG_SND_PS3_DEFAULT_START_DELAY=2000
-CONFIG_SND_AOA=m
-CONFIG_SND_AOA_FABRIC_LAYOUT=m
-CONFIG_SND_AOA_ONYX=m
-CONFIG_SND_AOA_TAS=m
-CONFIG_SND_AOA_TOONIE=m
-CONFIG_SND_AOA_SOUNDBUS=m
-CONFIG_SND_AOA_SOUNDBUS_I2S=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_DICE=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_BEBOB=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREFACE=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_AC97_BUS=y
-CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
-CONFIG_SND_SOC_TOPOLOGY=y
-CONFIG_SND_SOC_AMD_ACP=m
-CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
-CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-CONFIG_SND_ATMEL_SOC=m
-CONFIG_SND_SOC_MIKROE_PROTO=m
-CONFIG_SND_BCM63XX_I2S_WHISTLER=m
-CONFIG_SND_DESIGNWARE_I2S=m
-# CONFIG_SND_DESIGNWARE_PCM is not set
-
-#
-# SoC Audio for Freescale CPUs
-#
-
-#
-# Common SoC Audio options for Freescale CPUs:
-#
-CONFIG_SND_SOC_FSL_ASRC=m
-CONFIG_SND_SOC_FSL_SAI=m
-CONFIG_SND_SOC_FSL_MQS=m
-CONFIG_SND_SOC_FSL_AUDMIX=m
-CONFIG_SND_SOC_FSL_SSI=m
-CONFIG_SND_SOC_FSL_SPDIF=m
-CONFIG_SND_SOC_FSL_ESAI=m
-CONFIG_SND_SOC_FSL_MICFIL=m
-CONFIG_SND_SOC_FSL_EASRC=m
-CONFIG_SND_SOC_IMX_AUDMUX=m
-# end of SoC Audio for Freescale CPUs
-
-CONFIG_SND_I2S_HI6210_I2S=m
-CONFIG_SND_SOC_IMG=y
-CONFIG_SND_SOC_IMG_I2S_IN=m
-CONFIG_SND_SOC_IMG_I2S_OUT=m
-CONFIG_SND_SOC_IMG_PARALLEL_OUT=m
-CONFIG_SND_SOC_IMG_SPDIF_IN=m
-CONFIG_SND_SOC_IMG_SPDIF_OUT=m
-CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
-CONFIG_SND_SOC_MTK_BTCVSD=m
-CONFIG_SND_SOC_SOF_TOPLEVEL=y
-CONFIG_SND_SOC_SOF_PCI=m
-CONFIG_SND_SOC_SOF_OF=m
-# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set
-# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set
-CONFIG_SND_SOC_SOF=m
-
-#
-# STMicroelectronics STM32 SOC audio support
-#
-# end of STMicroelectronics STM32 SOC audio support
-
-CONFIG_SND_SOC_XILINX_I2S=m
-CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
-CONFIG_SND_SOC_XILINX_SPDIF=m
-CONFIG_SND_SOC_XTFPGA_I2S=m
-CONFIG_ZX_TDM=m
-CONFIG_SND_SOC_I2C_AND_SPI=m
-
-#
-# CODEC drivers
-#
-CONFIG_SND_SOC_AC97_CODEC=m
-CONFIG_SND_SOC_ADAU_UTILS=m
-CONFIG_SND_SOC_ADAU1701=m
-CONFIG_SND_SOC_ADAU17X1=m
-CONFIG_SND_SOC_ADAU1761=m
-CONFIG_SND_SOC_ADAU1761_I2C=m
-CONFIG_SND_SOC_ADAU1761_SPI=m
-CONFIG_SND_SOC_ADAU7002=m
-CONFIG_SND_SOC_ADAU7118=m
-CONFIG_SND_SOC_ADAU7118_HW=m
-CONFIG_SND_SOC_ADAU7118_I2C=m
-CONFIG_SND_SOC_AK4104=m
-CONFIG_SND_SOC_AK4118=m
-CONFIG_SND_SOC_AK4458=m
-CONFIG_SND_SOC_AK4554=m
-CONFIG_SND_SOC_AK4613=m
-CONFIG_SND_SOC_AK4642=m
-CONFIG_SND_SOC_AK5386=m
-CONFIG_SND_SOC_AK5558=m
-CONFIG_SND_SOC_ALC5623=m
-CONFIG_SND_SOC_BD28623=m
-CONFIG_SND_SOC_BT_SCO=m
-CONFIG_SND_SOC_CPCAP=m
-CONFIG_SND_SOC_CS35L32=m
-CONFIG_SND_SOC_CS35L33=m
-CONFIG_SND_SOC_CS35L34=m
-CONFIG_SND_SOC_CS35L35=m
-CONFIG_SND_SOC_CS35L36=m
-CONFIG_SND_SOC_CS42L42=m
-CONFIG_SND_SOC_CS42L51=m
-CONFIG_SND_SOC_CS42L51_I2C=m
-CONFIG_SND_SOC_CS42L52=m
-CONFIG_SND_SOC_CS42L56=m
-CONFIG_SND_SOC_CS42L73=m
-CONFIG_SND_SOC_CS4265=m
-CONFIG_SND_SOC_CS4270=m
-CONFIG_SND_SOC_CS4271=m
-CONFIG_SND_SOC_CS4271_I2C=m
-CONFIG_SND_SOC_CS4271_SPI=m
-CONFIG_SND_SOC_CS42XX8=m
-CONFIG_SND_SOC_CS42XX8_I2C=m
-CONFIG_SND_SOC_CS43130=m
-CONFIG_SND_SOC_CS4341=m
-CONFIG_SND_SOC_CS4349=m
-CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
-CONFIG_SND_SOC_DA7213=m
-CONFIG_SND_SOC_DA7219=m
-CONFIG_SND_SOC_DMIC=m
-CONFIG_SND_SOC_HDMI_CODEC=m
-CONFIG_SND_SOC_ES7134=m
-CONFIG_SND_SOC_ES7241=m
-CONFIG_SND_SOC_ES8316=m
-CONFIG_SND_SOC_ES8328=m
-CONFIG_SND_SOC_ES8328_I2C=m
-CONFIG_SND_SOC_ES8328_SPI=m
-CONFIG_SND_SOC_GTM601=m
-CONFIG_SND_SOC_INNO_RK3036=m
-CONFIG_SND_SOC_MAX98088=m
-CONFIG_SND_SOC_MAX98357A=m
-CONFIG_SND_SOC_MAX98504=m
-CONFIG_SND_SOC_MAX9867=m
-CONFIG_SND_SOC_MAX98927=m
-CONFIG_SND_SOC_MAX98373=m
-CONFIG_SND_SOC_MAX98373_I2C=m
-CONFIG_SND_SOC_MAX98390=m
-CONFIG_SND_SOC_MAX9860=m
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
-CONFIG_SND_SOC_PCM1681=m
-CONFIG_SND_SOC_PCM1789=m
-CONFIG_SND_SOC_PCM1789_I2C=m
-CONFIG_SND_SOC_PCM179X=m
-CONFIG_SND_SOC_PCM179X_I2C=m
-CONFIG_SND_SOC_PCM179X_SPI=m
-CONFIG_SND_SOC_PCM186X=m
-CONFIG_SND_SOC_PCM186X_I2C=m
-CONFIG_SND_SOC_PCM186X_SPI=m
-CONFIG_SND_SOC_PCM3060=m
-CONFIG_SND_SOC_PCM3060_I2C=m
-CONFIG_SND_SOC_PCM3060_SPI=m
-CONFIG_SND_SOC_PCM3168A=m
-CONFIG_SND_SOC_PCM3168A_I2C=m
-CONFIG_SND_SOC_PCM3168A_SPI=m
-CONFIG_SND_SOC_PCM512x=m
-CONFIG_SND_SOC_PCM512x_I2C=m
-CONFIG_SND_SOC_PCM512x_SPI=m
-CONFIG_SND_SOC_RK3328=m
-CONFIG_SND_SOC_RL6231=m
-CONFIG_SND_SOC_RT5616=m
-CONFIG_SND_SOC_RT5631=m
-CONFIG_SND_SOC_RT5645=m
-CONFIG_SND_SOC_SGTL5000=m
-CONFIG_SND_SOC_SI476X=m
-CONFIG_SND_SOC_SIGMADSP=m
-CONFIG_SND_SOC_SIGMADSP_I2C=m
-CONFIG_SND_SOC_SIGMADSP_REGMAP=m
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
-CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m
-CONFIG_SND_SOC_SPDIF=m
-CONFIG_SND_SOC_SSM2305=m
-CONFIG_SND_SOC_SSM2602=m
-CONFIG_SND_SOC_SSM2602_SPI=m
-CONFIG_SND_SOC_SSM2602_I2C=m
-CONFIG_SND_SOC_SSM4567=m
-CONFIG_SND_SOC_STA32X=m
-CONFIG_SND_SOC_STA350=m
-CONFIG_SND_SOC_STI_SAS=m
-CONFIG_SND_SOC_TAS2552=m
-CONFIG_SND_SOC_TAS2562=m
-CONFIG_SND_SOC_TAS2770=m
-CONFIG_SND_SOC_TAS5086=m
-CONFIG_SND_SOC_TAS571X=m
-CONFIG_SND_SOC_TAS5720=m
-CONFIG_SND_SOC_TAS6424=m
-CONFIG_SND_SOC_TDA7419=m
-CONFIG_SND_SOC_TFA9879=m
-CONFIG_SND_SOC_TLV320AIC23=m
-CONFIG_SND_SOC_TLV320AIC23_I2C=m
-CONFIG_SND_SOC_TLV320AIC23_SPI=m
-CONFIG_SND_SOC_TLV320AIC31XX=m
-CONFIG_SND_SOC_TLV320AIC32X4=m
-CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
-CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
-CONFIG_SND_SOC_TLV320AIC3X=m
-CONFIG_SND_SOC_TLV320ADCX140=m
-CONFIG_SND_SOC_TS3A227E=m
-CONFIG_SND_SOC_TSCS42XX=m
-CONFIG_SND_SOC_TSCS454=m
-CONFIG_SND_SOC_UDA1334=m
-CONFIG_SND_SOC_WM8510=m
-CONFIG_SND_SOC_WM8523=m
-CONFIG_SND_SOC_WM8524=m
-CONFIG_SND_SOC_WM8580=m
-CONFIG_SND_SOC_WM8711=m
-CONFIG_SND_SOC_WM8728=m
-CONFIG_SND_SOC_WM8731=m
-CONFIG_SND_SOC_WM8737=m
-CONFIG_SND_SOC_WM8741=m
-CONFIG_SND_SOC_WM8750=m
-CONFIG_SND_SOC_WM8753=m
-CONFIG_SND_SOC_WM8770=m
-CONFIG_SND_SOC_WM8776=m
-CONFIG_SND_SOC_WM8782=m
-CONFIG_SND_SOC_WM8804=m
-CONFIG_SND_SOC_WM8804_I2C=m
-CONFIG_SND_SOC_WM8804_SPI=m
-CONFIG_SND_SOC_WM8903=m
-CONFIG_SND_SOC_WM8904=m
-CONFIG_SND_SOC_WM8960=m
-CONFIG_SND_SOC_WM8962=m
-CONFIG_SND_SOC_WM8974=m
-CONFIG_SND_SOC_WM8978=m
-CONFIG_SND_SOC_WM8985=m
-CONFIG_SND_SOC_ZL38060=m
-CONFIG_SND_SOC_ZX_AUD96P22=m
-CONFIG_SND_SOC_MAX9759=m
-CONFIG_SND_SOC_MT6351=m
-CONFIG_SND_SOC_MT6358=m
-CONFIG_SND_SOC_MT6660=m
-CONFIG_SND_SOC_NAU8540=m
-CONFIG_SND_SOC_NAU8810=m
-CONFIG_SND_SOC_NAU8822=m
-CONFIG_SND_SOC_NAU8824=m
-CONFIG_SND_SOC_TPA6130A2=m
-# end of CODEC drivers
-
-CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_CARD=m
-CONFIG_SND_AUDIO_GRAPH_CARD=m
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACCUTOUCH=m
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_APPLEIR=m
-CONFIG_HID_ASUS=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_BETOP_FF=m
-CONFIG_HID_BIGBEN_FF=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CORSAIR=m
-CONFIG_HID_COUGAR=m
-CONFIG_HID_MACALLY=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CMEDIA=m
-CONFIG_HID_CP2112=m
-CONFIG_HID_CREATIVE_SB0540=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELAN=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_GEMBIRD=m
-CONFIG_HID_GFRM=m
-CONFIG_HID_GLORIOUS=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-# CONFIG_HID_GT683R is not set
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_VIEWSONIC=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_ITE=m
-CONFIG_HID_JABRA=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LED=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MALTRON=m
-CONFIG_HID_MAYFLASH=m
-CONFIG_HID_REDRAGON=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTI=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PLANTRONICS=m
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_RETRODE=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_SONY_FF=y
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEAM=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_UDRAW_PS3=m
-CONFIG_HID_U2FZERO=m
-CONFIG_HID_WACOM=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-CONFIG_HID_ALPS=m
-CONFIG_HID_MCP2221=m
-# end of Special HID drivers
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-# end of USB HID Boot Protocol drivers
-# end of USB HID support
-
-#
-# I2C HID support
-#
-CONFIG_I2C_HID=m
-# end of I2C HID support
-# end of HID support
-
-CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_LED_TRIG=y
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_CONN_GPIO=m
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-CONFIG_USB_PCI=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-CONFIG_USB_DYNAMIC_MINORS=y
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_PRODUCTLIST is not set
-# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
-CONFIG_USB_LEDS_TRIGGER_USBPORT=m
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=m
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PCI_RENESAS=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=m
-CONFIG_USB_EHCI_FSL=m
-CONFIG_USB_EHCI_HCD_PPC_OF=y
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_FOTG210_HCD=m
-CONFIG_USB_MAX3421_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
-CONFIG_USB_OHCI_HCD_PPC_OF=y
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_SSB=y
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_FHCI_HCD=m
-# CONFIG_FHCI_DEBUG is not set
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_HCD_BCMA=m
-CONFIG_USB_HCD_SSB=m
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_VHCI_HC_PORTS=8
-CONFIG_USBIP_VHCI_NR_HCS=1
-CONFIG_USBIP_HOST=m
-CONFIG_USBIP_VUDC=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_USB_CDNS3=m
-CONFIG_USB_CDNS3_GADGET=y
-CONFIG_USB_CDNS3_HOST=y
-CONFIG_USB_MUSB_HDRC=m
-# CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_GADGET is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
-
-#
-# Platform Glue Layer
-#
-
-#
-# MUSB DMA mode
-#
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_DWC3=m
-CONFIG_USB_DWC3_ULPI=y
-# CONFIG_USB_DWC3_HOST is not set
-# CONFIG_USB_DWC3_GADGET is not set
-CONFIG_USB_DWC3_DUAL_ROLE=y
-
-#
-# Platform Glue Driver Support
-#
-CONFIG_USB_DWC3_HAPS=m
-CONFIG_USB_DWC3_OF_SIMPLE=m
-# CONFIG_USB_DWC2 is not set
-CONFIG_USB_CHIPIDEA=m
-# CONFIG_USB_CHIPIDEA_UDC is not set
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA_PCI=m
-CONFIG_USB_CHIPIDEA_MSM=m
-CONFIG_USB_CHIPIDEA_IMX=m
-CONFIG_USB_CHIPIDEA_GENERIC=m
-CONFIG_USB_ISP1760=m
-CONFIG_USB_ISP1760_HCD=y
-CONFIG_USB_ISP1761_UDC=y
-# CONFIG_USB_ISP1760_HOST_ROLE is not set
-# CONFIG_USB_ISP1760_GADGET_ROLE is not set
-CONFIG_USB_ISP1760_DUAL_ROLE=y
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_F8153X=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MXUPORT=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_UPD78F0730=m
-# CONFIG_USB_SERIAL_DEBUG is not set
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_APPLE_MFI_FASTCHARGE=m
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-CONFIG_USB_EHSET_TEST_FIXTURE=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_HSIC_USB4604=m
-# CONFIG_USB_LINK_LAYER_TEST is not set
-CONFIG_USB_CHAOSKEY=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-
-#
-# USB Physical Layer drivers
-#
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_USB_GPIO_VBUS=m
-CONFIG_TAHVO_USB=m
-# CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
-CONFIG_USB_ISP1301=m
-# end of USB Physical Layer drivers
-
-CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_U_SERIAL_CONSOLE=y
-
-#
-# USB Peripheral Controller
-#
-CONFIG_USB_FOTG210_UDC=m
-CONFIG_USB_GR_UDC=m
-CONFIG_USB_R8A66597=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_SNP_CORE=m
-CONFIG_USB_SNP_UDC_PLAT=m
-CONFIG_USB_M66592=m
-CONFIG_USB_BDC_UDC=m
-
-#
-# Platform Support
-#
-CONFIG_USB_BDC_PCI=m
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_NET2272=m
-# CONFIG_USB_NET2272_DMA is not set
-CONFIG_USB_NET2280=m
-CONFIG_USB_GOKU=m
-CONFIG_USB_EG20T=m
-CONFIG_USB_GADGET_XILINX=m
-CONFIG_USB_MAX3420_UDC=m
-CONFIG_USB_DUMMY_HCD=m
-# end of USB Peripheral Controller
-
-CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_F_ACM=m
-CONFIG_USB_U_SERIAL=m
-CONFIG_USB_U_ETHER=m
-CONFIG_USB_U_AUDIO=m
-CONFIG_USB_F_SERIAL=m
-CONFIG_USB_F_OBEX=m
-CONFIG_USB_F_NCM=m
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_PHONET=m
-CONFIG_USB_F_EEM=m
-CONFIG_USB_F_SUBSET=m
-CONFIG_USB_F_RNDIS=m
-CONFIG_USB_F_MASS_STORAGE=m
-CONFIG_USB_F_FS=m
-CONFIG_USB_F_UAC1=m
-CONFIG_USB_F_UVC=m
-CONFIG_USB_F_MIDI=m
-CONFIG_USB_F_HID=m
-CONFIG_USB_F_PRINTER=m
-CONFIG_USB_F_TCM=m
-CONFIG_USB_CONFIGFS=m
-# CONFIG_USB_CONFIGFS_SERIAL is not set
-# CONFIG_USB_CONFIGFS_ACM is not set
-# CONFIG_USB_CONFIGFS_OBEX is not set
-# CONFIG_USB_CONFIGFS_NCM is not set
-# CONFIG_USB_CONFIGFS_ECM is not set
-# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
-# CONFIG_USB_CONFIGFS_RNDIS is not set
-# CONFIG_USB_CONFIGFS_EEM is not set
-# CONFIG_USB_CONFIGFS_PHONET is not set
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-# CONFIG_USB_CONFIGFS_F_LB_SS is not set
-# CONFIG_USB_CONFIGFS_F_FS is not set
-# CONFIG_USB_CONFIGFS_F_UAC1 is not set
-# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
-# CONFIG_USB_CONFIGFS_F_UAC2 is not set
-# CONFIG_USB_CONFIGFS_F_MIDI is not set
-# CONFIG_USB_CONFIGFS_F_HID is not set
-CONFIG_USB_CONFIGFS_F_UVC=y
-CONFIG_USB_CONFIGFS_F_PRINTER=y
-CONFIG_USB_CONFIGFS_F_TCM=y
-
-#
-# USB Gadget precomposed configurations
-#
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-CONFIG_GADGET_UAC1=y
-# CONFIG_GADGET_UAC1_LEGACY is not set
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_ETH_EEM=y
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FUNCTIONFS=m
-# CONFIG_USB_FUNCTIONFS_ETH is not set
-# CONFIG_USB_FUNCTIONFS_RNDIS is not set
-CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_GADGET_TARGET=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MIDI_GADGET=m
-CONFIG_USB_G_PRINTER=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-CONFIG_USB_G_NOKIA=m
-CONFIG_USB_G_ACM_MS=m
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_MULTI_RNDIS=y
-CONFIG_USB_G_MULTI_CDC=y
-CONFIG_USB_G_HID=m
-CONFIG_USB_G_DBGP=m
-# CONFIG_USB_G_DBGP_PRINTK is not set
-CONFIG_USB_G_DBGP_SERIAL=y
-CONFIG_USB_G_WEBCAM=m
-# CONFIG_USB_RAW_GADGET is not set
-# end of USB Gadget precomposed configurations
-
-CONFIG_TYPEC=m
-# CONFIG_TYPEC_TCPM is not set
-CONFIG_TYPEC_HD3SS3220=m
-CONFIG_TYPEC_TPS6598X=m
-
-#
-# USB Type-C Multiplexer/DeMultiplexer Switch support
-#
-# CONFIG_TYPEC_MUX_PI3USB30532 is not set
-# end of USB Type-C Multiplexer/DeMultiplexer Switch support
-
-#
-# USB Type-C Alternate Mode drivers
-#
-CONFIG_TYPEC_DP_ALTMODE=m
-CONFIG_TYPEC_NVIDIA_ALTMODE=m
-# end of USB Type-C Alternate Mode drivers
-
-CONFIG_USB_ROLE_SWITCH=m
-CONFIG_MMC=m
-CONFIG_PWRSEQ_EMMC=m
-CONFIG_PWRSEQ_SD8787=m
-CONFIG_PWRSEQ_SIMPLE=m
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER=y
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_SDHCI_OF_ARASAN=m
-CONFIG_MMC_SDHCI_OF_ASPEED=m
-CONFIG_MMC_SDHCI_OF_AT91=m
-CONFIG_MMC_SDHCI_OF_ESDHC=m
-CONFIG_MMC_SDHCI_OF_HLWD=m
-CONFIG_MMC_SDHCI_OF_DWCMSHC=m
-CONFIG_MMC_SDHCI_CADENCE=m
-# CONFIG_MMC_SDHCI_F_SDH30 is not set
-CONFIG_MMC_SDHCI_MILBEAUT=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_ALCOR=m
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SPI=m
-# CONFIG_MMC_SDRICOH_CS is not set
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-# CONFIG_MMC_USDHI6ROL0 is not set
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_CQHCI=m
-CONFIG_MMC_HSQ=m
-CONFIG_MMC_TOSHIBA_PCI=m
-CONFIG_MMC_MTK=m
-# CONFIG_MMC_SDHCI_XENON is not set
-CONFIG_MMC_SDHCI_OMAP=m
-CONFIG_MMC_SDHCI_AM654=m
-CONFIG_MMC_SDHCI_EXTERNAL_DMA=y
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-CONFIG_MS_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_CLASS_FLASH=m
-CONFIG_LEDS_CLASS_MULTICOLOR=m
-CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
-
-#
-# LED drivers
-#
-# CONFIG_LEDS_88PM860X is not set
-CONFIG_LEDS_AAT1290=m
-CONFIG_LEDS_AN30259A=m
-CONFIG_LEDS_AS3645A=m
-CONFIG_LEDS_AW2013=m
-CONFIG_LEDS_BCM6328=m
-CONFIG_LEDS_BCM6358=m
-CONFIG_LEDS_CPCAP=m
-CONFIG_LEDS_CR0014114=m
-CONFIG_LEDS_EL15203000=m
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM3532=m
-CONFIG_LEDS_LM3533=m
-CONFIG_LEDS_LM3642=m
-CONFIG_LEDS_LM3692X=m
-# CONFIG_LEDS_LM3601X is not set
-# CONFIG_LEDS_MT6323 is not set
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA9532_GPIO=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP3952=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-CONFIG_LEDS_LP8501=m
-# CONFIG_LEDS_LP8788 is not set
-CONFIG_LEDS_LP8860=m
-CONFIG_LEDS_PCA955X=m
-# CONFIG_LEDS_PCA955X_GPIO is not set
-CONFIG_LEDS_PCA963X=m
-# CONFIG_LEDS_WM831X_STATUS is not set
-# CONFIG_LEDS_WM8350 is not set
-# CONFIG_LEDS_DA903X is not set
-CONFIG_LEDS_DA9052=m
-CONFIG_LEDS_DAC124S085=m
-CONFIG_LEDS_PWM=m
-CONFIG_LEDS_REGULATOR=m
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_LT3593=m
-# CONFIG_LEDS_ADP5520 is not set
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_TLC591XX=m
-CONFIG_LEDS_MAX77650=m
-# CONFIG_LEDS_MAX77693 is not set
-# CONFIG_LEDS_MAX8997 is not set
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_MENF21BMC=m
-CONFIG_LEDS_KTD2692=m
-CONFIG_LEDS_IS31FL319X=m
-CONFIG_LEDS_IS31FL32XX=m
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_POWERNV=m
-CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_MLXREG=m
-CONFIG_LEDS_USER=m
-# CONFIG_LEDS_SPI_BYTE is not set
-# CONFIG_LEDS_TI_LMU_COMMON is not set
-CONFIG_LEDS_TPS6105X=m
-CONFIG_LEDS_SGM3140=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_DISK=y
-CONFIG_LEDS_TRIGGER_MTD=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_ACTIVITY=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_PANIC=y
-# CONFIG_LEDS_TRIGGER_NETDEV is not set
-CONFIG_LEDS_TRIGGER_PATTERN=m
-CONFIG_LEDS_TRIGGER_AUDIO=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-# end of Speakup console speech
-
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
-CONFIG_INFINIBAND_VIRT_DMA=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_CXGB4=m
-CONFIG_INFINIBAND_I40IW=m
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_OCRDMA=m
-CONFIG_INFINIBAND_BNXT_RE=m
-CONFIG_INFINIBAND_QEDR=m
-CONFIG_RDMA_RXE=m
-# CONFIG_RDMA_SIW is not set
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SRPT=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_ISERT=m
-CONFIG_INFINIBAND_RTRS=m
-CONFIG_INFINIBAND_RTRS_CLIENT=m
-CONFIG_INFINIBAND_RTRS_SERVER=m
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_EDAC=y
-CONFIG_EDAC_LEGACY_SYSFS=y
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_PASEMI=m
-# CONFIG_EDAC_CELL is not set
-# CONFIG_EDAC_AMD8131 is not set
-# CONFIG_EDAC_AMD8111 is not set
-CONFIG_EDAC_CPC925=m
-CONFIG_RTC_LIB=y
-CONFIG_RTC_MC146818_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_NVMEM=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_88PM860X=m
-CONFIG_RTC_DRV_88PM80X=m
-CONFIG_RTC_DRV_ABB5ZES3=m
-CONFIG_RTC_DRV_ABEOZ9=m
-CONFIG_RTC_DRV_ABX80X=m
-CONFIG_RTC_DRV_AS3722=m
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1307_CENTURY=y
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1374_WDT=y
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_HYM8563=m
-CONFIG_RTC_DRV_LP8788=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_MAX8907=m
-CONFIG_RTC_DRV_MAX8925=m
-CONFIG_RTC_DRV_MAX8998=m
-CONFIG_RTC_DRV_MAX8997=m
-CONFIG_RTC_DRV_MAX77686=m
-CONFIG_RTC_DRV_RK808=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_ISL12026=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF85063=m
-CONFIG_RTC_DRV_PCF85363=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_TWL4030=m
-CONFIG_RTC_DRV_PALMAS=m
-CONFIG_RTC_DRV_TPS6586X=m
-CONFIG_RTC_DRV_TPS65910=m
-CONFIG_RTC_DRV_TPS80031=m
-CONFIG_RTC_DRV_RC5T583=m
-CONFIG_RTC_DRV_RC5T619=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8010=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-CONFIG_RTC_DRV_RV3028=m
-CONFIG_RTC_DRV_RV8803=m
-CONFIG_RTC_DRV_SD3078=m
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_DRV_M41T93=m
-CONFIG_RTC_DRV_M41T94=m
-CONFIG_RTC_DRV_DS1302=m
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1343=m
-CONFIG_RTC_DRV_DS1347=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_MAX6916=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RX4581=m
-CONFIG_RTC_DRV_RX6110=m
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_PCF2123=m
-CONFIG_RTC_DRV_MCP795=m
-CONFIG_RTC_I2C_AND_SPI=y
-
-#
-# SPI and I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_DS3232_HWMON=y
-CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_RTC_DRV_RV3029_HWMON=y
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=m
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1685_FAMILY=m
-CONFIG_RTC_DRV_DS1685=y
-# CONFIG_RTC_DRV_DS1689 is not set
-# CONFIG_RTC_DRV_DS17285 is not set
-# CONFIG_RTC_DRV_DS17485 is not set
-# CONFIG_RTC_DRV_DS17885 is not set
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_DA9052=m
-CONFIG_RTC_DRV_DA9055=m
-CONFIG_RTC_DRV_DA9063=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_WM831X=m
-CONFIG_RTC_DRV_WM8350=m
-CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB3100=m
-CONFIG_RTC_DRV_OPAL=y
-CONFIG_RTC_DRV_ZYNQMP=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_GENERIC=y
-CONFIG_RTC_DRV_CADENCE=m
-CONFIG_RTC_DRV_FTRTC010=m
-CONFIG_RTC_DRV_PS3=m
-CONFIG_RTC_DRV_PCAP=m
-CONFIG_RTC_DRV_MC13XXX=m
-CONFIG_RTC_DRV_MT6397=m
-CONFIG_RTC_DRV_R7301=m
-CONFIG_RTC_DRV_CPCAP=m
-
-#
-# HID Sensor RTC drivers
-#
-CONFIG_RTC_DRV_HID_SENSOR_TIME=m
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_VIRTUAL_CHANNELS=m
-CONFIG_DMA_OF=y
-CONFIG_ALTERA_MSGDMA=m
-CONFIG_DW_AXI_DMAC=m
-CONFIG_FSL_EDMA=m
-CONFIG_INTEL_IDMA64=m
-CONFIG_PLX_DMA=m
-CONFIG_XILINX_ZYNQMP_DPDMA=m
-CONFIG_QCOM_HIDMA_MGMT=m
-CONFIG_QCOM_HIDMA=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
-# CONFIG_SF_PDMA is not set
-
-#
-# DMA Clients
-#
-CONFIG_ASYNC_TX_DMA=y
-CONFIG_DMATEST=m
-CONFIG_DMA_ENGINE_RAID=y
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
-CONFIG_UDMABUF=y
-# CONFIG_DMABUF_MOVE_NOTIFY is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-# CONFIG_DMABUF_HEAPS is not set
-# end of DMABUF options
-
-CONFIG_AUXDISPLAY=y
-CONFIG_HD44780=m
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_IMG_ASCII_LCD=m
-CONFIG_HT16K33=m
-CONFIG_PARPORT_PANEL=m
-CONFIG_PANEL_PARPORT=0
-CONFIG_PANEL_PROFILE=5
-# CONFIG_PANEL_CHANGE_MESSAGE is not set
-# CONFIG_CHARLCD_BL_OFF is not set
-# CONFIG_CHARLCD_BL_ON is not set
-CONFIG_CHARLCD_BL_FLASH=y
-CONFIG_PANEL=m
-CONFIG_CHARLCD=m
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_DMEM_GENIRQ=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-CONFIG_UIO_FSL_ELBC_GPCM=m
-# CONFIG_UIO_FSL_ELBC_GPCM_NETX5152 is not set
-CONFIG_UIO_PRUSS=m
-CONFIG_UIO_MF624=m
-CONFIG_VFIO_IOMMU_SPAPR_TCE=m
-CONFIG_VFIO_SPAPR_EEH=m
-CONFIG_VFIO_VIRQFD=m
-CONFIG_VFIO=m
-CONFIG_VFIO_NOIOMMU=y
-CONFIG_VFIO_PCI=m
-CONFIG_VFIO_PCI_MMAP=y
-CONFIG_VFIO_PCI_INTX=y
-CONFIG_VFIO_PCI_NVLINK2=y
-CONFIG_VFIO_MDEV=m
-CONFIG_VFIO_MDEV_DEVICE=m
-CONFIG_IRQ_BYPASS_MANAGER=y
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_VDPA=m
-# CONFIG_VIRTIO_PMEM is not set
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-CONFIG_VDPA=m
-# CONFIG_VDPA_SIM is not set
-CONFIG_IFCVF=m
-CONFIG_MLX5_VDPA=y
-CONFIG_MLX5_VDPA_NET=m
-CONFIG_VHOST_IOTLB=m
-CONFIG_VHOST_RING=m
-CONFIG_VHOST=m
-CONFIG_VHOST_MENU=y
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_VSOCK=m
-CONFIG_VHOST_VDPA=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-# end of Microsoft Hyper-V guest support
-
-CONFIG_GREYBUS=m
-CONFIG_GREYBUS_ES2=m
-CONFIG_STAGING=y
-CONFIG_PRISM2_USB=m
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
-CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
-CONFIG_COMEDI_MISC_DRIVERS=y
-CONFIG_COMEDI_BOND=m
-CONFIG_COMEDI_TEST=m
-CONFIG_COMEDI_PARPORT=m
-# CONFIG_COMEDI_ISA_DRIVERS is not set
-CONFIG_COMEDI_PCI_DRIVERS=m
-CONFIG_COMEDI_8255_PCI=m
-CONFIG_COMEDI_ADDI_WATCHDOG=m
-CONFIG_COMEDI_ADDI_APCI_1032=m
-CONFIG_COMEDI_ADDI_APCI_1500=m
-CONFIG_COMEDI_ADDI_APCI_1516=m
-CONFIG_COMEDI_ADDI_APCI_1564=m
-CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2032=m
-CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3120=m
-CONFIG_COMEDI_ADDI_APCI_3501=m
-CONFIG_COMEDI_ADDI_APCI_3XXX=m
-CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7X3X=m
-CONFIG_COMEDI_ADL_PCI8164=m
-CONFIG_COMEDI_ADL_PCI9111=m
-CONFIG_COMEDI_ADL_PCI9118=m
-CONFIG_COMEDI_ADV_PCI1710=m
-CONFIG_COMEDI_ADV_PCI1720=m
-CONFIG_COMEDI_ADV_PCI1723=m
-CONFIG_COMEDI_ADV_PCI1724=m
-CONFIG_COMEDI_ADV_PCI1760=m
-CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200_PCI=m
-CONFIG_COMEDI_AMPLC_PC236_PCI=m
-CONFIG_COMEDI_AMPLC_PC263_PCI=m
-CONFIG_COMEDI_AMPLC_PCI224=m
-CONFIG_COMEDI_AMPLC_PCI230=m
-CONFIG_COMEDI_CONTEC_PCI_DIO=m
-CONFIG_COMEDI_DAS08_PCI=m
-CONFIG_COMEDI_DT3000=m
-CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_GSC_HPDI=m
-CONFIG_COMEDI_MF6X4=m
-CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_DAQBOARD2000=m
-CONFIG_COMEDI_JR3_PCI=m
-CONFIG_COMEDI_KE_COUNTER=m
-CONFIG_COMEDI_CB_PCIDAS64=m
-CONFIG_COMEDI_CB_PCIDAS=m
-CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIMDAS=m
-CONFIG_COMEDI_CB_PCIMDDA=m
-CONFIG_COMEDI_ME4000=m
-CONFIG_COMEDI_ME_DAQ=m
-CONFIG_COMEDI_NI_6527=m
-CONFIG_COMEDI_NI_65XX=m
-CONFIG_COMEDI_NI_660X=m
-CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_LABPC_PCI=m
-CONFIG_COMEDI_NI_PCIDIO=m
-CONFIG_COMEDI_NI_PCIMIO=m
-CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIOCMD=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
-CONFIG_COMEDI_CB_DAS16_CS=m
-CONFIG_COMEDI_DAS08_CS=m
-CONFIG_COMEDI_NI_DAQ_700_CS=m
-CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
-CONFIG_COMEDI_NI_LABPC_CS=m
-CONFIG_COMEDI_NI_MIO_CS=m
-CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=m
-CONFIG_COMEDI_DT9812=m
-CONFIG_COMEDI_NI_USB6501=m
-CONFIG_COMEDI_USBDUX=m
-CONFIG_COMEDI_USBDUXFAST=m
-CONFIG_COMEDI_USBDUXSIGMA=m
-CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_8254=m
-CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_8255_SA=m
-CONFIG_COMEDI_KCOMEDILIB=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_DAS08=m
-CONFIG_COMEDI_NI_LABPC=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_ROUTING=m
-CONFIG_RTL8192U=m
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_RTL8723BS=m
-CONFIG_R8712U=m
-CONFIG_R8188EU=m
-CONFIG_88EU_AP_MODE=y
-CONFIG_RTS5208=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-
-#
-# IIO staging drivers
-#
-
-#
-# Accelerometers
-#
-CONFIG_ADIS16203=m
-CONFIG_ADIS16240=m
-# end of Accelerometers
-
-#
-# Analog to digital converters
-#
-CONFIG_AD7816=m
-CONFIG_AD7280=m
-# end of Analog to digital converters
-
-#
-# Analog digital bi-direction converters
-#
-CONFIG_ADT7316=m
-CONFIG_ADT7316_SPI=m
-CONFIG_ADT7316_I2C=m
-# end of Analog digital bi-direction converters
-
-#
-# Capacitance to digital converters
-#
-CONFIG_AD7150=m
-CONFIG_AD7746=m
-# end of Capacitance to digital converters
-
-#
-# Direct Digital Synthesis
-#
-CONFIG_AD9832=m
-CONFIG_AD9834=m
-# end of Direct Digital Synthesis
-
-#
-# Network Analyzer, Impedance Converters
-#
-CONFIG_AD5933=m
-# end of Network Analyzer, Impedance Converters
-
-#
-# Active energy metering IC
-#
-CONFIG_ADE7854=m
-CONFIG_ADE7854_I2C=m
-CONFIG_ADE7854_SPI=m
-# end of Active energy metering IC
-
-#
-# Resolver to digital converters
-#
-CONFIG_AD2S1210=m
-# end of Resolver to digital converters
-# end of IIO staging drivers
-
-CONFIG_FB_SM750=m
-CONFIG_STAGING_MEDIA=y
-CONFIG_VIDEO_USBVISION=m
-
-#
-# Android
-#
-# end of Android
-
-# CONFIG_STAGING_BOARD is not set
-CONFIG_LTE_GDM724X=m
-CONFIG_FIREWIRE_SERIAL=m
-CONFIG_FWTTY_MAX_TOTAL_PORTS=64
-CONFIG_FWTTY_MAX_CARD_PORTS=32
-CONFIG_GS_FPGABOOT=m
-# CONFIG_UNISYSSPAR is not set
-CONFIG_FB_TFT=m
-CONFIG_FB_TFT_AGM1264K_FL=m
-CONFIG_FB_TFT_BD663474=m
-CONFIG_FB_TFT_HX8340BN=m
-CONFIG_FB_TFT_HX8347D=m
-CONFIG_FB_TFT_HX8353D=m
-CONFIG_FB_TFT_HX8357D=m
-CONFIG_FB_TFT_ILI9163=m
-CONFIG_FB_TFT_ILI9320=m
-CONFIG_FB_TFT_ILI9325=m
-CONFIG_FB_TFT_ILI9340=m
-CONFIG_FB_TFT_ILI9341=m
-CONFIG_FB_TFT_ILI9481=m
-CONFIG_FB_TFT_ILI9486=m
-CONFIG_FB_TFT_PCD8544=m
-CONFIG_FB_TFT_RA8875=m
-CONFIG_FB_TFT_S6D02A1=m
-CONFIG_FB_TFT_S6D1121=m
-CONFIG_FB_TFT_SEPS525=m
-# CONFIG_FB_TFT_SH1106 is not set
-CONFIG_FB_TFT_SSD1289=m
-CONFIG_FB_TFT_SSD1305=m
-CONFIG_FB_TFT_SSD1306=m
-CONFIG_FB_TFT_SSD1331=m
-CONFIG_FB_TFT_SSD1351=m
-CONFIG_FB_TFT_ST7735R=m
-CONFIG_FB_TFT_ST7789V=m
-CONFIG_FB_TFT_TINYLCD=m
-CONFIG_FB_TFT_TLS8204=m
-CONFIG_FB_TFT_UC1611=m
-CONFIG_FB_TFT_UC1701=m
-CONFIG_FB_TFT_UPD161704=m
-CONFIG_FB_TFT_WATTEROTT=m
-# CONFIG_MOST_COMPONENTS is not set
-CONFIG_KS7010=m
-CONFIG_GREYBUS_AUDIO=m
-CONFIG_GREYBUS_AUDIO_APB_CODEC=m
-CONFIG_GREYBUS_BOOTROM=m
-CONFIG_GREYBUS_FIRMWARE=m
-CONFIG_GREYBUS_HID=m
-CONFIG_GREYBUS_LIGHT=m
-CONFIG_GREYBUS_LOG=m
-CONFIG_GREYBUS_LOOPBACK=m
-CONFIG_GREYBUS_POWER=m
-CONFIG_GREYBUS_RAW=m
-CONFIG_GREYBUS_VIBRATOR=m
-CONFIG_GREYBUS_BRIDGED_PHY=m
-CONFIG_GREYBUS_GPIO=m
-CONFIG_GREYBUS_I2C=m
-CONFIG_GREYBUS_PWM=m
-CONFIG_GREYBUS_SDIO=m
-CONFIG_GREYBUS_SPI=m
-CONFIG_GREYBUS_UART=m
-CONFIG_GREYBUS_USB=m
-CONFIG_PI433=m
-
-#
-# Gasket devices
-#
-# end of Gasket devices
-
-CONFIG_XIL_AXIS_FIFO=m
-# CONFIG_FIELDBUS_DEV is not set
-# CONFIG_KPC2000 is not set
-CONFIG_QLGE=m
-CONFIG_WFX=m
-# CONFIG_GOLDFISH is not set
-CONFIG_HAVE_CLK=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-CONFIG_COMMON_CLK_WM831X=m
-# CONFIG_CLK_HSDK is not set
-CONFIG_COMMON_CLK_MAX77686=m
-CONFIG_COMMON_CLK_MAX9485=m
-CONFIG_COMMON_CLK_RK808=m
-CONFIG_COMMON_CLK_SI5341=m
-CONFIG_COMMON_CLK_SI5351=m
-CONFIG_COMMON_CLK_SI514=m
-CONFIG_COMMON_CLK_SI544=m
-CONFIG_COMMON_CLK_SI570=m
-CONFIG_COMMON_CLK_CDCE706=m
-CONFIG_COMMON_CLK_CDCE925=m
-CONFIG_COMMON_CLK_CS2000_CP=m
-CONFIG_CLK_TWL6040=m
-CONFIG_COMMON_CLK_PALMAS=m
-CONFIG_COMMON_CLK_PWM=m
-CONFIG_COMMON_CLK_VC5=m
-# CONFIG_COMMON_CLK_FIXED_MMIO is not set
-CONFIG_HWSPINLOCK=y
-
-#
-# Clock Source drivers
-#
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-# CONFIG_MICROCHIP_PIT64B is not set
-# end of Clock Source drivers
-
-CONFIG_MAILBOX=y
-CONFIG_PLATFORM_MHU=m
-CONFIG_ALTERA_MBOX=m
-CONFIG_MAILBOX_TEST=m
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-# end of Generic IOMMU Pagetable Support
-
-# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_OF_IOMMU=y
-CONFIG_SPAPR_TCE_IOMMU=y
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-CONFIG_RPMSG=m
-CONFIG_RPMSG_CHAR=m
-# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
-CONFIG_RPMSG_VIRTIO=m
-# end of Rpmsg drivers
-
-# CONFIG_SOUNDWIRE is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-CONFIG_QUICC_ENGINE=y
-CONFIG_UCC_SLOW=y
-CONFIG_UCC=y
-CONFIG_QE_USB=y
-CONFIG_FSL_GUTS=y
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-# end of Qualcomm SoC drivers
-
-CONFIG_SOC_TI=y
-
-#
-# Xilinx SoC drivers
-#
-CONFIG_XILINX_VCU=m
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-CONFIG_PM_DEVFREQ=y
-
-#
-# DEVFREQ Governors
-#
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
-CONFIG_DEVFREQ_GOV_PERFORMANCE=y
-CONFIG_DEVFREQ_GOV_POWERSAVE=y
-CONFIG_DEVFREQ_GOV_USERSPACE=y
-CONFIG_DEVFREQ_GOV_PASSIVE=m
-
-#
-# DEVFREQ Drivers
-#
-CONFIG_PM_DEVFREQ_EVENT=y
-CONFIG_EXTCON=y
-
-#
-# Extcon Device Drivers
-#
-CONFIG_EXTCON_ADC_JACK=m
-CONFIG_EXTCON_ARIZONA=m
-# CONFIG_EXTCON_FSA9480 is not set
-CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_MAX14577=m
-CONFIG_EXTCON_MAX3355=m
-CONFIG_EXTCON_MAX77693=m
-CONFIG_EXTCON_MAX77843=m
-CONFIG_EXTCON_MAX8997=m
-CONFIG_EXTCON_PALMAS=m
-CONFIG_EXTCON_PTN5150=m
-CONFIG_EXTCON_RT8973A=m
-CONFIG_EXTCON_SM5502=m
-CONFIG_EXTCON_USB_GPIO=m
-CONFIG_MEMORY=y
-CONFIG_IIO=m
-CONFIG_IIO_BUFFER=y
-CONFIG_IIO_BUFFER_CB=m
-CONFIG_IIO_BUFFER_DMA=m
-CONFIG_IIO_BUFFER_DMAENGINE=m
-CONFIG_IIO_BUFFER_HW_CONSUMER=m
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-CONFIG_IIO_CONFIGFS=m
-CONFIG_IIO_TRIGGER=y
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-CONFIG_IIO_SW_DEVICE=m
-CONFIG_IIO_SW_TRIGGER=m
-CONFIG_IIO_TRIGGERED_EVENT=m
-
-#
-# Accelerometers
-#
-CONFIG_ADIS16201=m
-CONFIG_ADIS16209=m
-CONFIG_ADXL372=m
-CONFIG_ADXL372_SPI=m
-CONFIG_ADXL372_I2C=m
-CONFIG_BMA220=m
-CONFIG_BMA400=m
-CONFIG_BMA400_I2C=m
-CONFIG_BMA400_SPI=m
-CONFIG_BMC150_ACCEL=m
-CONFIG_BMC150_ACCEL_I2C=m
-CONFIG_BMC150_ACCEL_SPI=m
-CONFIG_DA280=m
-CONFIG_DA311=m
-CONFIG_DMARD06=m
-CONFIG_DMARD09=m
-CONFIG_DMARD10=m
-CONFIG_HID_SENSOR_ACCEL_3D=m
-CONFIG_IIO_ST_ACCEL_3AXIS=m
-CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
-CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
-CONFIG_KXSD9=m
-CONFIG_KXSD9_SPI=m
-CONFIG_KXSD9_I2C=m
-CONFIG_KXCJK1013=m
-CONFIG_MC3230=m
-CONFIG_MMA7455=m
-CONFIG_MMA7455_I2C=m
-CONFIG_MMA7455_SPI=m
-CONFIG_MMA7660=m
-CONFIG_MMA8452=m
-CONFIG_MMA9551_CORE=m
-CONFIG_MMA9551=m
-CONFIG_MMA9553=m
-CONFIG_MXC4005=m
-CONFIG_MXC6255=m
-CONFIG_SCA3000=m
-CONFIG_STK8312=m
-CONFIG_STK8BA50=m
-# end of Accelerometers
-
-#
-# Analog to digital converters
-#
-CONFIG_AD_SIGMA_DELTA=m
-CONFIG_AD7091R5=m
-CONFIG_AD7124=m
-CONFIG_AD7192=m
-CONFIG_AD7266=m
-CONFIG_AD7291=m
-CONFIG_AD7292=m
-CONFIG_AD7298=m
-CONFIG_AD7476=m
-CONFIG_AD7606=m
-CONFIG_AD7606_IFACE_PARALLEL=m
-CONFIG_AD7606_IFACE_SPI=m
-CONFIG_AD7766=m
-CONFIG_AD7768_1=m
-CONFIG_AD7780=m
-CONFIG_AD7791=m
-CONFIG_AD7793=m
-CONFIG_AD7887=m
-CONFIG_AD7923=m
-CONFIG_AD7949=m
-CONFIG_AD799X=m
-CONFIG_AD9467=m
-CONFIG_ADI_AXI_ADC=m
-CONFIG_AXP20X_ADC=m
-CONFIG_AXP288_ADC=m
-CONFIG_CC10001_ADC=m
-CONFIG_CPCAP_ADC=m
-CONFIG_DA9150_GPADC=m
-CONFIG_DLN2_ADC=m
-CONFIG_ENVELOPE_DETECTOR=m
-CONFIG_HI8435=m
-CONFIG_HX711=m
-CONFIG_INA2XX_ADC=m
-# CONFIG_LP8788_ADC is not set
-CONFIG_LTC2471=m
-CONFIG_LTC2485=m
-CONFIG_LTC2496=m
-CONFIG_LTC2497=m
-CONFIG_MAX1027=m
-CONFIG_MAX11100=m
-CONFIG_MAX1118=m
-CONFIG_MAX1241=m
-CONFIG_MAX1363=m
-CONFIG_MAX9611=m
-CONFIG_MCP320X=m
-CONFIG_MCP3422=m
-CONFIG_MCP3911=m
-CONFIG_MEN_Z188_ADC=m
-CONFIG_MP2629_ADC=m
-CONFIG_NAU7802=m
-# CONFIG_PALMAS_GPADC is not set
-CONFIG_QCOM_VADC_COMMON=m
-CONFIG_QCOM_SPMI_IADC=m
-CONFIG_QCOM_SPMI_VADC=m
-CONFIG_QCOM_SPMI_ADC5=m
-CONFIG_RN5T618_ADC=m
-CONFIG_SD_ADC_MODULATOR=m
-CONFIG_STMPE_ADC=m
-CONFIG_TI_ADC081C=m
-CONFIG_TI_ADC0832=m
-CONFIG_TI_ADC084S021=m
-CONFIG_TI_ADC12138=m
-CONFIG_TI_ADC108S102=m
-CONFIG_TI_ADC128S052=m
-CONFIG_TI_ADC161S626=m
-CONFIG_TI_ADS1015=m
-CONFIG_TI_ADS7950=m
-CONFIG_TI_ADS8344=m
-CONFIG_TI_ADS8688=m
-CONFIG_TI_ADS124S08=m
-CONFIG_TI_AM335X_ADC=m
-CONFIG_TI_TLC4541=m
-# CONFIG_TWL4030_MADC is not set
-# CONFIG_TWL6030_GPADC is not set
-CONFIG_VF610_ADC=m
-CONFIG_VIPERBOARD_ADC=m
-# CONFIG_XILINX_XADC is not set
-# end of Analog to digital converters
-
-#
-# Analog Front Ends
-#
-CONFIG_IIO_RESCALE=m
-# end of Analog Front Ends
-
-#
-# Amplifiers
-#
-CONFIG_AD8366=m
-CONFIG_HMC425=m
-# end of Amplifiers
-
-#
-# Chemical Sensors
-#
-CONFIG_ATLAS_PH_SENSOR=m
-CONFIG_ATLAS_EZO_SENSOR=m
-CONFIG_BME680=m
-CONFIG_BME680_I2C=m
-CONFIG_BME680_SPI=m
-CONFIG_CCS811=m
-CONFIG_IAQCORE=m
-CONFIG_PMS7003=m
-CONFIG_SCD30_CORE=m
-CONFIG_SCD30_I2C=m
-CONFIG_SCD30_SERIAL=m
-CONFIG_SENSIRION_SGP30=m
-CONFIG_SPS30=m
-CONFIG_VZ89X=m
-# end of Chemical Sensors
-
-#
-# Hid Sensor IIO Common
-#
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-# end of Hid Sensor IIO Common
-
-CONFIG_IIO_MS_SENSORS_I2C=m
-
-#
-# SSP Sensor Common
-#
-CONFIG_IIO_SSP_SENSORS_COMMONS=m
-CONFIG_IIO_SSP_SENSORHUB=m
-# end of SSP Sensor Common
-
-CONFIG_IIO_ST_SENSORS_I2C=m
-CONFIG_IIO_ST_SENSORS_SPI=m
-CONFIG_IIO_ST_SENSORS_CORE=m
-
-#
-# Digital to analog converters
-#
-CONFIG_AD5064=m
-CONFIG_AD5360=m
-CONFIG_AD5380=m
-CONFIG_AD5421=m
-CONFIG_AD5446=m
-CONFIG_AD5449=m
-CONFIG_AD5592R_BASE=m
-CONFIG_AD5592R=m
-CONFIG_AD5593R=m
-CONFIG_AD5504=m
-CONFIG_AD5624R_SPI=m
-CONFIG_AD5686=m
-CONFIG_AD5686_SPI=m
-CONFIG_AD5696_I2C=m
-CONFIG_AD5755=m
-# CONFIG_AD5758 is not set
-CONFIG_AD5761=m
-CONFIG_AD5764=m
-CONFIG_AD5770R=m
-CONFIG_AD5791=m
-CONFIG_AD7303=m
-CONFIG_AD8801=m
-CONFIG_DPOT_DAC=m
-CONFIG_DS4424=m
-CONFIG_LTC1660=m
-CONFIG_LTC2632=m
-CONFIG_M62332=m
-CONFIG_MAX517=m
-CONFIG_MAX5821=m
-CONFIG_MCP4725=m
-CONFIG_MCP4922=m
-CONFIG_TI_DAC082S085=m
-CONFIG_TI_DAC5571=m
-CONFIG_TI_DAC7311=m
-CONFIG_TI_DAC7612=m
-CONFIG_VF610_DAC=m
-# end of Digital to analog converters
-
-#
-# IIO dummy driver
-#
-CONFIG_IIO_SIMPLE_DUMMY=m
-# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
-# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
-# end of IIO dummy driver
-
-#
-# Frequency Synthesizers DDS/PLL
-#
-
-#
-# Clock Generator/Distribution
-#
-CONFIG_AD9523=m
-# end of Clock Generator/Distribution
-
-#
-# Phase-Locked Loop (PLL) frequency synthesizers
-#
-CONFIG_ADF4350=m
-# CONFIG_ADF4371 is not set
-# end of Phase-Locked Loop (PLL) frequency synthesizers
-# end of Frequency Synthesizers DDS/PLL
-
-#
-# Digital gyroscope sensors
-#
-CONFIG_ADIS16080=m
-CONFIG_ADIS16130=m
-CONFIG_ADIS16136=m
-CONFIG_ADIS16260=m
-CONFIG_ADXRS450=m
-CONFIG_BMG160=m
-CONFIG_BMG160_I2C=m
-CONFIG_BMG160_SPI=m
-CONFIG_FXAS21002C=m
-CONFIG_FXAS21002C_I2C=m
-CONFIG_FXAS21002C_SPI=m
-CONFIG_HID_SENSOR_GYRO_3D=m
-CONFIG_MPU3050=m
-CONFIG_MPU3050_I2C=m
-CONFIG_IIO_ST_GYRO_3AXIS=m
-CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
-CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
-CONFIG_ITG3200=m
-# end of Digital gyroscope sensors
-
-#
-# Health Sensors
-#
-
-#
-# Heart Rate Monitors
-#
-CONFIG_AFE4403=m
-CONFIG_AFE4404=m
-CONFIG_MAX30100=m
-CONFIG_MAX30102=m
-# end of Heart Rate Monitors
-# end of Health Sensors
-
-#
-# Humidity sensors
-#
-CONFIG_AM2315=m
-CONFIG_DHT11=m
-CONFIG_HDC100X=m
-CONFIG_HID_SENSOR_HUMIDITY=m
-CONFIG_HTS221=m
-CONFIG_HTS221_I2C=m
-CONFIG_HTS221_SPI=m
-CONFIG_HTU21=m
-CONFIG_SI7005=m
-CONFIG_SI7020=m
-# end of Humidity sensors
-
-#
-# Inertial measurement units
-#
-CONFIG_ADIS16400=m
-# CONFIG_ADIS16460 is not set
-CONFIG_ADIS16475=m
-CONFIG_ADIS16480=m
-CONFIG_BMI160=m
-CONFIG_BMI160_I2C=m
-CONFIG_BMI160_SPI=m
-CONFIG_FXOS8700=m
-CONFIG_FXOS8700_I2C=m
-CONFIG_FXOS8700_SPI=m
-CONFIG_KMX61=m
-CONFIG_INV_ICM42600=m
-CONFIG_INV_ICM42600_I2C=m
-CONFIG_INV_ICM42600_SPI=m
-CONFIG_INV_MPU6050_IIO=m
-CONFIG_INV_MPU6050_I2C=m
-CONFIG_INV_MPU6050_SPI=m
-CONFIG_IIO_ST_LSM6DSX=m
-CONFIG_IIO_ST_LSM6DSX_I2C=m
-CONFIG_IIO_ST_LSM6DSX_SPI=m
-CONFIG_IIO_ST_LSM6DSX_I3C=m
-# end of Inertial measurement units
-
-CONFIG_IIO_ADIS_LIB=m
-CONFIG_IIO_ADIS_LIB_BUFFER=y
-
-#
-# Light sensors
-#
-CONFIG_ADJD_S311=m
-CONFIG_ADUX1020=m
-CONFIG_AL3010=m
-CONFIG_AL3320A=m
-CONFIG_APDS9300=m
-CONFIG_APDS9960=m
-CONFIG_BH1750=m
-CONFIG_BH1780=m
-CONFIG_CM32181=m
-CONFIG_CM3232=m
-CONFIG_CM3323=m
-CONFIG_CM3605=m
-CONFIG_CM36651=m
-CONFIG_GP2AP002=m
-CONFIG_GP2AP020A00F=m
-CONFIG_IQS621_ALS=m
-CONFIG_SENSORS_ISL29018=m
-CONFIG_SENSORS_ISL29028=m
-CONFIG_ISL29125=m
-CONFIG_HID_SENSOR_ALS=m
-CONFIG_HID_SENSOR_PROX=m
-CONFIG_JSA1212=m
-CONFIG_RPR0521=m
-CONFIG_SENSORS_LM3533=m
-CONFIG_LTR501=m
-CONFIG_LV0104CS=m
-CONFIG_MAX44000=m
-CONFIG_MAX44009=m
-CONFIG_NOA1305=m
-CONFIG_OPT3001=m
-CONFIG_PA12203001=m
-CONFIG_SI1133=m
-CONFIG_SI1145=m
-CONFIG_STK3310=m
-CONFIG_ST_UVIS25=m
-CONFIG_ST_UVIS25_I2C=m
-CONFIG_ST_UVIS25_SPI=m
-CONFIG_TCS3414=m
-CONFIG_TCS3472=m
-CONFIG_SENSORS_TSL2563=m
-CONFIG_TSL2583=m
-CONFIG_TSL2772=m
-CONFIG_TSL4531=m
-CONFIG_US5182D=m
-CONFIG_VCNL4000=m
-CONFIG_VCNL4035=m
-CONFIG_VEML6030=m
-CONFIG_VEML6070=m
-CONFIG_VL6180=m
-CONFIG_ZOPT2201=m
-# end of Light sensors
-
-#
-# Magnetometer sensors
-#
-CONFIG_AK8974=m
-CONFIG_AK8975=m
-# CONFIG_AK09911 is not set
-CONFIG_BMC150_MAGN=m
-CONFIG_BMC150_MAGN_I2C=m
-CONFIG_BMC150_MAGN_SPI=m
-CONFIG_MAG3110=m
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-CONFIG_MMC35240=m
-CONFIG_IIO_ST_MAGN_3AXIS=m
-CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
-CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
-CONFIG_SENSORS_HMC5843=m
-CONFIG_SENSORS_HMC5843_I2C=m
-CONFIG_SENSORS_HMC5843_SPI=m
-CONFIG_SENSORS_RM3100=m
-CONFIG_SENSORS_RM3100_I2C=m
-CONFIG_SENSORS_RM3100_SPI=m
-# end of Magnetometer sensors
-
-#
-# Multiplexers
-#
-CONFIG_IIO_MUX=m
-# end of Multiplexers
-
-#
-# Inclinometer sensors
-#
-CONFIG_HID_SENSOR_INCLINOMETER_3D=m
-CONFIG_HID_SENSOR_DEVICE_ROTATION=m
-# end of Inclinometer sensors
-
-#
-# Triggers - standalone
-#
-CONFIG_IIO_HRTIMER_TRIGGER=m
-CONFIG_IIO_INTERRUPT_TRIGGER=m
-CONFIG_IIO_TIGHTLOOP_TRIGGER=m
-CONFIG_IIO_SYSFS_TRIGGER=m
-# end of Triggers - standalone
-
-#
-# Linear and angular position sensors
-#
-CONFIG_IQS624_POS=m
-# end of Linear and angular position sensors
-
-#
-# Digital potentiometers
-#
-CONFIG_AD5272=m
-CONFIG_DS1803=m
-CONFIG_MAX5432=m
-CONFIG_MAX5481=m
-CONFIG_MAX5487=m
-CONFIG_MCP4018=m
-CONFIG_MCP4131=m
-CONFIG_MCP4531=m
-CONFIG_MCP41010=m
-CONFIG_TPL0102=m
-# end of Digital potentiometers
-
-#
-# Digital potentiostats
-#
-CONFIG_LMP91000=m
-# end of Digital potentiostats
-
-#
-# Pressure sensors
-#
-CONFIG_ABP060MG=m
-CONFIG_BMP280=m
-CONFIG_BMP280_I2C=m
-CONFIG_BMP280_SPI=m
-CONFIG_DLHL60D=m
-# CONFIG_DPS310 is not set
-CONFIG_HID_SENSOR_PRESS=m
-CONFIG_HP03=m
-CONFIG_ICP10100=m
-CONFIG_MPL115=m
-CONFIG_MPL115_I2C=m
-CONFIG_MPL115_SPI=m
-CONFIG_MPL3115=m
-CONFIG_MS5611=m
-CONFIG_MS5611_I2C=m
-CONFIG_MS5611_SPI=m
-CONFIG_MS5637=m
-CONFIG_IIO_ST_PRESS=m
-CONFIG_IIO_ST_PRESS_I2C=m
-CONFIG_IIO_ST_PRESS_SPI=m
-# CONFIG_T5403 is not set
-CONFIG_HP206C=m
-CONFIG_ZPA2326=m
-CONFIG_ZPA2326_I2C=m
-CONFIG_ZPA2326_SPI=m
-# end of Pressure sensors
-
-#
-# Lightning sensors
-#
-# CONFIG_AS3935 is not set
-# end of Lightning sensors
-
-#
-# Proximity and distance sensors
-#
-CONFIG_ISL29501=m
-CONFIG_LIDAR_LITE_V2=m
-CONFIG_MB1232=m
-CONFIG_PING=m
-CONFIG_RFD77402=m
-# CONFIG_SRF04 is not set
-CONFIG_SX9310=m
-CONFIG_SX9500=m
-CONFIG_SRF08=m
-CONFIG_VCNL3020=m
-CONFIG_VL53L0X_I2C=m
-# end of Proximity and distance sensors
-
-#
-# Resolver to digital converters
-#
-CONFIG_AD2S90=m
-CONFIG_AD2S1200=m
-# end of Resolver to digital converters
-
-#
-# Temperature sensors
-#
-CONFIG_IQS620AT_TEMP=m
-CONFIG_LTC2983=m
-CONFIG_MAXIM_THERMOCOUPLE=m
-CONFIG_HID_SENSOR_TEMP=m
-CONFIG_MLX90614=m
-CONFIG_MLX90632=m
-CONFIG_TMP006=m
-CONFIG_TMP007=m
-CONFIG_TSYS01=m
-CONFIG_TSYS02D=m
-CONFIG_MAX31856=m
-# end of Temperature sensors
-
-CONFIG_NTB=m
-# CONFIG_NTB_MSI is not set
-CONFIG_NTB_IDT=m
-CONFIG_NTB_SWITCHTEC=m
-CONFIG_NTB_PINGPONG=m
-CONFIG_NTB_TOOL=m
-CONFIG_NTB_PERF=m
-CONFIG_NTB_TRANSPORT=m
-# CONFIG_VME_BUS is not set
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
-# CONFIG_PWM_DEBUG is not set
-CONFIG_PWM_ATMEL_HLCDC_PWM=m
-CONFIG_PWM_FSL_FTM=m
-CONFIG_PWM_IQS620A=m
-CONFIG_PWM_LP3943=m
-CONFIG_PWM_PCA9685=m
-CONFIG_PWM_STMPE=y
-# CONFIG_PWM_TWL is not set
-# CONFIG_PWM_TWL_LED is not set
-
-#
-# IRQ chip support
-#
-CONFIG_IRQCHIP=y
-# CONFIG_AL_FIC is not set
-CONFIG_MADERA_IRQ=m
-# end of IRQ chip support
-
-CONFIG_IPACK_BUS=m
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
-CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
-# CONFIG_RESET_INTEL_GW is not set
-# CONFIG_RESET_TI_SYSCON is not set
-
-#
-# PHY Subsystem
-#
-CONFIG_GENERIC_PHY=y
-CONFIG_GENERIC_PHY_MIPI_DPHY=y
-CONFIG_BCM_KONA_USB2_PHY=m
-CONFIG_PHY_CADENCE_TORRENT=m
-CONFIG_PHY_CADENCE_DPHY=m
-CONFIG_PHY_CADENCE_SIERRA=m
-CONFIG_PHY_CADENCE_SALVO=m
-CONFIG_PHY_FSL_IMX8MQ_USB=m
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-CONFIG_PHY_PXA_28NM_HSIC=m
-CONFIG_PHY_PXA_28NM_USB2=m
-# CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHY_MAPPHONE_MDM6600=m
-CONFIG_PHY_OCELOT_SERDES=m
-CONFIG_PHY_QCOM_USB_HS=m
-CONFIG_PHY_QCOM_USB_HSIC=m
-CONFIG_PHY_TUSB1210=m
-# end of PHY Subsystem
-
-CONFIG_POWERCAP=y
-CONFIG_IDLE_INJECT=y
-CONFIG_MCB=m
-CONFIG_MCB_PCI=m
-CONFIG_MCB_LPC=m
-
-#
-# Performance monitor support
-#
-# end of Performance monitor support
-
-CONFIG_RAS=y
-CONFIG_USB4=m
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-# end of Android
-
-CONFIG_LIBNVDIMM=y
-CONFIG_BLK_DEV_PMEM=m
-CONFIG_ND_BLK=m
-CONFIG_ND_CLAIM=y
-CONFIG_ND_BTT=m
-CONFIG_BTT=y
-CONFIG_ND_PFN=m
-CONFIG_NVDIMM_PFN=y
-CONFIG_NVDIMM_DAX=y
-CONFIG_OF_PMEM=m
-CONFIG_DAX_DRIVER=y
-CONFIG_DAX=y
-CONFIG_DEV_DAX=m
-CONFIG_DEV_DAX_PMEM=m
-CONFIG_DEV_DAX_KMEM=m
-CONFIG_DEV_DAX_PMEM_COMPAT=m
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_SPMI_SDAM is not set
-
-#
-# HW tracing support
-#
-CONFIG_STM=m
-CONFIG_STM_PROTO_BASIC=m
-CONFIG_STM_PROTO_SYS_T=m
-CONFIG_STM_DUMMY=m
-CONFIG_STM_SOURCE_CONSOLE=m
-CONFIG_STM_SOURCE_HEARTBEAT=m
-CONFIG_STM_SOURCE_FTRACE=m
-CONFIG_INTEL_TH=m
-CONFIG_INTEL_TH_PCI=m
-CONFIG_INTEL_TH_GTH=m
-CONFIG_INTEL_TH_STH=m
-CONFIG_INTEL_TH_MSU=m
-CONFIG_INTEL_TH_PTI=m
-# CONFIG_INTEL_TH_DEBUG is not set
-# end of HW tracing support
-
-CONFIG_FPGA=m
-CONFIG_ALTERA_PR_IP_CORE=m
-CONFIG_ALTERA_PR_IP_CORE_PLAT=m
-CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
-CONFIG_FPGA_MGR_ALTERA_CVP=m
-CONFIG_FPGA_MGR_XILINX_SPI=m
-CONFIG_FPGA_MGR_ICE40_SPI=m
-CONFIG_FPGA_MGR_MACHXO2_SPI=m
-CONFIG_FPGA_BRIDGE=m
-CONFIG_ALTERA_FREEZE_BRIDGE=m
-CONFIG_XILINX_PR_DECOUPLER=m
-CONFIG_FPGA_REGION=m
-CONFIG_OF_FPGA_REGION=m
-CONFIG_FPGA_DFL=m
-CONFIG_FPGA_DFL_FME=m
-CONFIG_FPGA_DFL_FME_MGR=m
-CONFIG_FPGA_DFL_FME_BRIDGE=m
-CONFIG_FPGA_DFL_FME_REGION=m
-CONFIG_FPGA_DFL_AFU=m
-CONFIG_FPGA_DFL_PCI=m
-CONFIG_FSI=m
-# CONFIG_FSI_NEW_DEV_NODE is not set
-CONFIG_FSI_MASTER_GPIO=m
-CONFIG_FSI_MASTER_HUB=m
-CONFIG_FSI_MASTER_ASPEED=m
-CONFIG_FSI_SCOM=m
-CONFIG_FSI_SBEFIFO=m
-CONFIG_FSI_OCC=m
-CONFIG_MULTIPLEXER=m
-
-#
-# Multiplexer drivers
-#
-CONFIG_MUX_ADG792A=m
-# CONFIG_MUX_ADGS1408 is not set
-CONFIG_MUX_GPIO=m
-CONFIG_MUX_MMIO=m
-# end of Multiplexer drivers
-
-CONFIG_PM_OPP=y
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-CONFIG_INTERCONNECT=y
-# CONFIG_COUNTER is not set
-CONFIG_MOST=m
-CONFIG_MOST_USB_HDM=m
-# end of Device Drivers
-
-#
-# File systems
-#
-CONFIG_VALIDATE_FS_PARSER=y
-CONFIG_FS_IOMAP=y
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_USE_FOR_EXT2=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-# CONFIG_OCFS2_DEBUG_MASKLOG is not set
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_FS_REF_VERIFY is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_F2FS_CHECK_FS=y
-# CONFIG_F2FS_IO_TRACE is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-CONFIG_F2FS_FS_COMPRESSION=y
-CONFIG_F2FS_FS_LZO=y
-CONFIG_F2FS_FS_LZ4=y
-CONFIG_F2FS_FS_ZSTD=y
-CONFIG_F2FS_FS_LZORLE=y
-CONFIG_ZONEFS_FS=m
-CONFIG_FS_DAX=y
-CONFIG_FS_DAX_PMD=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_EXPORTFS_BLOCK_OPS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_MANDATORY_FILE_LOCKING=y
-CONFIG_FS_ENCRYPTION=y
-CONFIG_FS_ENCRYPTION_ALGS=m
-CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_AUTOFS_FS=y
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_VIRTIO_FS=m
-CONFIG_OVERLAY_FS=m
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
-# CONFIG_OVERLAY_FS_INDEX is not set
-CONFIG_OVERLAY_FS_XINO_AUTO=y
-# CONFIG_OVERLAY_FS_METACOPY is not set
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/EXFAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_FAT_DEFAULT_UTF8=y
-CONFIG_EXFAT_FS=m
-CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
-# end of DOS/FAT/EXFAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_VMCORE=y
-# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_PROC_CHILDREN=y
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_TMPFS_INODE64=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
-CONFIG_CONFIGFS_FS=y
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_ORANGEFS_FS=m
-CONFIG_ADFS_FS=m
-# CONFIG_ADFS_FS_RW is not set
-CONFIG_AFFS_FS=m
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_FS_XATTR=y
-CONFIG_JFFS2_FS_POSIX_ACL=y
-CONFIG_JFFS2_FS_SECURITY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_UBIFS_FS is not set
-CONFIG_CRAMFS=m
-CONFIG_CRAMFS_BLOCKDEV=y
-# CONFIG_CRAMFS_MTD is not set
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_FILE_CACHE=y
-# CONFIG_SQUASHFS_FILE_DIRECT is not set
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-CONFIG_SQUASHFS_DECOMP_MULTI=y
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_ZSTD=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-CONFIG_HPFS_FS=m
-# CONFIG_QNX4FS_FS is not set
-CONFIG_QNX6FS_FS=m
-# CONFIG_QNX6FS_DEBUG is not set
-CONFIG_ROMFS_FS=m
-# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
-# CONFIG_ROMFS_BACKED_BY_MTD is not set
-CONFIG_ROMFS_BACKED_BY_BOTH=y
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_ROMFS_ON_MTD=y
-CONFIG_PSTORE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=m
-# CONFIG_PSTORE_LZO_COMPRESS is not set
-# CONFIG_PSTORE_LZ4_COMPRESS is not set
-CONFIG_PSTORE_LZ4HC_COMPRESS=m
-# CONFIG_PSTORE_842_COMPRESS is not set
-CONFIG_PSTORE_ZSTD_COMPRESS=y
-CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
-# CONFIG_PSTORE_LZ4HC_COMPRESS_DEFAULT is not set
-# CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT is not set
-CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
-# CONFIG_SYSV_FS is not set
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EROFS_FS=m
-# CONFIG_EROFS_FS_DEBUG is not set
-CONFIG_EROFS_FS_XATTR=y
-CONFIG_EROFS_FS_POSIX_ACL=y
-CONFIG_EROFS_FS_SECURITY=y
-# CONFIG_EROFS_FS_ZIP is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-CONFIG_NFS_SWAP=y
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-CONFIG_NFS_V4_1_MIGRATION=y
-CONFIG_NFS_V4_SECURITY_LABEL=y
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFS_DISABLE_UDP_SUPPORT=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_BLOCKLAYOUT=y
-CONFIG_NFSD_SCSILAYOUT=y
-CONFIG_NFSD_FLEXFILELAYOUT=y
-CONFIG_NFSD_V4_2_INTER_SSC=y
-CONFIG_NFSD_V4_SECURITY_LABEL=y
-CONFIG_GRACE_PERIOD=m
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_SUNRPC_SWAP=y
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
-# CONFIG_SUNRPC_DEBUG is not set
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-# CONFIG_CEPH_FS_SECURITY_LABEL is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-CONFIG_CIFS_UPCALL=y
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG is not set
-CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_SMB_DIRECT is not set
-CONFIG_CIFS_FSCACHE=y
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-CONFIG_AFS_FSCACHE=y
-# CONFIG_AFS_DEBUG_CURSOR is not set
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-CONFIG_9P_FS_SECURITY=y
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-CONFIG_UNICODE=y
-# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
-CONFIG_IO_WQ=y
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_KEYS_REQUEST_CACHE is not set
-# CONFIG_PERSISTENT_KEYRINGS is not set
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_KEY_DH_OPERATIONS=y
-CONFIG_KEY_NOTIFICATIONS=y
-CONFIG_SECURITY_DMESG_RESTRICT=y
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_INFINIBAND is not set
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_HARDENED_USERCOPY_FALLBACK=y
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-CONFIG_FORTIFY_SOURCE=y
-# CONFIG_STATIC_USERMODEHELPER is not set
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-# CONFIG_SECURITY_SELINUX_DISABLE is not set
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
-CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
-CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_HASH=y
-CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
-# CONFIG_SECURITY_APPARMOR_DEBUG is not set
-# CONFIG_SECURITY_LOADPIN is not set
-CONFIG_SECURITY_YAMA=y
-# CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-CONFIG_INTEGRITY=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_AUDIT=y
-# CONFIG_IMA is not set
-# CONFIG_EVM is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="yama,loadpin,safesetid,integrity"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_SKCIPHER=y
-CONFIG_CRYPTO_SKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ENGINE=m
-
-#
-# Public-key cryptography
-#
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECC=m
-CONFIG_CRYPTO_ECDH=m
-CONFIG_CRYPTO_ECRDSA=m
-CONFIG_CRYPTO_CURVE25519=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=y
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_AEGIS128 is not set
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CFB=m
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_OFB=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
-CONFIG_CRYPTO_NHPOLY1305=m
-CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_ESSIV=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32C_VPMSUM=m
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_XXHASH=m
-CONFIG_CRYPTO_BLAKE2B=m
-CONFIG_CRYPTO_BLAKE2S=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRCT10DIF_VPMSUM=m
-CONFIG_CRYPTO_VPMSUM_TESTER=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MD5_PPC=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_PPC=m
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_STREEBOG=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_TI=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_LZ4=m
-C